Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[tfaber] 54324: [KERNEL32_WINETEST] - Do not use strcat_s. It is not guaranteed to exist on Windows.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 6 23:38:39 2011 New Revision: 54324 URL: http://svn.reactos.org/svn/reactos?rev=54324&view=rev Log: [KERNEL32_WINETEST] - Do not use strcat_s. It is not guaranteed to exist on Windows. Modified: trunk/rostests/winetests/kernel32/dosdev.c Modified: trunk/rostests/winetests/kernel32/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/dosdev… ============================================================================== --- trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] Sun Nov 6 23:38:39 2011 @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "wine/test.h" #include "windef.h" @@ -235,8 +236,7 @@ /* Test with trailing '\' appended to TargetPath */ dwMaskPrev = GetLogicalDrives(); - strcpy_s(Buffer, MAX_PATH, Target); - strcat_s(Buffer, MAX_PATH, "\\\\\\"); + snprintf(Buffer, sizeof(Buffer), "%s\\\\\\", Target); Result = DefineDosDeviceA(0, SUBST_DRIVE, Buffer); ok(Result, "Failed to subst drive\n"); DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); @@ -256,9 +256,7 @@ /* Test with trailing '\' appended to TargetPath and DDD_RAW_TARGET_PATH flag */ dwMaskPrev = GetLogicalDrives(); - strcpy_s(Buffer, MAX_PATH, "\\??\\"); - strcat_s(Buffer, MAX_PATH, Target); - strcat_s(Buffer, MAX_PATH, "\\\\\\"); + snprintf(Buffer, sizeof(Buffer), "\\??\\%s\\\\\\", Target); Result = DefineDosDeviceA(DDD_RAW_TARGET_PATH, SUBST_DRIVE, Buffer); ok(Result, "Failed to subst drive\n"); DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR);

12 years, 10 months

[ion] 54323: [KERNEL32]: Move the "curdir.c" APIs into path.c as well, as they are Path APIs. No code changes (just formatting and moving to DPRINTs).

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 23:01:04 2011 New Revision: 54323 URL: http://svn.reactos.org/svn/reactos?rev=54323&view=rev Log: [KERNEL32]: Move the "curdir.c" APIs into path.c as well, as they are Path APIs. No code changes (just formatting and moving to DPRINTs). Removed: trunk/reactos/dll/win32/kernel32/client/file/curdir.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Nov 6 23:01:04 2011 @@ -43,7 +43,6 @@ client/file/copy.c client/file/console.c client/file/create.c - client/file/curdir.c client/file/delete.c client/file/deviceio.c client/file/dir.c Removed: trunk/reactos/dll/win32/kernel32/client/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/curdir.c (removed) @@ -1,388 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/file/curdir.c - * PURPOSE: Current directory functions - * PROGRAMMER: Eric Kohl - * Filip Navara - * Steven Edwards - * Thomas Weidenmueller - * Gunnar Andre' Dalsnes - * UPDATE HISTORY: - * Created 30/09/98 - */ - - -/* INCLUDES ******************************************************************/ - -#include <k32.h> -#define NDEBUG -#include <debug.h> - -#if DBG -DEBUG_CHANNEL(kernel32file); -#endif - -/* GLOBAL VARIABLES **********************************************************/ - -UNICODE_STRING SystemDirectory; -UNICODE_STRING WindowsDirectory; -UNICODE_STRING BaseDefaultPathAppend; -UNICODE_STRING BaseDefaultPath; - - -/* FUNCTIONS *****************************************************************/ - - - - -/* - * @implemented - */ -DWORD -WINAPI -GetCurrentDirectoryA ( - DWORD nBufferLength, - LPSTR lpBuffer - ) -{ - WCHAR BufferW[MAX_PATH]; - DWORD ret; - - ret = GetCurrentDirectoryW(MAX_PATH, BufferW); - - if (!ret) return 0; - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetCurrentDirectoryW ( - DWORD nBufferLength, - LPWSTR lpBuffer - ) -{ - ULONG Length; - - Length = RtlGetCurrentDirectory_U (nBufferLength * sizeof(WCHAR), - lpBuffer); - - return (Length / sizeof (WCHAR)); -} - - - -/* - * @implemented - */ -BOOL -WINAPI -SetCurrentDirectoryA ( - LPCSTR lpPathName - ) -{ - PWCHAR PathNameW; - - TRACE("setcurrdir: %s\n",lpPathName); - - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return FALSE; - - return SetCurrentDirectoryW(PathNameW); -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetCurrentDirectoryW ( - LPCWSTR lpPathName - ) -{ - UNICODE_STRING UnicodeString; - NTSTATUS Status; - - RtlInitUnicodeString (&UnicodeString, - lpPathName); - - Status = RtlSetCurrentDirectory_U (&UnicodeString); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - * - * NOTE: Windows returns a dos/short (8.3) path - */ -DWORD -WINAPI -GetTempPathA ( - DWORD nBufferLength, - LPSTR lpBuffer - ) -{ - WCHAR BufferW[MAX_PATH]; - DWORD ret; - - ret = GetTempPathW(MAX_PATH, BufferW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); -} - - -/* - * @implemented - * - * ripped from wine - */ -DWORD -WINAPI -GetTempPathW ( - DWORD count, - LPWSTR path - ) -{ - static const WCHAR tmp[] = { 'T', 'M', 'P', 0 }; - static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; - static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; - WCHAR tmp_path[MAX_PATH]; - UINT ret; - - TRACE("%u,%p\n", count, path); - - if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH )) && - !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && - !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && - !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_path, NULL); - if (!ret) return 0; - - if (ret > MAX_PATH - 2) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - if (tmp_path[ret-1] != '\\') - { - tmp_path[ret++] = '\\'; - tmp_path[ret] = '\0'; - } - - ret++; /* add space for terminating 0 */ - - if (count) - { - lstrcpynW(path, tmp_path, count); - if (count >= ret) - ret--; /* return length without 0 */ - else if (count < 4) - path[0] = 0; /* avoid returning ambiguous "X:" */ - } - - TRACE("GetTempPathW returning %u, %S\n", ret, path); - return ret; - -} - - -/* - * @implemented - */ -UINT -WINAPI -GetSystemDirectoryA ( - LPSTR lpBuffer, - UINT uSize - ) -{ - return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); -} - - -/* - * @implemented - */ -UINT -WINAPI -GetSystemDirectoryW ( - LPWSTR lpBuffer, - UINT uSize - ) -{ - ULONG Length; - - Length = SystemDirectory.Length / sizeof (WCHAR); - - if (lpBuffer == NULL) - return Length + 1; - - if (uSize > Length) { - memmove (lpBuffer, - SystemDirectory.Buffer, - SystemDirectory.Length); - lpBuffer[Length] = 0; - - return Length; //good: ret chars excl. nullchar - } - - return Length+1; //bad: ret space needed incl. nullchar -} - -/* - * @implemented - */ -UINT -WINAPI -GetWindowsDirectoryA ( - LPSTR lpBuffer, - UINT uSize - ) -{ - return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); -} - - -/* - * @implemented - */ -UINT -WINAPI -GetWindowsDirectoryW ( - LPWSTR lpBuffer, - UINT uSize - ) -{ - ULONG Length; - - Length = WindowsDirectory.Length / sizeof (WCHAR); - - if (lpBuffer == NULL) - return Length + 1; - - if (uSize > Length) - { - memmove (lpBuffer, - WindowsDirectory.Buffer, - WindowsDirectory.Length); - lpBuffer[Length] = 0; - - return Length; //good: ret chars excl. nullchar - } - - return Length+1; //bad: ret space needed incl. nullchar -} - -/* - * @implemented - */ -UINT -WINAPI -GetSystemWindowsDirectoryA( - LPSTR lpBuffer, - UINT uSize - ) -{ - return GetWindowsDirectoryA( lpBuffer, uSize ); -} - -/* - * @implemented - */ -UINT -WINAPI -GetSystemWindowsDirectoryW( - LPWSTR lpBuffer, - UINT uSize - ) -{ - return GetWindowsDirectoryW( lpBuffer, uSize ); -} - -/* - * @unimplemented - */ -UINT -WINAPI -GetSystemWow64DirectoryW( - LPWSTR lpBuffer, - UINT uSize - ) -{ -#ifdef _WIN64 - ERR("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n"); - return 0; -#else - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -#endif -} - -/* - * @unimplemented - */ -UINT -WINAPI -GetSystemWow64DirectoryA( - LPSTR lpBuffer, - UINT uSize - ) -{ -#ifdef _WIN64 - WCHAR BufferW[MAX_PATH]; - UINT ret; - - ret = GetSystemWow64DirectoryW(BufferW, MAX_PATH); - - if (!ret) return 0; - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(lpBuffer, uSize, BufferW, ret+1); -#else - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -#endif -} - -/* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 23:01:04 2011 @@ -17,6 +17,10 @@ UNICODE_STRING BaseDllDirectory; UNICODE_STRING NoDefaultCurrentDirectoryInExePath = RTL_CONSTANT_STRING(L"NoDefaultCurrentDirectoryInExePath"); +UNICODE_STRING SystemDirectory; +UNICODE_STRING WindowsDirectory; +UNICODE_STRING BaseDefaultPathAppend; +UNICODE_STRING BaseDefaultPath; /* This is bitmask for each illegal filename character */ /* If someone has time, please feel free to use 0b notation */ @@ -452,7 +456,7 @@ /* * @implemented - * + * * NOTE: Many of these A functions may seem to do rather complex A<->W mapping * beyond what you would usually expect. There are two main reasons: * @@ -1471,4 +1475,293 @@ return ReturnLength; } +/* + * @implemented + */ +DWORD +WINAPI +GetCurrentDirectoryA(IN DWORD nBufferLength, + IN LPSTR lpBuffer) +{ + WCHAR BufferW[MAX_PATH]; + DWORD ret; + + ret = GetCurrentDirectoryW(MAX_PATH, BufferW); + + if (!ret) return 0; + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); +} + +/* + * @implemented + */ +DWORD +WINAPI +GetCurrentDirectoryW(IN DWORD nBufferLength, + IN LPWSTR lpBuffer) +{ + ULONG Length; + + Length = RtlGetCurrentDirectory_U (nBufferLength * sizeof(WCHAR), lpBuffer); + return (Length / sizeof (WCHAR)); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetCurrentDirectoryA(IN LPCSTR lpPathName) +{ + PWCHAR PathNameW; + + DPRINT("setcurrdir: %s\n",lpPathName); + + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) return FALSE; + + return SetCurrentDirectoryW(PathNameW); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetCurrentDirectoryW(IN LPCWSTR lpPathName) +{ + UNICODE_STRING UnicodeString; + NTSTATUS Status; + + RtlInitUnicodeString(&UnicodeString, lpPathName); + + Status = RtlSetCurrentDirectory_U(&UnicodeString); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError (Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + * + * NOTE: Windows returns a dos/short (8.3) path + */ +DWORD +WINAPI +GetTempPathA(IN DWORD nBufferLength, + IN LPSTR lpBuffer) +{ + WCHAR BufferW[MAX_PATH]; + DWORD ret; + + ret = GetTempPathW(MAX_PATH, BufferW); + + if (!ret) return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); +} + +/* + * @implemented + * + * ripped from wine + */ +DWORD +WINAPI +GetTempPathW(IN DWORD count, + IN LPWSTR path) +{ + static const WCHAR tmp[] = { 'T', 'M', 'P', 0 }; + static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; + static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; + WCHAR tmp_path[MAX_PATH]; + UINT ret; + + DPRINT("%u,%p\n", count, path); + + if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && + !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_path, NULL); + if (!ret) return 0; + + if (ret > MAX_PATH - 2) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + if (tmp_path[ret-1] != '\\') + { + tmp_path[ret++] = '\\'; + tmp_path[ret] = '\0'; + } + + ret++; /* add space for terminating 0 */ + + if (count) + { + lstrcpynW(path, tmp_path, count); + if (count >= ret) + ret--; /* return length without 0 */ + else if (count < 4) + path[0] = 0; /* avoid returning ambiguous "X:" */ + } + + DPRINT("GetTempPathW returning %u, %S\n", ret, path); + return ret; +} + +/* + * @implemented + */ +UINT +WINAPI +GetSystemDirectoryA(IN LPSTR lpBuffer, + IN UINT uSize) +{ + return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); +} + +/* + * @implemented + */ +UINT +WINAPI +GetSystemDirectoryW(IN LPWSTR lpBuffer, + IN UINT uSize) +{ + ULONG Length; + + Length = SystemDirectory.Length / sizeof (WCHAR); + + if (lpBuffer == NULL) return Length + 1; + + if (uSize > Length) + { + memmove(lpBuffer, SystemDirectory.Buffer, SystemDirectory.Length); + lpBuffer[Length] = 0; + + return Length; //good: ret chars excl. nullchar + } + + return Length+1; //bad: ret space needed incl. nullchar +} + +/* + * @implemented + */ +UINT +WINAPI +GetWindowsDirectoryA(IN LPSTR lpBuffer, + IN UINT uSize) +{ + return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); +} + +/* + * @implemented + */ +UINT +WINAPI +GetWindowsDirectoryW(IN LPWSTR lpBuffer, + IN UINT uSize) +{ + ULONG Length; + + Length = WindowsDirectory.Length / sizeof (WCHAR); + + if (lpBuffer == NULL) return Length + 1; + + if (uSize > Length) + { + memmove(lpBuffer, WindowsDirectory.Buffer, WindowsDirectory.Length); + lpBuffer[Length] = 0; + + return Length; //good: ret chars excl. nullchar + } + + return Length+1; //bad: ret space needed incl. nullchar +} + +/* + * @implemented + */ +UINT +WINAPI +GetSystemWindowsDirectoryA(IN LPSTR lpBuffer, + IN UINT uSize) +{ + return GetWindowsDirectoryA(lpBuffer, uSize); +} + +/* + * @implemented + */ +UINT +WINAPI +GetSystemWindowsDirectoryW(IN LPWSTR lpBuffer, + IN UINT uSize) +{ + return GetWindowsDirectoryW(lpBuffer, uSize); +} + +/* + * @unimplemented + */ +UINT +WINAPI +GetSystemWow64DirectoryW(IN LPWSTR lpBuffer, + IN UINT uSize) +{ +#ifdef _WIN64 + UNIMPLEMENTED; + return 0; +#else + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +#endif +} + +/* + * @unimplemented + */ +UINT +WINAPI +GetSystemWow64DirectoryA(IN LPSTR lpBuffer, + IN UINT uSize) +{ +#ifdef _WIN64 + UNIMPLEMENTED; + return 0; +#else + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +#endif +} + /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sun Nov 6 23:01:04 2011 @@ -61,7 +61,6 @@ <file>copy.c</file> <file>console.c</file> <file>create.c</file> - <file>curdir.c</file> <file>delete.c</file> <file>deviceio.c</file> <file>dir.c</file>

