[ros-diffs] [hbelusca] 59185: [KERNEL32-RTL] Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE. See r59...

Author: hbelusca
Date: Fri Jun  7 20:40:34 2013
New Revision: 59185

URL: http://svn.reactos.org/svn/reactos?rev=59185&view=rev
Log:
[KERNEL32-RTL]
Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of
RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE.

See r59183 and 59184 for more information.

Modified:
    trunk/reactos/dll/win32/kernel32/wine/profile.c
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/include/psdk/winternl.h
    trunk/reactos/lib/rtl/path.c

Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/wine/profile.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/wine/profile.c	[iso-8859-1] Fri Jun  7 20:40:34 2013
@@ -762,7 +762,7 @@
     if (!filename)
 	filename = wininiW;
 
-    if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) &&
+    if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) &&
         !strchrW(filename, '\\') && !strchrW(filename, '/'))
     {
         static const WCHAR wszSeparator[] = {'\\', 0};

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h	[iso-8859-1] Fri Jun  7 20:40:34 2013
@@ -2617,7 +2617,7 @@
 );
 
 NTSYSAPI
-ULONG
+RTL_PATH_TYPE
 NTAPI
 RtlDetermineDosPathNameType_U(
     _In_ PCWSTR Path

Modified: trunk/reactos/include/psdk/winternl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re…
==============================================================================
--- trunk/reactos/include/psdk/winternl.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winternl.h	[iso-8859-1] Fri Jun  7 20:40:34 2013
@@ -861,18 +861,18 @@
 } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION;
 
 
-/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */
-typedef enum
-{
-    INVALID_PATH = 0,
-    UNC_PATH,              /* "//foo" */
-    ABSOLUTE_DRIVE_PATH,   /* "c:/foo" */
-    RELATIVE_DRIVE_PATH,   /* "c:foo" */
-    ABSOLUTE_PATH,         /* "/foo" */
-    RELATIVE_PATH,         /* "foo" */
-    DEVICE_PATH,           /* "//./foo" */
-    UNC_DOT_PATH           /* "//." */
-} DOS_PATHNAME_TYPE;
+/* Return type of RtlDetermineDosPathNameType_U */
+typedef enum _RTL_PATH_TYPE
+{
+    RtlPathTypeUnknown,
+    RtlPathTypeUncAbsolute,
+    RtlPathTypeDriveAbsolute,
+    RtlPathTypeDriveRelative,
+    RtlPathTypeRooted,
+    RtlPathTypeRelative,
+    RtlPathTypeLocalDevice,
+    RtlPathTypeRootLocalDevice,
+} RTL_PATH_TYPE;
 
 /***********************************************************************
  * IA64 specific types and data structures
@@ -2130,7 +2130,7 @@
 HANDLE    WINAPI RtlDestroyHeap(HANDLE);
 void      WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*);
 NTSTATUS  WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER);
-DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR);
+RTL_PATH_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR);
 BOOLEAN   WINAPI RtlDoesFileExists_U(LPCWSTR);
 BOOLEAN   WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*);
 ULONG     WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*);

Modified: trunk/reactos/lib/rtl/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59185&a…
==============================================================================
--- trunk/reactos/lib/rtl/path.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/path.c	[iso-8859-1] Fri Jun  7 20:40:34 2013
@@ -867,7 +867,7 @@
 /*
  * @implemented
  */
-ULONG
+RTL_PATH_TYPE
 NTAPI
 RtlDetermineDosPathNameType_U(IN PCWSTR Path)
 {