Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54330: [NPFS] - Fix an access-after-free bug
by cgutman＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: cgutman Date: Mon Nov 7 01:47:55 2011 New Revision: 54330 URL: http://svn.reactos.org/svn/reactos?rev=54330&view=rev Log: [NPFS] - Fix an access-after-free bug Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c 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] Mon Nov 7 01:47:55 2011 @@ -92,6 +92,7 @@ PNPFS_FCB Fcb; PNPFS_CCB ClientCcb; NTSTATUS Status; + KPROCESSOR_MODE WaitMode; DPRINT("NpfsConnectPipe()\n"); @@ -124,6 +125,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; Flags = FileObject->Flags; + WaitMode = Irp->RequestorMode; /* search for a listening client fcb */ KeLockMutex(&Fcb->CcbListLock); @@ -183,7 +185,7 @@ { KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, - Irp->RequestorMode, + WaitMode, (Flags & FO_ALERTABLE_IO), NULL); }

1 0

[ion] 54329: Forgotten file.
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 01:40:33 2011 New Revision: 54329 URL: http://svn.reactos.org/svn/reactos?rev=54329&view=rev Log: Forgotten file. Modified: trunk/reactos/include/ndk/rtlfuncs.h 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] Mon Nov 7 01:40:33 2011 @@ -3317,6 +3317,23 @@ PVOID Context ); +// +// WOW64 Functions +// +NTSYSAPI +NTSTATUS +NTAPI +RtlWow64EnableFsRedirection( + IN BOOLEAN Wow64FsEnableRedirection +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlWow64EnableFsRedirectionEx( + IN PVOID Wow64FsEnableRedirection, + OUT PVOID *OldFsRedirectionLevel +); #endif

1 0

[cgutman] 54328: [NPFS] - Fix a potential CCB state inconsistency if the IRP is canceled before adding it to the pending list - Don't wait if the IRP has been canceled - Preserve the return status ...
by cgutman＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: cgutman Date: Mon Nov 7 01:37:35 2011 New Revision: 54328 URL: http://svn.reactos.org/svn/reactos?rev=54328&view=rev Log: [NPFS] - Fix a potential CCB state inconsistency if the IRP is canceled before adding it to the pending list - Don't wait if the IRP has been canceled - Preserve the return status of NpfsAddListeningServerInstance Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c 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] Mon Nov 7 01:37:35 2011 @@ -60,6 +60,7 @@ IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { + Ccb->PipeState = FILE_PIPE_LISTENING_STATE; IoMarkIrpPending(Irp); InsertTailList(&Ccb->Fcb->WaiterListHead, &Entry->Entry); (void)IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); @@ -174,21 +175,17 @@ /* no listening client fcb found */ DPRINT("No listening client fcb found -- waiting for client\n"); - Ccb->PipeState = FILE_PIPE_LISTENING_STATE; - Status = NpfsAddListeningServerInstance(Irp, Ccb); KeUnlockMutex(&Fcb->CcbListLock); - if (Flags & FO_SYNCHRONOUS_IO) - { - Status = KeWaitForSingleObject(&Ccb->ConnectEvent, + if ((Status == STATUS_PENDING) && (Flags & FO_SYNCHRONOUS_IO)) + { + KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, Irp->RequestorMode, (Flags & FO_ALERTABLE_IO), NULL); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) - Status = STATUS_CANCELLED; } DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status);

1 0

[cgutman] 54327: [NPFS] - Fix several cancellation races and broken checks
by cgutman＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: cgutman Date: Mon Nov 7 00:52:32 2011 New Revision: 54327 URL: http://svn.reactos.org/svn/reactos?rev=54327&view=rev Log: [NPFS] - Fix several cancellation races and broken checks Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.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] Mon Nov 7 00:52:32 2011 @@ -133,9 +133,11 @@ IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { - (void)IoSetCancelRoutine(Irp, NULL); - IoReleaseCancelSpinLock(oldIrql); - return Waiter->Ccb; + if (IoSetCancelRoutine(Irp, NULL) != NULL) + { + IoReleaseCancelSpinLock(oldIrql); + return Waiter->Ccb; + } } IoReleaseCancelSpinLock(oldIrql); } @@ -868,11 +870,7 @@ RemoveEntryList(Entry); tmpIrp = CONTAINING_RECORD(WaitEntry, IRP, Tail.Overlay.DriverContext); IoAcquireCancelSpinLock(&oldIrql); - if (!tmpIrp->Cancel) - { - (void)IoSetCancelRoutine(tmpIrp, NULL); - Complete = TRUE; - } + Complete = (NULL != IoSetCancelRoutine(tmpIrp, NULL)); IoReleaseCancelSpinLock(oldIrql); if (Complete) { 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] Mon Nov 7 00:52:32 2011 @@ -57,12 +57,11 @@ KeLockMutex(&Ccb->Fcb->CcbListLock); - IoMarkIrpPending(Irp); - InsertTailList(&Ccb->Fcb->WaiterListHead, &Entry->Entry); - IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { + IoMarkIrpPending(Irp); + InsertTailList(&Ccb->Fcb->WaiterListHead, &Entry->Entry); (void)IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); IoReleaseCancelSpinLock(oldIrql); KeUnlockMutex(&Ccb->Fcb->CcbListLock); @@ -289,7 +288,7 @@ { RemoveEntryList(Entry); Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DriverContext); - Complete = (NULL == IoSetCancelRoutine(Irp, NULL)); + Complete = (NULL != IoSetCancelRoutine(Irp, NULL)); break; } Entry = Entry->Flink;