12 years, 10 months

[ion] 54322: [KERNEL32]: Give the same treatement to SearchPathA. Also add a comment on why exactly the A<->W conversion has to be more complex than what Wine was attempting.

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 22:46:31 2011 New Revision: 54322 URL: http://svn.reactos.org/svn/reactos?rev=54322&view=rev Log: [KERNEL32]: Give the same treatement to SearchPathA. Also add a comment on why exactly the A<->W conversion has to be more complex than what Wine was attempting. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 22:46:31 2011 @@ -28,7 +28,7 @@ 0x10000000 // 7C not allowed }; -/* FUNCTIONS ******************************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /* * Why not use RtlIsNameLegalDOS8Dot3? In fact the actual algorithm body is @@ -267,6 +267,8 @@ return !NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL; } +/* PUBLIC FUNCTIONS ***********************************************************/ + /* * @implemented */ @@ -450,6 +452,18 @@ /* * @implemented + * + * NOTE: Many of these A functions may seem to do rather complex A<->W mapping + * beyond what you would usually expect. There are two main reasons: + * + * First, these APIs are subject to the ANSI/OEM File API selection status that + * the caller has chosen, so we must use the "8BitString" internal Base APIs. + * + * Secondly, the Wide APIs (coming from the 9x world) are coded to return the + * length of the paths in "ANSI" by dividing their internal Wide character count + * by two... this is usually correct when dealing with pure-ASCII codepages but + * not necessarily when dealing with MBCS pre-Unicode sets, which NT supports + * for CJK, for example. */ DWORD WINAPI @@ -545,7 +559,7 @@ /* Conversion worked, now copy the ANSI/OEM buffer into the buffer */ RtlCopyMemory(lpBuffer, AnsiString.Buffer, PathSize + 1); RtlFreeAnsiString(&AnsiString); - + /* And finally, did the caller request file part information? */ if (lpFilePart) { @@ -583,149 +597,175 @@ */ DWORD WINAPI -SearchPathA ( - LPCSTR lpPath, - LPCSTR lpFileName, - LPCSTR lpExtension, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - UNICODE_STRING PathU = { 0, 0, NULL }; - UNICODE_STRING FileNameU = { 0, 0, NULL }; - UNICODE_STRING ExtensionU = { 0, 0, NULL }; - UNICODE_STRING BufferU = { 0, 0, NULL }; - ANSI_STRING Path; - ANSI_STRING FileName; - ANSI_STRING Extension; - ANSI_STRING Buffer; - PWCHAR FilePartW; - DWORD RetValue = 0; - NTSTATUS Status = STATUS_SUCCESS; - - if (!lpFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - RtlInitAnsiString (&Path, - (LPSTR)lpPath); - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - RtlInitAnsiString (&Extension, - (LPSTR)lpExtension); - - /* convert ansi (or oem) strings to unicode */ - if (bIsFileApiAnsi) - { - Status = RtlAnsiStringToUnicodeString (&PathU, - &Path, - TRUE); +SearchPathA(IN LPCSTR lpPath, + IN LPCSTR lpFileName, + IN LPCSTR lpExtension, + IN DWORD nBufferLength, + IN LPSTR lpBuffer, + OUT LPSTR *lpFilePart) +{ + PUNICODE_STRING FileNameString; + UNICODE_STRING PathString, ExtensionString; + NTSTATUS Status; + ULONG PathSize, FilePartSize, AnsiLength; + PWCHAR LocalFilePart, Buffer; + PWCHAR* FilePart; + + /* If the caller wants filepart, use a local wide buffer since this is A */ + FilePart = lpFilePart != NULL ? &LocalFilePart : NULL; + + /* Initialize stuff for Quickie */ + PathSize = 0; + Buffer = NULL; + ExtensionString.Buffer = PathString.Buffer = NULL; + + /* Get the UNICODE_STRING file name */ + FileNameString = Basep8BitStringToStaticUnicodeString(lpFileName); + if (!FileNameString) return 0; + + /* Did the caller specify an extension */ + if (lpExtension) + { + /* Yup, convert it into UNICODE_STRING */ + Status = Basep8BitStringToDynamicUnicodeString(&ExtensionString, + lpExtension); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* Did the caller specify a path */ + if (lpPath) + { + /* Yup, convert it into UNICODE_STRING */ + Status = Basep8BitStringToDynamicUnicodeString(&PathString, lpPath); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* Allocate our output buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, nBufferLength * sizeof(WCHAR)); + if (!Buffer) + { + /* It failed, bail out */ + BaseSetLastNTError(STATUS_NO_MEMORY); + goto Quickie; + } + + /* Now run the Wide search with the input buffer lengths */ + PathSize = SearchPathW(PathString.Buffer, + FileNameString->Buffer, + ExtensionString.Buffer, + nBufferLength, + Buffer, + FilePart); + if (PathSize <= nBufferLength) + { + /* It fits, but is it empty? If so, bail out */ + if (!PathSize) goto Quickie; + + /* The length above is inexact, we need it in ANSI */ + Status = RtlUnicodeToMultiByteSize(&AnsiLength, Buffer, PathSize * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed, fail the call */ + PathSize = 0; + BaseSetLastNTError(Status); + goto Quickie; + } + + /* If the correct ANSI size is too big, return requird length plus a NULL */ + if (AnsiLength >= nBufferLength) + { + PathSize = AnsiLength + 1; + goto Quickie; + } + + /* Now apply the final conversion to ANSI */ + Status = RtlUnicodeToMultiByteN(lpBuffer, + nBufferLength - 1, + &AnsiLength, + Buffer, + PathSize * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed, fail the whole call */ + PathSize = 0; + BaseSetLastNTError(STATUS_NO_MEMORY); + goto Quickie; + } + + /* NULL-terminate and return the real ANSI length */ + lpBuffer[AnsiLength] = ANSI_NULL; + PathSize = AnsiLength; + + /* Now check if the user wanted file part size as well */ + if (lpFilePart) + { + /* If we didn't get a file part, clear the caller's */ + if (!LocalFilePart) + { + *lpFilePart = NULL; + } + else + { + /* Yep, so in this case get the length of the file part too */ + Status = RtlUnicodeToMultiByteSize(&FilePartSize, + Buffer, + (LocalFilePart - Buffer) * + sizeof(WCHAR)); if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; + { + /* We failed to do that, so fail the whole call */ + BaseSetLastNTError(Status); + PathSize = 0; + } + + /* Return the file part buffer */ + *lpFilePart = lpBuffer + FilePartSize; + } + } + } + else + { + /* Our initial buffer guess was too small, allocate a bigger one */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathSize * sizeof(WCHAR)); + if (!Buffer) + { + /* Out of memory, fail everything */ + BaseSetLastNTError(STATUS_NO_MEMORY); + goto Quickie; + } + + /* Do the search again -- it will fail, we just want the path size */ + PathSize = SearchPathW(PathString.Buffer, + FileNameString->Buffer, + ExtensionString.Buffer, + PathSize, + Buffer, + FilePart); + if (!PathSize) goto Quickie; + + /* Convert it to a correct size */ + Status = RtlUnicodeToMultiByteSize(&PathSize, Buffer, PathSize * sizeof(WCHAR)); + if (NT_SUCCESS(Status)) + { + /* Make space for the NULL-char */ + PathSize++; } else { - Status = RtlOemStringToUnicodeString (&PathU, - &Path, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - Status = RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlOemStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - } - - BufferU.MaximumLength = min(nBufferLength * sizeof(WCHAR), USHRT_MAX); - BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - BufferU.MaximumLength); - if (BufferU.Buffer == NULL) - { - Status = STATUS_NO_MEMORY; - goto Cleanup; - } - - Buffer.MaximumLength = min(nBufferLength, USHRT_MAX); - Buffer.Buffer = lpBuffer; - - RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer, - NULL == lpFileName ? NULL : FileNameU.Buffer, - NULL == lpExtension ? NULL : ExtensionU.Buffer, - nBufferLength, - BufferU.Buffer, - &FilePartW); - - if (0 != RetValue) - { - BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - Status = RtlUnicodeStringToAnsiString(&Buffer, - &BufferU, - FALSE); - else - Status = RtlUnicodeStringToOemString(&Buffer, - &BufferU, - FALSE); - - if (NT_SUCCESS(Status) && Buffer.Buffer) - { - /* nul-terminate ascii string */ - Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; - - if (NULL != lpFilePart && BufferU.Length != 0) - { - *lpFilePart = strrchr (lpBuffer, '\\') + 1; - } - } - } - -Cleanup: - RtlFreeHeap (RtlGetProcessHeap (), - 0, - PathU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - ExtensionU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - BufferU.Buffer); - - if (!NT_SUCCESS(Status)) - { + /* Conversion failed for some reason, fail the call */ BaseSetLastNTError(Status); - return 0; - } - - return RetValue; -} - + PathSize = 0; + } + } + +Quickie: + /* Cleanup/complete path */ + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + if (ExtensionString.Buffer) RtlFreeUnicodeString(&ExtensionString); + if (PathString.Buffer) RtlFreeUnicodeString(&PathString); + return PathSize; +} /*********************************************************************** * ContainsPath (Wine name: contains_pathW)

