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

Author: hbelusca
Date: Mon Aug 21 19:41:40 2017
New Revision: 75636

URL: http://svn.reactos.org/svn/reactos?rev=75636&view=rev
Log:
[SETUPLIB][USETUP]: Code refactoring: rename the old DoesPathExist() into DoesDirExist(),
and rename the new DoesPathExistEx() back into DoesPathExist().

Modified:
    branches/setup_improvements/base/setup/lib/filesup.c
    branches/setup_improvements/base/setup/lib/filesup.h
    branches/setup_improvements/base/setup/lib/osdetect.c
    branches/setup_improvements/base/setup/usetup/filesup.c
    branches/setup_improvements/base/setup/usetup/usetup.c

Modified: branches/setup_improvements/base/setup/lib/filesup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l…
==============================================================================
--- branches/setup_improvements/base/setup/lib/filesup.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/lib/filesup.c	[iso-8859-1] Mon Aug 21 19:41:40
2017
@@ -517,7 +517,7 @@
 }
 
 BOOLEAN
-DoesPathExistEx(
+DoesPathExist(
     IN HANDLE RootDirectory OPTIONAL,
     IN PCWSTR PathName,
     IN BOOLEAN IsDirectory)

Modified: branches/setup_improvements/base/setup/lib/filesup.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l…
==============================================================================
--- branches/setup_improvements/base/setup/lib/filesup.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/lib/filesup.h	[iso-8859-1] Mon Aug 21 19:41:40
2017
@@ -63,16 +63,16 @@
     IN /* PCWSTR */ ...);
 
 BOOLEAN
-DoesPathExistEx(
+DoesPathExist(
     IN HANDLE RootDirectory OPTIONAL,
     IN PCWSTR PathName,
     IN BOOLEAN IsDirectory);
 
-#define DoesPathExist(RootDirectory, PathName)  \
-    DoesPathExistEx((RootDirectory), (PathName), TRUE)
+#define DoesDirExist(RootDirectory, DirName)    \
+    DoesPathExist((RootDirectory), (DirName), TRUE)
 
 #define DoesFileExist(RootDirectory, FileName)  \
-    DoesPathExistEx((RootDirectory), (FileName), FALSE)
+    DoesPathExist((RootDirectory), (FileName), FALSE)
 
 // FIXME: DEPRECATED! HACKish function that needs to be deprecated!
 BOOLEAN

Modified: branches/setup_improvements/base/setup/lib/osdetect.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l…
==============================================================================
--- branches/setup_improvements/base/setup/lib/osdetect.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/lib/osdetect.c	[iso-8859-1] Mon Aug 21 19:41:40
2017
@@ -355,7 +355,7 @@
 
     /* Check for the existence of \SystemRoot\System32 */
     PathName = L"System32\\";
-    if (!DoesPathExist(SystemRootDirectory, PathName))
+    if (!DoesDirExist(SystemRootDirectory, PathName))
     {
         // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n",
PathName, Status);
         return FALSE;
@@ -363,7 +363,7 @@
 
     /* Check for the existence of \SystemRoot\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);
         return FALSE;
@@ -371,7 +371,7 @@
 
     /* Check for the existence of \SystemRoot\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);
         return FALSE;

Modified: branches/setup_improvements/base/setup/usetup/filesup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/filesup.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/filesup.c	[iso-8859-1] Mon Aug 21
19:41:40 2017
@@ -113,7 +113,7 @@
             *Ptr = 0;
 
             DPRINT("PathBuffer: %S\n", PathBuffer);
-            if (!DoesPathExist(NULL, PathBuffer))
+            if (!DoesDirExist(NULL, PathBuffer))
             {
                 DPRINT("Create: %S\n", PathBuffer);
                 Status = SetupCreateSingleDirectory(PathBuffer);
@@ -127,7 +127,7 @@
         Ptr++;
     }
 
-    if (!DoesPathExist(NULL, PathBuffer))
+    if (!DoesDirExist(NULL, PathBuffer))
     {
         DPRINT("Create: %S\n", PathBuffer);
         Status = SetupCreateSingleDirectory(PathBuffer);

Modified: branches/setup_improvements/base/setup/usetup/usetup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/usetup.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/usetup.c	[iso-8859-1] Mon Aug 21
19:41:40 2017
@@ -4315,7 +4315,7 @@
         }
         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);
                 return BOOT_LOADER_FLOPPY_PAGE;