Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32-RTL]

Browse source 
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.

svn path=/trunk/; revision=59185
This commit is contained in:
Hermès Bélusca-Maïto 2013-06-07 20:40:34 +00:00
parent d93b910537
commit 6922a068e7
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/kernel32/wine/profile.c
View file

@ -762,7 +762,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access )
if (!filename) if (!filename)
filename = wininiW; filename = wininiW;
if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) &&
!strchrW(filename, '\\') && !strchrW(filename, '/')) !strchrW(filename, '\\') && !strchrW(filename, '/'))
{ {
static const WCHAR wszSeparator[] = {'\\', 0}; static const WCHAR wszSeparator[] = {'\\', 0};

2
reactos/include/ndk/rtlfuncs.h
View file

@ -2617,7 +2617,7 @@ RtlDoesFileExists_U(
); );
NTSYSAPI NTSYSAPI
ULONG RTL_PATH_TYPE
NTAPI NTAPI
RtlDetermineDosPathNameType_U( RtlDetermineDosPathNameType_U(
_In_ PCWSTR Path _In_ PCWSTR Path

24
reactos/include/psdk/winternl.h
View file

@ -861,18 +861,18 @@ typedef struct _TIMER_BASIC_INFORMATION
} TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION;
/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */ /* Return type of RtlDetermineDosPathNameType_U */
typedef enum typedef enum _RTL_PATH_TYPE
{ {
INVALID_PATH = 0, RtlPathTypeUnknown,
UNC_PATH, /* "//foo" */ RtlPathTypeUncAbsolute,
ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ RtlPathTypeDriveAbsolute,
RELATIVE_DRIVE_PATH, /* "c:foo" */ RtlPathTypeDriveRelative,
ABSOLUTE_PATH, /* "/foo" */ RtlPathTypeRooted,
RELATIVE_PATH, /* "foo" */ RtlPathTypeRelative,
DEVICE_PATH, /* "//./foo" */ RtlPathTypeLocalDevice,
UNC_DOT_PATH /* "//." */ RtlPathTypeRootLocalDevice,
} DOS_PATHNAME_TYPE; } RTL_PATH_TYPE;
/*********************************************************************** /***********************************************************************
* IA64 specific types and data structures * IA64 specific types and data structures
@ -2130,7 +2130,7 @@ NTSTATUS WINAPI RtlDestroyHandleTable(RTL_HANDLE_TABLE *);
HANDLE WINAPI RtlDestroyHeap(HANDLE); HANDLE WINAPI RtlDestroyHeap(HANDLE);
void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*);
NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); 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 RtlDoesFileExists_U(LPCWSTR);
BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*);
ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*);

2
reactos/lib/rtl/path.c
View file

@ -867,7 +867,7 @@ RtlGetLongestNtPathLength(VOID)
/* /*
* @implemented * @implemented
*/ */
ULONG RTL_PATH_TYPE
NTAPI NTAPI
RtlDetermineDosPathNameType_U(IN PCWSTR Path) RtlDetermineDosPathNameType_U(IN PCWSTR Path)
{ {