12 years, 10 months

[ion] 54321: [KERNEL32]: Fix infinite loop in FindLFNorSFN_U. [KERNEL32]: Reimplement GetFullPathNameA to implement similar functionality and checks as the other reimplemented A functions, especial...

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 21:00:10 2011 New Revision: 54321 URL: http://svn.reactos.org/svn/reactos?rev=54321&view=rev Log: [KERNEL32]: Fix infinite loop in FindLFNorSFN_U. [KERNEL32]: Reimplement GetFullPathNameA to implement similar functionality and checks as the other reimplemented A functions, especially w.r.t ANSI/OEM and DBCS strings. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 21:00:10 2011 @@ -187,11 +187,10 @@ * Check if it is valid * Note that !IsShortName != IsLongName, these two functions simply help * us determine if a conversion is necessary or not. + * "Found" really means: "Is a conversion necessary?", hence the "!" */ - Found = UseShort ? IsShortName_U(Path, Length) : IsLongName_U(Path, Length); - - /* "Found" really means: "Is a conversion necessary?", hence the ! */ - if (!Found) + Found = UseShort ? !IsShortName_U(Path, Length) : !IsLongName_U(Path, Length); + if (Found) { /* It is! did the caller request to know the markers? */ if ((First) && (Last)) @@ -211,7 +210,7 @@ } /* Return if anything was found and valid */ - return !Found; + return Found; } PWCHAR @@ -454,52 +453,113 @@ */ DWORD WINAPI -GetFullPathNameA ( - LPCSTR lpFileName, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - WCHAR BufferW[MAX_PATH]; - PWCHAR FileNameW; - DWORD ret; - LPWSTR FilePartW = NULL; - - DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return 0; - - ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); - - if (ret < nBufferLength && lpFilePart) - { - /* if the path closed with '\', FilePart is NULL */ - if (!FilePartW) - *lpFilePart=NULL; - else - *lpFilePart = (FilePartW - BufferW) + lpBuffer; - } - - DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", - lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); - - return ret; -} - +GetFullPathNameA(IN LPCSTR lpFileName, + IN DWORD nBufferLength, + IN LPSTR lpBuffer, + IN LPSTR *lpFilePart) +{ + NTSTATUS Status; + PWCHAR Buffer; + ULONG PathSize, FilePartSize; + ANSI_STRING AnsiString; + UNICODE_STRING FileNameString, UniString; + PWCHAR LocalFilePart; + PWCHAR* FilePart; + + /* If the caller wants filepart, use a local wide buffer since this is A */ + FilePart = lpFilePart != NULL ? &LocalFilePart : NULL; + + /* Initialize for Quickie */ + FilePartSize = PathSize = 0; + FileNameString.Buffer = NULL; + + /* First get our string in Unicode */ + Status = Basep8BitStringToDynamicUnicodeString(&FileNameString, lpFileName); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Allocate a buffer to hold teh path name */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + MAX_PATH * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!Buffer) + { + BaseSetLastNTError(STATUS_INSUFFICIENT_RESOURCES); + goto Quickie; + } + + /* Call into RTL to get the full Unicode path name */ + PathSize = RtlGetFullPathName_U(FileNameString.Buffer, + MAX_PATH * sizeof(WCHAR), + Buffer, + FilePart); + if (PathSize <= (MAX_PATH * sizeof(WCHAR))) + { + /* The buffer will fit, get the real ANSI string size now */ + Status = RtlUnicodeToMultiByteSize(&PathSize, Buffer, PathSize); + if (NT_SUCCESS(Status)) + { + /* Now check if the user wanted file part size as well */ + if ((PathSize) && (lpFilePart) && (LocalFilePart)) + { + /* Yep, so in this case get the length of the file part too */ + Status = RtlUnicodeToMultiByteSize(&FilePartSize, + Buffer, + (LocalFilePart - Buffer) * + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + /* We failed to do that, so fail the whole call */ + BaseSetLastNTError(Status); + PathSize = 0; + } + } + } + } + else + { + /* Reset the path size since the buffer is not large enough */ + PathSize = 0; + } + + /* Either no path, or local buffer was too small, enter failure code */ + if (!PathSize) goto Quickie; + + /* If the *caller's* buffer was too small, fail, but add in space for NULL */ + if (PathSize < nBufferLength) + { + PathSize++; + goto Quickie; + } + + /* So far so good, initialize a unicode string to convert back to ANSI/OEM */ + RtlInitUnicodeString(&UniString, Buffer); + Status = BasepUnicodeStringTo8BitString(&AnsiString, &UniString, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Final conversion failed, fail the call */ + BaseSetLastNTError(Status); + PathSize = 0; + } + else + { + /* Conversion worked, now copy the ANSI/OEM buffer into the buffer */ + RtlCopyMemory(lpBuffer, AnsiString.Buffer, PathSize + 1); + RtlFreeAnsiString(&AnsiString); + + /* And finally, did the caller request file part information? */ + if (lpFilePart) + { + /* Use the size we computed earlier and add it to the buffer */ + *lpFilePart = LocalFilePart ? &lpBuffer[FilePartSize] : 0; + } + } + +Quickie: + /* Cleanup and return the path size */ + if (FileNameString.Buffer) RtlFreeUnicodeString(&FileNameString); + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + return PathSize; +} /* * @implemented @@ -511,6 +571,7 @@ IN LPWSTR lpBuffer, OUT LPWSTR *lpFilePart) { + /* Call Rtl to do the work */ return RtlGetFullPathName_U((LPWSTR)lpFileName, nBufferLength * sizeof(WCHAR), lpBuffer,