1 0

[ion] 54326: [KERNEL32]: Implement Wow64Enable/Disable/RevertWow64Direction, document the Rtl equivalents in NDK, export and implement them in NTDLL. [KERNEL32]: Cleanup files a bit. - Bintype.c is...
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 00:18:13 2011 New Revision: 54326 URL: http://svn.reactos.org/svn/reactos?rev=54326&view=rev Log: [KERNEL32]: Implement Wow64Enable/Disable/RevertWow64Direction, document the Rtl equivalents in NDK, export and implement them in NTDLL. [KERNEL32]: Cleanup files a bit. - Bintype.c is gone and moved into VDM (these are functions for VDM support). - Npipe.c and pipe.c are merged. - Dosdev is moved into client, these are not quite File APIs. - Base(8Bit/Unicode) APIs are moved into utils.c - Wow64 APIs are moved into utils.c - The mess that was file.c has the Replace* file APIs going into move.c (similar behaviors), the Open* APIs into create.c (similar) and the Read/Write Scatter/Gather APIs into rw.c (where they belong). What remained in file.c were mostly Set/Query functions, so it becomes fileinfo.c - The remaining APIs in file.c were all about paths -- at the file level, specifically filenames, so they go into filename.c - Move some File API functions from certain files into other files where they belong more. Added: trunk/reactos/dll/win32/kernel32/client/dosdev.c - copied unchanged from r54317, trunk/reactos/dll/win32/kernel32/client/file/dosdev.c trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c - copied, changed from r54317, trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/file/filename.c (with props) Removed: trunk/reactos/dll/win32/kernel32/client/file/bintype.c trunk/reactos/dll/win32/kernel32/client/file/dosdev.c trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/file/pipe.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/deviceio.c trunk/reactos/dll/win32/kernel32/client/file/iocompl.c trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/dll/win32/kernel32/client/file/npipe.c trunk/reactos/dll/win32/kernel32/client/file/rw.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Removed: trunk/reactos/dll/win32/kernel32/client/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Copied: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c (from r54317, trunk/reactos/dll/win32/kernel32/client/file/file.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Added: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…

1 0

[cgutman] 54325: [NPFS] - Make the initial NpfsRead wait uninterruptible since it's really being used like a mutex (avoid the kernel stack being paged out during the wait causing memory corruption)...
by cgutman＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: cgutman Date: Sun Nov 6 23:40:06 2011 New Revision: 54325 URL: http://svn.reactos.org/svn/reactos?rev=54325&view=rev Log: [NPFS] - Make the initial NpfsRead wait uninterruptible since it's really being used like a mutex (avoid the kernel stack being paged out during the wait causing memory corruption) - Handle interrupted waits that were missed in certain cases - Fix a potential deadlock that would happen if more I/O was done on a file object after the previous operation was interrupted by an APC or alert Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c 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 23:40:06 2011 @@ -183,11 +183,13 @@ if (Flags & FO_SYNCHRONOUS_IO) { - KeWaitForSingleObject(&Ccb->ConnectEvent, + Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, Irp->RequestorMode, (Flags & FO_ALERTABLE_IO), NULL); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) + Status = STATUS_CANCELLED; } DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status); @@ -403,11 +405,13 @@ TimeOut = NULL; } - Status = KeWaitForSingleObject(&Ccb->ConnectEvent, - UserRequest, - Irp->RequestorMode, - (Ccb->FileObject->Flags & FO_ALERTABLE_IO), - TimeOut); + Status = KeWaitForSingleObject(&Ccb->ConnectEvent, + UserRequest, + Irp->RequestorMode, + (Ccb->FileObject->Flags & FO_ALERTABLE_IO), + TimeOut); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) + Status = STATUS_CANCELLED; DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); @@ -526,6 +530,8 @@ Irp->RequestorMode, (Ccb->FileObject->Flags & FO_ALERTABLE_IO), &TimeOut); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) + Status = STATUS_CANCELLED; DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); 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 23:40:06 2011 @@ -373,20 +373,11 @@ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); Context->WaitEvent = &Event; ExReleaseFastMutex(&Ccb->DataListLock); - Status = KeWaitForSingleObject(&Event, - UserRequest, - Irp->RequestorMode, - (FileObject->Flags & FO_ALERTABLE_IO), + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, NULL); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) - { - Status = STATUS_CANCELLED; - goto done; - } - if (!NT_SUCCESS(Status)) - { - ASSERT(FALSE); - } ExAcquireFastMutex(&Ccb->DataListLock); } Irp->IoStatus.Information = 0; @@ -661,9 +652,6 @@ Irp->IoStatus.Status = Status; ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - - if (Status == STATUS_CANCELLED) - goto done; if (IoIsOperationSynchronous(Irp)) {

1 0

[tfaber] 54324: [KERNEL32_WINETEST] - Do not use strcat_s. It is not guaranteed to exist on Windows.
by tfaber＠svn.reactos.org 06 Nov '11

06 Nov '11

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);

1 0

[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 06 Nov '11

06 Nov '11

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>

1 0

[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 06 Nov '11

06 Nov '11

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)

1 0

[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 06 Nov '11

06 Nov '11

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,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs