Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-21 18:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB][USETUP] Code refactoring: rename the old DoesPathExist() into DoesDirExist(), and rename the new DoesPathExistEx() back into DoesPathExist().

Browse source 
svn path=/branches/setup_improvements/; revision=75636
This commit is contained in:
Hermès Bélusca-Maïto 2017-08-21 19:41:40 +00:00
parent cc37199dfd
commit 29fe31df1b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/setup/lib/filesup.c
View file

@ -582,7 +582,7 @@ CombinePaths(
} }
BOOLEAN BOOLEAN
DoesPathExistEx( DoesPathExist(
IN HANDLE RootDirectory OPTIONAL, IN HANDLE RootDirectory OPTIONAL,
IN PCWSTR PathName, IN PCWSTR PathName,
IN BOOLEAN IsDirectory) IN BOOLEAN IsDirectory)

8
base/setup/lib/filesup.h
View file

@ -61,16 +61,16 @@ CombinePaths(
IN /* PCWSTR */ ...); IN /* PCWSTR */ ...);
BOOLEAN BOOLEAN
DoesPathExistEx( DoesPathExist(
IN HANDLE RootDirectory OPTIONAL, IN HANDLE RootDirectory OPTIONAL,
IN PCWSTR PathName, IN PCWSTR PathName,
IN BOOLEAN IsDirectory); IN BOOLEAN IsDirectory);
#define DoesPathExist(RootDirectory, PathName) \ #define DoesDirExist(RootDirectory, DirName) \
DoesPathExistEx((RootDirectory), (PathName), TRUE) DoesPathExist((RootDirectory), (DirName), TRUE)
#define DoesFileExist(RootDirectory, FileName) \ #define DoesFileExist(RootDirectory, FileName) \
DoesPathExistEx((RootDirectory), (FileName), FALSE) DoesPathExist((RootDirectory), (FileName), FALSE)
// FIXME: DEPRECATED! HACKish function that needs to be deprecated! // FIXME: DEPRECATED! HACKish function that needs to be deprecated!
BOOLEAN BOOLEAN

6
base/setup/lib/osdetect.c
View file

@ -359,7 +359,7 @@ IsValidNTOSInstallationByHandle(
/* Check for the existence of \SystemRoot\System32 */ /* Check for the existence of \SystemRoot\System32 */
PathName = L"System32\\"; PathName = L"System32\\";
if (!DoesPathExist(SystemRootDirectory, PathName)) if (!DoesDirExist(SystemRootDirectory, PathName))
{ {
// DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status);
return FALSE; return FALSE;
@ -367,7 +367,7 @@ IsValidNTOSInstallationByHandle(
/* Check for the existence of \SystemRoot\System32\drivers */ /* Check for the existence of \SystemRoot\System32\drivers */
PathName = L"System32\\drivers\\"; PathName = L"System32\\drivers\\";
if (!DoesPathExist(SystemRootDirectory, PathName)) if (!DoesDirExist(SystemRootDirectory, PathName))
{ {
// DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status);
return FALSE; return FALSE;
@ -375,7 +375,7 @@ IsValidNTOSInstallationByHandle(
/* Check for the existence of \SystemRoot\System32\config */ /* Check for the existence of \SystemRoot\System32\config */
PathName = L"System32\\config\\"; PathName = L"System32\\config\\";
if (!DoesPathExist(SystemRootDirectory, PathName)) if (!DoesDirExist(SystemRootDirectory, PathName))
{ {
// DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status);
return FALSE; return FALSE;

4
base/setup/usetup/filesup.c
View file

@ -112,7 +112,7 @@ SetupCreateDirectory(
*Ptr = 0; *Ptr = 0;
DPRINT("PathBuffer: %S\n", PathBuffer); DPRINT("PathBuffer: %S\n", PathBuffer);
if (!DoesPathExist(NULL, PathBuffer)) if (!DoesDirExist(NULL, PathBuffer))
{ {
DPRINT("Create: %S\n", PathBuffer); DPRINT("Create: %S\n", PathBuffer);
Status = SetupCreateSingleDirectory(PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer);
@ -126,7 +126,7 @@ SetupCreateDirectory(
Ptr++; Ptr++;
} }
if (!DoesPathExist(NULL, PathBuffer)) if (!DoesDirExist(NULL, PathBuffer))
{ {
DPRINT("Create: %S\n", PathBuffer); DPRINT("Create: %S\n", PathBuffer);
Status = SetupCreateSingleDirectory(PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer);

2
base/setup/usetup/usetup.c
View file

@ -4481,7 +4481,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir)
} }
else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
{ {
if (DoesPathExist(NULL, L"\\Device\\Floppy0\\") == FALSE) if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE)
{ {
MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER);
return BOOT_LOADER_FLOPPY_PAGE; return BOOT_LOADER_FLOPPY_PAGE;