12 years, 10 months

[ion] 54320: [KERNEL32]: Fix some bugs in previous two commits (thanks Thomas).

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 19:42:59 2011 New Revision: 54320 URL: http://svn.reactos.org/svn/reactos?rev=54320&view=rev Log: [KERNEL32]: Fix some bugs in previous two commits (thanks Thomas). Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 19:42:59 2011 @@ -57,7 +57,7 @@ /* Sure, any emtpy name is a short name */ if (!Length) return TRUE; - /* This could be . or .. or somethign else */ + /* This could be . or .. or something else */ if (*Name == L'.') { /* Which one is it */ @@ -101,7 +101,7 @@ } /* Check for illegal characters */ - if ((c > 0x7F) || (IllegalMask[c / 32] && (1 << (c % 32)))) + if ((c > 0x7F) || (IllegalMask[c / 32] & (1 << (c % 32)))) { return FALSE; } @@ -171,14 +171,14 @@ while (TRUE) { /* Loop within the path skipping slashes */ - while ((*Path) && ((*Path == L'\\') || (*Path == L'/'))) Path++; + while ((*Path == L'\\') || (*Path == L'/')) Path++; /* Make sure there's something after the slashes too! */ if (*Path == UNICODE_NULL) break; - /* Now do the same thing with the last marker */ + /* Now skip past the file name until we get to the first slash */ p = Path + 1; - while ((*p) && ((*p == L'\\') || (*p == L'/'))) p++; + while ((*p) && ((*p != L'\\') && (*p != L'/'))) p++; /* Whatever is in between those two is now the file name length */ Length = p - Path; @@ -804,7 +804,7 @@ ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); /* Do a simple check to see if the path exists */ - if (GetFileAttributesW(lpszShortPath) == 0xFFFFFFF) + if (GetFileAttributesW(lpszShortPath) == INVALID_FILE_ATTRIBUTES) { /* It doesn't, so fail */ ReturnLength = 0; @@ -1111,7 +1111,7 @@ } else { - PathLength = GetLongPathNameW(LongPathUni.Buffer, ShortPath, PathLength); + PathLength = GetShortPathNameW(LongPathUni.Buffer, ShortPath, PathLength); } } @@ -1183,7 +1183,7 @@ ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); /* Do a simple check to see if the path exists */ - if (GetFileAttributesW(lpszShortPath) == 0xFFFFFFF) + if (GetFileAttributesW(lpszShortPath) == INVALID_FILE_ATTRIBUTES) { /* Windows checks for an application compatibility flag to allow this */ if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1))

12 years, 10 months

[cgutman] 54319: [NPFS] - Fix wait parameters so we can break out of a wait if a user APC is delivered and the file object is opened with FILE_SYNCHRONOUS_IO_ALERT - Fixes hanging ntdll:pipe winete...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 6 18:47:51 2011 New Revision: 54319 URL: http://svn.reactos.org/svn/reactos?rev=54319&view=rev Log: [NPFS] - Fix wait parameters so we can break out of a wait if a user APC is delivered and the file object is opened with FILE_SYNCHRONOUS_IO_ALERT - Fixes hanging ntdll:pipe winetest (only 1 failure out of 53 tests now) Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Nov 6 18:47:51 2011 @@ -191,6 +191,8 @@ return; } + Ccb->FileObject = FileObject; + FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -216,6 +218,8 @@ IoStatus->Status = STATUS_NO_MEMORY; return; } + + Ccb->FileObject = FileObject; FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -336,6 +340,7 @@ return STATUS_NO_MEMORY; } + ClientCcb->FileObject = FileObject; ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; #ifndef USING_PROPER_NPFS_WAIT_SEMANTICS @@ -718,6 +723,7 @@ Fcb->CurrentInstances++; Ccb->Fcb = Fcb; + Ccb->FileObject = FileObject; Ccb->PipeEnd = FILE_PIPE_SERVER_END; Ccb->PipeState = FILE_PIPE_LISTENING_STATE; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Nov 6 18:47:51 2011 @@ -186,7 +186,7 @@ KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, Irp->RequestorMode, - FALSE, + (Flags & FO_ALERTABLE_IO), NULL); } @@ -405,8 +405,8 @@ Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, - KernelMode, - TRUE, + Irp->RequestorMode, + (Ccb->FileObject->Flags & FO_ALERTABLE_IO), TimeOut); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); @@ -523,8 +523,8 @@ /* Wait for one */ Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, - KernelMode, - FALSE, + Irp->RequestorMode, + (Ccb->FileObject->Flags & FO_ALERTABLE_IO), &TimeOut); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Sun Nov 6 18:47:51 2011 @@ -83,6 +83,8 @@ LIST_ENTRY CcbListEntry; CCB_TYPE Type; PNPFS_FCB Fcb; + + PFILE_OBJECT FileObject; struct _NPFS_CCB* OtherSide; struct ETHREAD *Thread; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sun Nov 6 18:47:51 2011 @@ -374,11 +374,11 @@ Context->WaitEvent = &Event; ExReleaseFastMutex(&Ccb->DataListLock); Status = KeWaitForSingleObject(&Event, - Executive, + UserRequest, Irp->RequestorMode, - FALSE, + (FileObject->Flags & FO_ALERTABLE_IO), NULL); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) { Status = STATUS_CANCELLED; goto done; @@ -468,11 +468,11 @@ Status = KeWaitForSingleObject(&Ccb->ReadEvent, UserRequest, Irp->RequestorMode, - FALSE, + (FileObject->Flags & FO_ALERTABLE_IO), NULL); DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) { Status = STATUS_CANCELLED; break; @@ -841,11 +841,11 @@ Status = KeWaitForSingleObject(&Ccb->WriteEvent, UserRequest, Irp->RequestorMode, - FALSE, + (FileObject->Flags & FO_ALERTABLE_IO), NULL); DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) { Status = STATUS_CANCELLED; goto done;

12 years, 10 months

[ion] 54318: [KERNEL32]: Rewrite GetLong/ShortPathNameW away from Wine. Some changes: - Windows allows the two input buffers to overlap. This means we have to be very careful with copying (and alwa...

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 17:17:16 2011 New Revision: 54318 URL: http://svn.reactos.org/svn/reactos?rev=54318&view=rev Log: [KERNEL32]: Rewrite GetLong/ShortPathNameW away from Wine. Some changes: - Windows allows the two input buffers to overlap. This means we have to be very careful with copying (and always use RtlMoveMemory) -- the old function was not handling this at all. - We also have to handle cases where we need to make our own local buffer copy. - Length validation is more stringent now. - Checking for short/long path names wasn't correct w.r.t ANSI file mode, as it was calling Rtl which assumes OEM. - Shortcuts were taken while parsing slashes and path separators. We now call into Rtl to support this, and also support unlimited slashes (note that \\??\c:\\\windows\\\\system32 is actully a valid path, for example). - ErrorMode is now correctly set for the thread, to avoid "Insert floppy" or "Close CDROM bay door" errors as we are using the FindFile API. - Correct LastError is set where appropriate. - An application compatibility flag is now supported. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 17:17:16 2011 @@ -18,7 +18,241 @@ UNICODE_STRING BaseDllDirectory; UNICODE_STRING NoDefaultCurrentDirectoryInExePath = RTL_CONSTANT_STRING(L"NoDefaultCurrentDirectoryInExePath"); +/* This is bitmask for each illegal filename character */ +/* If someone has time, please feel free to use 0b notation */ +DWORD IllegalMask[4] = +{ + 0xFFFFFFFF, // None allowed (00 to 1F) + 0xFC009C05, // 20, 22, 2A, 2B, 2C, 2F, 3A, 3B, 3C, 3D, 3E, 3F not allowed + 0x38000000, // 5B, 5C, 5D not allowed + 0x10000000 // 7C not allowed +}; + /* FUNCTIONS ******************************************************************/ + +/* + * Why not use RtlIsNameLegalDOS8Dot3? In fact the actual algorithm body is + * identical (other than the Rtl can optionally check for spaces), however the + * Rtl will always convert to OEM, while kernel32 has two possible file modes + * (ANSI or OEM). Therefore we must duplicate the algorithm body to get + * the correct compatible results + */ +BOOL +WINAPI +IsShortName_U(IN PWCHAR Name, + IN ULONG Length) +{ + BOOLEAN HasExtension; + WCHAR c; + NTSTATUS Status; + UNICODE_STRING UnicodeName; + ANSI_STRING AnsiName; + ULONG i, Dots; + CHAR AnsiBuffer[MAX_PATH]; + ASSERT(Name); + + /* What do you think 8.3 means? */ + if (Length > 12) return FALSE; + + /* Sure, any emtpy name is a short name */ + if (!Length) return TRUE; + + /* This could be . or .. or somethign else */ + if (*Name == L'.') + { + /* Which one is it */ + if ((Length == 1) || ((Length == 2) && *(Name + 1) == L'.')) + { + /* . or .., this is good */ + return TRUE; + } + + /* Some other bizare dot-based name, not good */ + return FALSE; + } + + /* Initialize our two strings */ + RtlInitEmptyAnsiString(&AnsiName, AnsiBuffer, MAX_PATH); + RtlInitEmptyUnicodeString(&UnicodeName, Name, Length * sizeof(WCHAR)); + UnicodeName.Length = UnicodeName.MaximumLength; + + /* Now do the conversion */ + Status = BasepUnicodeStringTo8BitString(&AnsiName, &UnicodeName, FALSE); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Now we loop the name */ + HasExtension = FALSE; + for (i = 0, Dots = Length - 1; i < AnsiName.Length; i++, Dots--) + { + /* Read the current byte */ + c = AnsiName.Buffer[i]; + + /* Is it DBCS? */ + if (IsDBCSLeadByte(c)) + { + /* If we're near the end of the string, we can't allow a DBCS */ + if ((!(HasExtension) && (i >= 7)) || (i == AnsiName.Length - 1)) + { + return FALSE; + } + + /* Otherwise we skip over it */ + continue; + } + + /* Check for illegal characters */ + if ((c > 0x7F) || (IllegalMask[c / 32] && (1 << (c % 32)))) + { + return FALSE; + } + + /* Check if this is perhaps an extension? */ + if (c == L'.') + { + /* Unless the extension is too large or there's more than one */ + if ((HasExtension) || (Dots > 3)) return FALSE; + + /* This looks like an extension */ + HasExtension = TRUE; + } + + /* 8.3 length was validated, but now we must guard against 9.2 or similar */ + if ((i >= 8) && !(HasExtension)) return FALSE; + } + + /* You survived the loop, this is a good short name */ + return TRUE; +} + +BOOL +WINAPI +IsLongName_U(IN PWCHAR FileName, + IN ULONG Length) +{ + BOOLEAN HasExtension; + ULONG i, Dots; + + /* More than 8.3, any combination of dots, and NULL names are all long */ + if (!(Length) || (Length > 12) || (*FileName == L'.')) return TRUE; + + /* Otherwise, initialize our scanning loop */ + HasExtension = FALSE; + for (i = 0, Dots = Length - 1; i < Length; i++, Dots--) + { + /* Check if this could be an extension */ + if (*FileName == '.') + { + /* Unlike the short case, we WANT more than one extension, or a long one */ + if ((HasExtension) || (Dots > 3)) return TRUE; + HasExtension = TRUE; + } + + /* Check if this would violate the "8" in 8.3, ie. 9.2 */ + if ((i >= 8) && (!HasExtension)) return TRUE; + } + + /* The name *seems* to conform to 8.3 */ + return FALSE; +} + +BOOL +WINAPI +FindLFNorSFN_U(IN PWCHAR Path, + OUT PWCHAR *First, + OUT PWCHAR *Last, + IN BOOL UseShort) +{ + PWCHAR p; + ULONG Length; + BOOL Found = 0; + ASSERT(Path); + + /* Loop while there is something in the path */ + while (TRUE) + { + /* Loop within the path skipping slashes */ + while ((*Path) && ((*Path == L'\\') || (*Path == L'/'))) Path++; + + /* Make sure there's something after the slashes too! */ + if (*Path == UNICODE_NULL) break; + + /* Now do the same thing with the last marker */ + p = Path + 1; + while ((*p) && ((*p == L'\\') || (*p == L'/'))) p++; + + /* Whatever is in between those two is now the file name length */ + Length = p - Path; + + /* + * Check if it is valid + * Note that !IsShortName != IsLongName, these two functions simply help + * us determine if a conversion is necessary or not. + */ + Found = UseShort ? IsShortName_U(Path, Length) : IsLongName_U(Path, Length); + + /* "Found" really means: "Is a conversion necessary?", hence the ! */ + if (!Found) + { + /* It is! did the caller request to know the markers? */ + if ((First) && (Last)) + { + /* Return them */ + *First = Path; + *Last = p; + } + break; + } + + /* Is there anything else following this sub-path/filename? */ + if (*p == UNICODE_NULL) break; + + /* Yes, keep going */ + Path = p + 1; + } + + /* Return if anything was found and valid */ + return !Found; +} + +PWCHAR +WINAPI +SkipPathTypeIndicator_U(IN PWCHAR Path) +{ + PWCHAR ReturnPath; + ULONG i; + + /* Check what kind of path this is and how many slashes to skip */ + switch (RtlDetermineDosPathNameType_U(Path)) + { + case RtlPathTypeDriveAbsolute: + return Path + 3; + + case RtlPathTypeDriveRelative: + return Path + 2; + + case RtlPathTypeRooted: + return Path + 1; + + case RtlPathTypeRelative: + return Path; + + case RtlPathTypeRootLocalDevice: + default: + return NULL; + + case RtlPathTypeUncAbsolute: + case RtlPathTypeLocalDevice: + + /* Keep going until we bypass the path indicators */ + for (ReturnPath = Path + 2, i = 2; (i > 0) && (*ReturnPath); ReturnPath++) + { + /* We look for 2 slashes, so keep at it until we find them */ + if ((*ReturnPath == L'\\') || (*ReturnPath == L'/')) i--; + } + + return ReturnPath; + } +} BOOL WINAPI @@ -536,108 +770,221 @@ return ret; } -/*********************************************************************** +/* * @implemented - * - * GetLongPathNameW (KERNEL32.@) - * - * NOTES - * observed (Win2000): - * shortpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0 - * shortpath="": LastError=ERROR_PATH_NOT_FOUND, ret=0 - */ -DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) -{ -#define MAX_PATHNAME_LEN 1024 - - WCHAR tmplongpath[MAX_PATHNAME_LEN]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - BOOL unixabsolute; - WIN32_FIND_DATAW wfd; - HANDLE goit; - - if (!shortpath) - { + */ +DWORD +WINAPI +GetLongPathNameW(IN LPCWSTR lpszShortPath, + IN LPWSTR lpszLongPath, + IN DWORD cchBuffer) +{ + PWCHAR Path, Original, First, Last, Buffer, Src, Dst; + ULONG Length; + WCHAR LastChar; + HANDLE FindHandle; + DWORD ReturnLength; + ULONG ErrorMode; + BOOLEAN Found; + WIN32_FIND_DATAW FindFileData; + + /* Initialize so Quickie knows there's nothing to do */ + Buffer = Original = NULL; + ReturnLength = 0; + + /* First check if the input path was obviously NULL */ + if (!lpszShortPath) + { + /* Fail the request */ SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (!shortpath[0]) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return 0; - } - - DPRINT("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); - - if (shortpath[0] == '\\' && shortpath[1] == '\\') - { - DPRINT1("ERR: UNC pathname %s\n", shortpath); - lstrcpynW( longpath, shortpath, longlen ); - return wcslen(longpath); - } - unixabsolute = (shortpath[0] == '/'); - /* check for drive letter */ - if (!unixabsolute && shortpath[1] == ':' ) - { - tmplongpath[0] = shortpath[0]; - tmplongpath[1] = ':'; - lp = sp = 2; - } - - while (shortpath[sp]) - { - /* check for path delimiters and reproduce them */ - if (shortpath[sp] == '\\' || shortpath[sp] == '/') - { - if (!lp || tmplongpath[lp-1] != '\\') + + /* We will be touching removed, removable drives -- don't warn the user */ + ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); + + /* Do a simple check to see if the path exists */ + if (GetFileAttributesW(lpszShortPath) == 0xFFFFFFF) + { + /* It doesn't, so fail */ + ReturnLength = 0; + goto Quickie; + } + + /* Now get a pointer to the actual path, skipping indicators */ + Path = SkipPathTypeIndicator_U((PWCHAR)lpszShortPath); + + /* Try to find a file name in there */ + if (Path) Found = FindLFNorSFN_U(Path, &First, &Last, FALSE); + + /* Is there any path or filename in there? */ + if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) + { + /* There isn't, so the long path is simply the short path */ + ReturnLength = wcslen(lpszShortPath); + + /* Is there space for it? */ + if ((cchBuffer > ReturnLength) && (lpszLongPath)) + { + /* Make sure the pointers aren't already the same */ + if (lpszLongPath != lpszShortPath) { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; + /* They're not -- copy the short path into the long path */ + RtlMoveMemory(lpszLongPath, + lpszShortPath, + ReturnLength * sizeof(WCHAR) + sizeof(UNICODE_NULL)); } - tmplongpath[lp] = 0; /* terminate string */ - sp++; - continue; - } - - p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - } - for (; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (shortpath + sp); - lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); - /* Check if the file exists and use the existing file name */ - goit = FindFirstFileW(tmplongpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) - { - DPRINT("not found %s!\n", tmplongpath); - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; - } - FindClose(goit); - wcscpy(tmplongpath + lp, wfd.cFileName); - lp += wcslen(tmplongpath + lp); - sp += tmplen; - } - tmplen = wcslen(shortpath) - 1; - if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && - (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) - tmplongpath[lp++] = shortpath[tmplen]; - tmplongpath[lp] = 0; - - tmplen = wcslen(tmplongpath) + 1; - if (tmplen <= longlen) - { - wcscpy(longpath, tmplongpath); - DPRINT("returning %s\n", longpath); - tmplen--; /* length without 0 */ - } - - return tmplen; + } + else + { + /* Otherwise, let caller know we need a bigger buffer, include NULL */ + ReturnLength++; + } + goto Quickie; + } + + /* We are still in the game -- compute the current size */ + Length = wcslen(lpszShortPath) + sizeof(ANSI_NULL); + Original = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); + if (!Original) goto ErrorQuickie; + + /* Make a copy ofi t */ + RtlMoveMemory(Original, lpszShortPath, Length * sizeof(WCHAR)); + + /* Compute the new first and last markers */ + First = &Original[First - lpszShortPath]; + Last = &Original[Last - lpszShortPath]; + + /* Set the current destination pointer for a copy */ + Dst = lpszLongPath; + + /* + * Windows allows the paths to overlap -- we have to be careful with this and + * see if it's same to do so, and if not, allocate our own internal buffer + * that we'll return at the end. + * + * This is also why we use RtlMoveMemory everywhere. Don't use RtlCopyMemory! + */ + if ((cchBuffer) && (lpszLongPath) && + (((lpszLongPath >= lpszShortPath) && (lpszLongPath < &lpszShortPath[Length])) || + ((lpszLongPath < lpszShortPath) && (&lpszLongPath[cchBuffer] >= lpszShortPath)))) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchBuffer * sizeof(WCHAR)); + if (!Buffer) goto ErrorQuickie; + + /* New destination */ + Dst = Buffer; + } + + /* Prepare for the loop */ + Src = Original; + ReturnLength = 0; + while (TRUE) + { + /* Current delta in the loop */ + Length = First - Src; + + /* Update the return length by it */ + ReturnLength += Length; + + /* Is there a delta? If so, is there space and buffer for it? */ + if ((Length) && (cchBuffer > ReturnLength) && (lpszLongPath)) + { + RtlMoveMemory(Dst, Src, Length * sizeof(WCHAR)); + Dst += Length; + } + + /* "Terminate" this portion of the path's substring so we can do a find */ + LastChar = *Last; + *Last = UNICODE_NULL; + FindHandle = FindFirstFileW(Original, &FindFileData); + *Last = LastChar; + + /* This portion wasn't found, so fail */ + if (FindHandle == INVALID_HANDLE_VALUE) + { + ReturnLength = 0; + break; + } + + /* Close the find handle */ + FindClose(FindHandle); + + /* Now check the length of the long name */ + Length = wcslen(FindFileData.cFileName); + if (Length) + { + /* This is our new first marker */ + First = FindFileData.cFileName; + } + else + { + /* Otherwise, the name is the delta between our current markers */ + Length = Last - First; + } + + /* Update the return length with the short name length, if any */ + ReturnLength += Length; + + /* Once again check for appropriate space and buffer */ + if ((cchBuffer > ReturnLength) && (lpszLongPath)) + { + /* And do the copy if there is */ + RtlMoveMemory(Dst, First, Length * sizeof(WCHAR)); + Dst += Length; + } + + /* Now update the source pointer */ + Src = Last; + if (*Src == UNICODE_NULL) break; + + /* Are there more names in there? */ + Found = FindLFNorSFN_U(Src, &First, &Last, FALSE); + if (!Found) break; + } + + /* The loop is done, is there anything left? */ + if (ReturnLength) + { + /* Get the length of the straggling path */ + Length = wcslen(Src); + ReturnLength += Length; + + /* Once again check for appropriate space and buffer */ + if ((cchBuffer > ReturnLength) && (lpszLongPath)) + { + /* And do the copy if there is -- accounting for NULL here */ + RtlMoveMemory(Dst, Src, Length * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + + /* What about our buffer? */ + if (Buffer) + { + /* Copy it into the caller's long path */ + RtlMoveMemory(lpszLongPath, + Buffer, + ReturnLength * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + } + } + else + { + /* Buffer is too small, let the caller know, making space for NULL */ + ReturnLength++; + } + } + + /* We're all done */ + goto Quickie; + +ErrorQuickie: + /* This is the goto for memory failures */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + +Quickie: + /* General function end: free memory, restore error mode, return length */ + if (Original) RtlFreeHeap(RtlGetProcessHeap(), 0, Original); + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetErrorMode(ErrorMode); + return ReturnLength; } /* @@ -660,13 +1007,13 @@ LongPathAnsi.Buffer = NULL; ShortPathUni.Buffer = NULL; Result = 0; - + if (!lpszShortPath) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - + Status = Basep8BitStringToDynamicUnicodeString(&ShortPathUni, lpszShortPath); if (!NT_SUCCESS(Status)) goto Quickie; @@ -686,7 +1033,7 @@ PathLength = GetLongPathNameW(ShortPathUni.Buffer, LongPath, PathLength); } } - + if (!PathLength) goto Quickie; ShortPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); @@ -741,13 +1088,13 @@ ShortPathAnsi.Buffer = NULL; LongPathUni.Buffer = NULL; Result = 0; - + if (!lpszLongPath) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - + Status = Basep8BitStringToDynamicUnicodeString(&LongPathUni, lpszLongPath); if (!NT_SUCCESS(Status)) goto Quickie; @@ -767,7 +1114,7 @@ PathLength = GetLongPathNameW(LongPathUni.Buffer, ShortPath, PathLength); } } - + if (!PathLength) goto Quickie; LongPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); @@ -802,109 +1149,225 @@ return Result; } - -/* - * NOTE: Copied from Wine. +/* * @implemented */ DWORD WINAPI -GetShortPathNameW ( - LPCWSTR longpath, - LPWSTR shortpath, - DWORD shortlen - ) -{ - WCHAR tmpshortpath[MAX_PATH]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - WIN32_FIND_DATAW wfd; - HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; - - DPRINT("GetShortPathNameW: %S\n",longpath); - - if (!longpath) - { +GetShortPathNameW(IN LPCWSTR lpszLongPath, + IN LPWSTR lpszShortPath, + IN DWORD cchBuffer) +{ + PWCHAR Path, Original, First, Last, Buffer, Src, Dst; + ULONG Length; + WCHAR LastChar; + HANDLE FindHandle; + DWORD ReturnLength; + ULONG ErrorMode; + BOOLEAN Found; + WIN32_FIND_DATAW FindFileData; + + /* Initialize so Quickie knows there's nothing to do */ + Buffer = Original = NULL; + ReturnLength = 0; + + /* First check if the input path was obviously NULL */ + if (!lpszLongPath) + { + /* Fail the request */ SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (!longpath[0]) - { - SetLastError(ERROR_BAD_PATHNAME); - return 0; - } - - /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) - { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; - } - - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - - while (longpath[lp]) - { - /* check for path delimiters and reproduce them */ - if (longpath[lp] == '\\' || longpath[lp] == '/') - { - if (!sp || tmpshortpath[sp-1] != '\\') + + /* We will be touching removed, removable drives -- don't warn the user */ + ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); + + /* Do a simple check to see if the path exists */ + if (GetFileAttributesW(lpszShortPath) == 0xFFFFFFF) + { + /* Windows checks for an application compatibility flag to allow this */ + if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1)) + { + /* It doesn't, so fail */ + ReturnLength = 0; + goto Quickie; + } + } + + /* Now get a pointer to the actual path, skipping indicators */ + Path = SkipPathTypeIndicator_U((PWCHAR)lpszShortPath); + + /* Try to find a file name in there */ + if (Path) Found = FindLFNorSFN_U(Path, &First, &Last, TRUE); + + /* Is there any path or filename in there? */ + if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) + { + /* There isn't, so the long path is simply the short path */ + ReturnLength = wcslen(lpszLongPath); + + /* Is there space for it? */ + if ((cchBuffer > ReturnLength) && (lpszLongPath)) + { + /* Make sure the pointers aren't already the same */ + if (lpszLongPath != lpszShortPath) { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; - sp++; + /* They're not -- copy the short path into the long path */ + RtlMoveMemory(lpszShortPath, + lpszLongPath, + ReturnLength * sizeof(WCHAR) + sizeof(UNICODE_NULL)); } - tmpshortpath[sp] = 0; /* terminate string */ - lp++; - continue; - } - - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) - { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = (USHORT)tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) + } + else + { + /* Otherwise, let caller know we need a bigger buffer, include NULL */ + ReturnLength++; + } + goto Quickie; + } + + /* We are still in the game -- compute the current size */ + Length = wcslen(lpszLongPath) + sizeof(ANSI_NULL); + Original = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); + if (!Original) goto ErrorQuickie; + + /* Make a copy of it */ + wcsncpy(Original, lpszLongPath, Length); + + /* Compute the new first and last markers */ + First = &Original[First - lpszLongPath]; + Last = &Original[Last - lpszLongPath]; + + /* Set the current destination pointer for a copy */ + Dst = lpszShortPath; + + /* + * Windows allows the paths to overlap -- we have to be careful with this and + * see if it's same to do so, and if not, allocate our own internal buffer + * that we'll return at the end. + * + * This is also why we use RtlMoveMemory everywhere. Don't use RtlCopyMemory! + */ + if ((cchBuffer) && (lpszShortPath) && + (((lpszShortPath >= lpszLongPath) && (lpszShortPath < &lpszLongPath[Length])) || + ((lpszShortPath < lpszLongPath) && (&lpszShortPath[cchBuffer] >= lpszLongPath)))) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchBuffer * sizeof(WCHAR)); + if (!Buffer) goto ErrorQuickie; + + /* New destination */ + Dst = Buffer; + } + + /* Prepare for the loop */ + Src = Original; + ReturnLength = 0; + while (TRUE) + { + /* Current delta in the loop */ + Length = First - Src; + + /* Update the return length by it */ + ReturnLength += Length; + + /* Is there a delta? If so, is there space and buffer for it? */ + if ((Length) && (cchBuffer > ReturnLength) && (lpszShortPath)) + { + RtlMoveMemory(Dst, Src, Length * sizeof(WCHAR)); + Dst += Length; + } + + /* "Terminate" this portion of the path's substring so we can do a find */ + LastChar = *Last; + *Last = UNICODE_NULL; + FindHandle = FindFirstFileW(Original, &FindFileData); + *Last = LastChar; + + /* This portion wasn't found, so fail */ + if (FindHandle == INVALID_HANDLE_VALUE) + { + ReturnLength = 0; + break; + } + + /* Close the find handle */ + FindClose(FindHandle); + + /* Now check the length of the short name */ + Length = wcslen(FindFileData.cAlternateFileName); + if (Length) + { + /* This is our new first marker */ + First = FindFileData.cAlternateFileName; + } + else + { + /* Otherwise, the name is the delta between our current markers */ + Length = Last - First; + } + + /* Update the return length with the short name length, if any */ + ReturnLength += Length; + + /* Once again check for appropriate space and buffer */ + if ((cchBuffer > ReturnLength) && (lpszShortPath)) + { + /* And do the copy if there is */ + RtlMoveMemory(Dst, First, Length * sizeof(WCHAR)); + Dst += Length; + } + + /* Now update the source pointer */ + Src = Last; + if (*Src == UNICODE_NULL) break; + + /* Are there more names in there? */ + Found = FindLFNorSFN_U(Src, &First, &Last, TRUE); + if (!Found) break; + } + + /* The loop is done, is there anything left? */ + if (ReturnLength) + { + /* Get the length of the straggling path */ + Length = wcslen(Src); + ReturnLength += Length; + + /* Once again check for appropriate space and buffer */ + if ((cchBuffer > ReturnLength) && (lpszShortPath)) + { + /* And do the copy if there is -- accounting for NULL here */ + RtlMoveMemory(Dst, Src, Length * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + + /* What about our buffer? */ + if (Buffer) { - sp += tmplen; - lp += tmplen; - continue; + /* Copy it into the caller's long path */ + RtlMoveMemory(lpszShortPath, + Buffer, + ReturnLength * sizeof(WCHAR) + sizeof(UNICODE_NULL)); } } - - /* Check if the file exists and use the existing short file name */ - goit = FindFirstFileW(tmpshortpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) goto notfound; - FindClose(goit); - lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); - sp += lstrlenW(tmpshortpath + sp); - lp += tmplen; - } - tmpshortpath[sp] = 0; - - tmplen = lstrlenW(tmpshortpath) + 1; - if (tmplen <= shortlen) - { - lstrcpyW(shortpath, tmpshortpath); - tmplen--; /* length without 0 */ - } - - return tmplen; - - notfound: - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; + else + { + /* Buffer is too small, let the caller know, making space for NULL */ + ReturnLength++; + } + } + + /* We're all done */ + goto Quickie; + +ErrorQuickie: + /* This is the goto for memory failures */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + +Quickie: + /* General function end: free memory, restore error mode, return length */ + if (Original) RtlFreeHeap(RtlGetProcessHeap(), 0, Original); + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetErrorMode(ErrorMode); + return ReturnLength; } /* EOF */

12 years, 10 months

[tfaber] 54317: [KERNEL32] - Use the correct buffer length in GetDllDirectoryA - Do not always return FALSE from BasepIsCurDirAllowedForPlainExeNames - Some cosmetic fixes

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 6 15:52:20 2011 New Revision: 54317 URL: http://svn.reactos.org/svn/reactos?rev=54317&view=rev Log: [KERNEL32] - Use the correct buffer length in GetDllDirectoryA - Do not always return FALSE from BasepIsCurDirAllowedForPlainExeNames - Some cosmetic fixes Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 15:52:20 2011 @@ -28,10 +28,10 @@ UNICODE_STRING EmptyString; RtlInitEmptyUnicodeString(&EmptyString, NULL, 0); - Status = RtlQueryEnvironmentVariable_U(0, + Status = RtlQueryEnvironmentVariable_U(NULL, &NoDefaultCurrentDirectoryInExePath, &EmptyString); - return NT_SUCCESS(Status); + return !NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL; } /* @@ -45,7 +45,7 @@ if (lpPathName) { - if (wcschr(lpPathName, ';')) + if (wcschr(lpPathName, L';')) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -53,12 +53,12 @@ if (!RtlCreateUnicodeString(&DllDirectory, lpPathName)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + return FALSE; } } else { - RtlInitUnicodeString(&DllDirectory, 0); + RtlInitUnicodeString(&DllDirectory, NULL); } RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -69,7 +69,7 @@ RtlLeaveCriticalSection(&BaseDllDirectoryLock); RtlFreeUnicodeString(&OldDirectory); - return 1; + return TRUE; } /* @@ -102,12 +102,12 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - return 0; + return FALSE; } } else { - RtlInitUnicodeString(&DllDirectory, 0); + RtlInitUnicodeString(&DllDirectory, NULL); } RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -118,7 +118,7 @@ RtlLeaveCriticalSection(&BaseDllDirectoryLock); RtlFreeUnicodeString(&OldDirectory); - return 1; + return TRUE; } /* @@ -132,11 +132,11 @@ ULONG Length; RtlEnterCriticalSection(&BaseDllDirectoryLock); - + if ((nBufferLength * sizeof(WCHAR)) > BaseDllDirectory.Length) { RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, BaseDllDirectory.Length); - Length = BaseDllDirectory.Length / sizeof(WCHAR); + Length = BaseDllDirectory.Length / sizeof(WCHAR); lpBuffer[Length] = UNICODE_NULL; } else @@ -144,7 +144,7 @@ Length = (BaseDllDirectory.Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); if (lpBuffer) *lpBuffer = UNICODE_NULL; } - + RtlLeaveCriticalSection(&BaseDllDirectoryLock); return Length; } @@ -161,7 +161,7 @@ ANSI_STRING AnsiDllDirectory; ULONG Length; - RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, 0); + RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, nBufferLength); RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -198,7 +198,7 @@ WINAPI NeedCurrentDirectoryForExePathW(IN LPCWSTR ExeName) { - if (wcschr(ExeName, '\\')) return TRUE; + if (wcschr(ExeName, L'\\')) return TRUE; return BasepIsCurDirAllowedForPlainExeNames(); }

12 years, 10 months

[ion] 54316: [KERNEL32]: Reimplement GetLong/ShortPathNameA to get rid of Wineisms and fix the fact they were forcing paths to MAX_PATH when doing A->W->A conversion. The correct behavior is to cal...

by ion＠svn.reactos.org

Author: ion Date: Sun Nov 6 15:34:39 2011 New Revision: 54316 URL: http://svn.reactos.org/svn/reactos?rev=54316&view=rev Log: [KERNEL32]: Reimplement GetLong/ShortPathNameA to get rid of Wineisms and fix the fact they were forcing paths to MAX_PATH when doing A->W->A conversion. The correct behavior is to call W to get the true, real path length (no matter how big), and then deal with the sizing issues when downconverting back to A. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 15:34:39 2011 @@ -282,152 +282,6 @@ lpBuffer, lpFilePart) / sizeof(WCHAR); } - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameA ( - LPCSTR longpath, - LPSTR shortpath, - DWORD shortlen - ) -{ - PWCHAR LongPathW; - WCHAR ShortPathW[MAX_PATH]; - DWORD ret; - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(LongPathW = FilenameA2W(longpath, FALSE))) - return 0; - - ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); -} - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameW ( - LPCWSTR longpath, - LPWSTR shortpath, - DWORD shortlen - ) -{ - WCHAR tmpshortpath[MAX_PATH]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - WIN32_FIND_DATAW wfd; - HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; - - DPRINT("GetShortPathNameW: %S\n",longpath); - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!longpath[0]) - { - SetLastError(ERROR_BAD_PATHNAME); - return 0; - } - - /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) - { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; - } - - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - - while (longpath[lp]) - { - /* check for path delimiters and reproduce them */ - if (longpath[lp] == '\\' || longpath[lp] == '/') - { - if (!sp || tmpshortpath[sp-1] != '\\') - { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; - sp++; - } - tmpshortpath[sp] = 0; /* terminate string */ - lp++; - continue; - } - - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) - { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = (USHORT)tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } - } - - /* Check if the file exists and use the existing short file name */ - goit = FindFirstFileW(tmpshortpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) goto notfound; - FindClose(goit); - lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); - sp += lstrlenW(tmpshortpath + sp); - lp += tmplen; - } - tmpshortpath[sp] = 0; - - tmplen = lstrlenW(tmpshortpath) + 1; - if (tmplen <= shortlen) - { - lstrcpyW(shortpath, tmpshortpath); - tmplen--; /* length without 0 */ - } - - return tmplen; - - notfound: - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; -} - /* * @implemented @@ -786,32 +640,271 @@ return tmplen; } - - -/*********************************************************************** - * GetLongPathNameA (KERNEL32.@) - */ -DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) -{ - WCHAR *shortpathW; - WCHAR longpathW[MAX_PATH]; - DWORD ret; - - DPRINT("GetLongPathNameA %s, %i\n",shortpath,longlen ); - - if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) - return 0; - - ret = GetLongPathNameW(shortpathW, longpathW, MAX_PATH); - - if (!ret) return 0; - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); +/* + * @implemented + */ +DWORD +WINAPI +GetLongPathNameA(IN LPCSTR lpszShortPath, + IN LPSTR lpszLongPath, + IN DWORD cchBuffer) +{ + ULONG Result, PathLength; + PWCHAR LongPath; + NTSTATUS Status; + UNICODE_STRING LongPathUni, ShortPathUni; + ANSI_STRING LongPathAnsi; + WCHAR LongPathBuffer[MAX_PATH]; + + LongPath = NULL; + LongPathAnsi.Buffer = NULL; + ShortPathUni.Buffer = NULL; + Result = 0; + + if (!lpszShortPath) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - - return FilenameW2A_FitOrFail(longpath, longlen, longpathW, ret+1 ); + + Status = Basep8BitStringToDynamicUnicodeString(&ShortPathUni, lpszShortPath); + if (!NT_SUCCESS(Status)) goto Quickie; + + LongPath = LongPathBuffer; + + PathLength = GetLongPathNameW(ShortPathUni.Buffer, LongPathBuffer, MAX_PATH); + if (PathLength >= MAX_PATH) + { + LongPath = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathLength * sizeof(WCHAR)); + if (!LongPath) + { + PathLength = 0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + PathLength = GetLongPathNameW(ShortPathUni.Buffer, LongPath, PathLength); + } + } + + if (!PathLength) goto Quickie; + + ShortPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); + LongPathUni.Buffer = LongPath; + LongPathUni.Length = PathLength * sizeof(WCHAR); + + Status = BasepUnicodeStringTo8BitString(&LongPathAnsi, &LongPathUni, TRUE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Result = 0; + } + + Result = LongPathAnsi.Length; + if ((lpszLongPath) && (cchBuffer > LongPathAnsi.Length)) + { + RtlMoveMemory(lpszLongPath, LongPathAnsi.Buffer, LongPathAnsi.Length); + lpszLongPath[Result] = ANSI_NULL; + } + else + { + Result = LongPathAnsi.Length + sizeof(ANSI_NULL); + } + +Quickie: + if (ShortPathUni.Buffer) RtlFreeUnicodeString(&ShortPathUni); + if (LongPathAnsi.Buffer) RtlFreeAnsiString(&LongPathAnsi); + if ((LongPath) && (LongPath != LongPathBuffer)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, LongPath); + } + return Result; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetShortPathNameA(IN LPCSTR lpszLongPath, + IN LPSTR lpszShortPath, + IN DWORD cchBuffer) +{ + ULONG Result, PathLength; + PWCHAR ShortPath; + NTSTATUS Status; + UNICODE_STRING LongPathUni, ShortPathUni; + ANSI_STRING ShortPathAnsi; + WCHAR ShortPathBuffer[MAX_PATH]; + + ShortPath = NULL; + ShortPathAnsi.Buffer = NULL; + LongPathUni.Buffer = NULL; + Result = 0; + + if (!lpszLongPath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + Status = Basep8BitStringToDynamicUnicodeString(&LongPathUni, lpszLongPath); + if (!NT_SUCCESS(Status)) goto Quickie; + + ShortPath = ShortPathBuffer; + + PathLength = GetShortPathNameW(LongPathUni.Buffer, ShortPathBuffer, MAX_PATH); + if (PathLength >= MAX_PATH) + { + ShortPath = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathLength * sizeof(WCHAR)); + if (!ShortPath) + { + PathLength = 0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + PathLength = GetLongPathNameW(LongPathUni.Buffer, ShortPath, PathLength); + } + } + + if (!PathLength) goto Quickie; + + LongPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); + ShortPathUni.Buffer = ShortPath; + ShortPathUni.Length = PathLength * sizeof(WCHAR); + + Status = BasepUnicodeStringTo8BitString(&ShortPathAnsi, &ShortPathUni, TRUE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Result = 0; + } + + Result = ShortPathAnsi.Length; + if ((lpszShortPath) && (cchBuffer > ShortPathAnsi.Length)) + { + RtlMoveMemory(lpszShortPath, ShortPathAnsi.Buffer, ShortPathAnsi.Length); + lpszShortPath[Result] = ANSI_NULL; + } + else + { + Result = ShortPathAnsi.Length + sizeof(ANSI_NULL); + } + +Quickie: + if (LongPathUni.Buffer) RtlFreeUnicodeString(&LongPathUni); + if (ShortPathAnsi.Buffer) RtlFreeAnsiString(&ShortPathAnsi); + if ((ShortPath) && (ShortPath != ShortPathBuffer)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ShortPath); + } + return Result; +} + + +/* + * NOTE: Copied from Wine. + * @implemented + */ +DWORD +WINAPI +GetShortPathNameW ( + LPCWSTR longpath, + LPWSTR shortpath, + DWORD shortlen + ) +{ + WCHAR tmpshortpath[MAX_PATH]; + LPCWSTR p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + WIN32_FIND_DATAW wfd; + HANDLE goit; + UNICODE_STRING ustr; + WCHAR ustr_buf[8+1+3+1]; + + DPRINT("GetShortPathNameW: %S\n",longpath); + + if (!longpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!longpath[0]) + { + SetLastError(ERROR_BAD_PATHNAME); + return 0; + } + + /* check for drive letter */ + if (longpath[0] != '/' && longpath[1] == ':' ) + { + tmpshortpath[0] = longpath[0]; + tmpshortpath[1] = ':'; + sp = lp = 2; + } + + ustr.Buffer = ustr_buf; + ustr.Length = 0; + ustr.MaximumLength = sizeof(ustr_buf); + + while (longpath[lp]) + { + /* check for path delimiters and reproduce them */ + if (longpath[lp] == '\\' || longpath[lp] == '/') + { + if (!sp || tmpshortpath[sp-1] != '\\') + { + /* strip double "\\" */ + tmpshortpath[sp] = '\\'; + sp++; + } + tmpshortpath[sp] = 0; /* terminate string */ + lp++; + continue; + } + + for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + /* Check, if the current element is a valid dos name */ + if (tmplen <= 8+1+3) + { + BOOLEAN spaces; + memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); + ustr_buf[tmplen] = '\0'; + ustr.Length = (USHORT)tmplen * sizeof(WCHAR); + if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + + /* Check if the file exists and use the existing short file name */ + goit = FindFirstFileW(tmpshortpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) goto notfound; + FindClose(goit); + lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + sp += lstrlenW(tmpshortpath + sp); + lp += tmplen; + } + tmpshortpath[sp] = 0; + + tmplen = lstrlenW(tmpshortpath) + 1; + if (tmplen <= shortlen) + { + lstrcpyW(shortpath, tmpshortpath); + tmplen--; /* length without 0 */ + } + + return tmplen; + + notfound: + SetLastError ( ERROR_FILE_NOT_FOUND ); + return 0; } /* EOF */

12 years, 10 months

[tfaber] 54315: [SERVICES] - Use FIELD_OFFSET for variable-length structure sizes - Handle an invalid parameter condition in RCreateServiceW. Fixes an advapi32:service test - Do not dereference a N...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 6 14:23:39 2011 New Revision: 54315 URL: http://svn.reactos.org/svn/reactos?rev=54315&view=rev Log: [SERVICES] - Use FIELD_OFFSET for variable-length structure sizes - Handle an invalid parameter condition in RCreateServiceW. Fixes an advapi32:service test - Do not dereference a NULL-pointer on out-of-memory Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Nov 6 14:23:39 2011 @@ -193,7 +193,7 @@ /* Create a new service image */ pServiceImage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SERVICE_IMAGE) + ((wcslen(ImagePath.Buffer) + 1) * sizeof(WCHAR))); + FIELD_OFFSET(SERVICE_IMAGE, szImagePath[wcslen(ImagePath.Buffer) + 1])); if (pServiceImage == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -368,7 +368,7 @@ /* Allocate service entry */ lpService = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); + FIELD_OFFSET(SERVICE, szServiceName[wcslen(lpServiceName) + 1])); if (lpService == NULL) return ERROR_NOT_ENOUGH_MEMORY; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 6 14:23:39 2011 @@ -155,7 +155,7 @@ Ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(MANAGER_HANDLE) + (wcslen(lpDatabaseName) + 1) * sizeof(WCHAR)); + FIELD_OFFSET(MANAGER_HANDLE, DatabaseName[wcslen(lpDatabaseName) + 1])); if (Ptr == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -1999,6 +1999,12 @@ return ERROR_INVALID_PARAMETER; } + if ((dwServiceType & SERVICE_KERNEL_DRIVER) && + (dwServiceType & SERVICE_FILE_SYSTEM_DRIVER)) + { + return ERROR_INVALID_PARAMETER; + } + if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && (lpServiceStartName)) { @@ -2267,9 +2273,12 @@ } else { - /* Release the display name buffer */ - if (lpService->lpServiceName != NULL) + if (lpService != NULL && + lpService->lpServiceName != NULL) + { + /* Release the display name buffer */ HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + } if (hServiceHandle) { @@ -2366,7 +2375,7 @@ (dwServicesReturned + 1) * sizeof(PSERVICE)); if (!lpServicesArray) { - DPRINT("Could not allocate a buffer!!\n"); + DPRINT1("Could not allocate a buffer!!\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -4550,8 +4559,8 @@ dwLength = (strlen(Info.lpDescription) + 1) * sizeof(WCHAR); lpServiceDescriptonW = HeapAlloc(GetProcessHeap(), - 0, - dwLength + sizeof(SERVICE_DESCRIPTIONW)); + 0, + dwLength + sizeof(SERVICE_DESCRIPTIONW)); if (!lpServiceDescriptonW) { return ERROR_NOT_ENOUGH_MEMORY;

12 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011