Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 54340: [FASTFAT] Don't report success for unsupported file information classes. See issue #6628 for more details.
by khornicek＠svn.reactos.org 08 Nov '11

08 Nov '11

Author: khornicek Date: Tue Nov 8 17:08:04 2011 New Revision: 54340 URL: http://svn.reactos.org/svn/reactos?rev=54340&view=rev Log: [FASTFAT] Don't report success for unsupported file information classes. See issue #6628 for more details. Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Tue Nov 8 17:08:04 2011 @@ -433,7 +433,7 @@ default: RC = STATUS_INVALID_INFO_CLASS; } - if (RC == STATUS_BUFFER_OVERFLOW) + if (RC == STATUS_BUFFER_OVERFLOW || RC == STATUS_INVALID_INFO_CLASS) { break; }

1 0

[ion] 54339: [KERNEL32]: Fix a bug when converting EXECUTE access.
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 17:49:10 2011 New Revision: 54339 URL: http://svn.reactos.org/svn/reactos?rev=54339&view=rev Log: [KERNEL32]: Fix a bug when converting EXECUTE access. Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] Mon Nov 7 17:49:10 2011 @@ -314,11 +314,14 @@ NULL); /* Convert COPY to READ */ - if (dwDesiredAccess == FILE_MAP_COPY) dwDesiredAccess = SECTION_MAP_READ; - - /* Fixup execute */ - if (dwDesiredAccess == FILE_MAP_EXECUTE) - { + if (dwDesiredAccess == FILE_MAP_COPY) + { + /* Fixup copy */ + dwDesiredAccess = SECTION_MAP_READ; + } + else if (dwDesiredAccess & FILE_MAP_EXECUTE) + { + /* Fixup execute */ dwDesiredAccess = (dwDesiredAccess & ~FILE_MAP_EXECUTE) | SECTION_MAP_EXECUTE; }

1 0

[tfaber] 54338: [KERNEL32] - Do not fail in CreateFileMappingW if write or execute access is requested
by tfaber＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: tfaber Date: Mon Nov 7 16:53:04 2011 New Revision: 54338 URL: http://svn.reactos.org/svn/reactos?rev=54338&view=rev Log: [KERNEL32] - Do not fail in CreateFileMappingW if write or execute access is requested Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] Mon Nov 7 16:53:04 2011 @@ -85,8 +85,7 @@ /* Give it */ DesiredAccess |= SECTION_MAP_EXECUTE; } - - if ((flProtect != PAGE_READONLY) && (flProtect != PAGE_WRITECOPY)) + else if ((flProtect != PAGE_READONLY) && (flProtect != PAGE_WRITECOPY)) { SetLastError(ERROR_INVALID_PARAMETER); return NULL;

1 0

[ion] 54337: Hurray for misisng includes.
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 15:44:07 2011 New Revision: 54337 URL: http://svn.reactos.org/svn/reactos?rev=54337&view=rev Log: Hurray for misisng includes. Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Mon Nov 7 15:44:07 2011 @@ -148,10 +148,11 @@ #define CALLBACK_CHUNK_FINISHED 0 #define CALLBACK_STREAM_SWITCH 1 #define OFS_MAXPATHNAME 128 -#define FILE_MAP_ALL_ACCESS 0xf001f -#define FILE_MAP_READ 4 -#define FILE_MAP_WRITE 2 -#define FILE_MAP_COPY 1 +#define FILE_MAP_COPY SECTION_QUERY +#define FILE_MAP_WRITE SECTION_MAP_WRITE +#define FILE_MAP_READ SECTION_MAP_READ +#define FILE_MAP_ALL_ACCESS SECTION_ALL_ACCESS +#define FILE_MAP_EXECUTE SECTION_MAP_EXECUTE_EXPLICIT #define MUTEX_ALL_ACCESS 0x1f0001 #define MUTEX_MODIFY_STATE 1 #define SEMAPHORE_ALL_ACCESS 0x1f0003 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Nov 7 15:44:07 2011 @@ -1385,6 +1385,7 @@ #define SEC_NOCACHE 0x10000000 #define SEC_WRITECOMBINE 0x40000000 #define SEC_LARGE_PAGES 0x80000000 +#define SECTION_MAP_EXECUTE_EXPLICIT 0x0020 #define SECTION_EXTEND_SIZE 16 #define SECTION_MAP_READ 4 #define SECTION_MAP_WRITE 2

1 0

[ion] 54336: [KERNEL32]: Fix various bugs in the file mapping APIs, mainly related to lack of EXECUTE mappings and incorrect error codes.
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 15:43:37 2011 New Revision: 54336 URL: http://svn.reactos.org/svn/reactos?rev=54336&view=rev Log: [KERNEL32]: Fix various bugs in the file mapping APIs, mainly related to lack of EXECUTE mappings and incorrect error codes. Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] Mon Nov 7 15:43:37 2011 @@ -6,14 +6,14 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented @@ -73,7 +73,23 @@ if (flProtect == PAGE_READWRITE) { /* Give it */ - DesiredAccess |= (SECTION_MAP_WRITE | SECTION_MAP_READ); + DesiredAccess |= SECTION_MAP_WRITE; + } + else if (flProtect == PAGE_EXECUTE_READWRITE) + { + /* Give it */ + DesiredAccess |= (SECTION_MAP_WRITE | SECTION_MAP_EXECUTE); + } + else if (flProtect == PAGE_EXECUTE_READ) + { + /* Give it */ + DesiredAccess |= SECTION_MAP_EXECUTE; + } + + if ((flProtect != PAGE_READONLY) && (flProtect != PAGE_WRITECOPY)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } /* Now check if we got a name */ @@ -114,21 +130,21 @@ flProtect, Attributes, hFile); - - if (Status == STATUS_OBJECT_NAME_EXISTS) + if (!NT_SUCCESS(Status)) + { + /* We failed */ + BaseSetLastNTError(Status); + return NULL; + } + else if (Status == STATUS_OBJECT_NAME_EXISTS) { SetLastError(ERROR_ALREADY_EXISTS); - return SectionHandle; - } - - if (!NT_SUCCESS(Status)) - { - /* We failed */ - BaseSetLastNTError(Status); - return NULL; - } - - SetLastError(ERROR_SUCCESS); + } + else + { + SetLastError(ERROR_SUCCESS); + } + /* Return the section */ return SectionHandle; } @@ -160,17 +176,19 @@ ViewSize = dwNumberOfBytesToMap; /* Convert flags to NT Protection Attributes */ - if (dwDesiredAccess & FILE_MAP_WRITE) - { - Protect = PAGE_READWRITE; + if (dwDesiredAccess == FILE_MAP_COPY) + { + Protect = PAGE_WRITECOPY; + } + else if (dwDesiredAccess & FILE_MAP_WRITE) + { + Protect = (dwDesiredAccess & FILE_MAP_EXECUTE) ? + PAGE_EXECUTE_READWRITE : PAGE_READWRITE; } else if (dwDesiredAccess & FILE_MAP_READ) { - Protect = PAGE_READONLY; - } - else if (dwDesiredAccess & FILE_MAP_COPY) - { - Protect = PAGE_WRITECOPY; + Protect = (dwDesiredAccess & FILE_MAP_EXECUTE) ? + PAGE_EXECUTE_READ : PAGE_READONLY; } else { @@ -232,6 +250,18 @@ Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)lpBaseAddress); if (!NT_SUCCESS(Status)) { + /* Check if the pages were protected */ + if (Status == STATUS_INVALID_PAGE_PROTECTION) + { + /* Flush the region if it was a "secure memory cache" */ + if (RtlFlushSecureMemoryCache((PVOID)lpBaseAddress, 0)) + { + /* Now try to unmap again */ + Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)lpBaseAddress); + if (NT_SUCCESS(Status)) return TRUE; + } + } + /* We failed */ BaseSetLastNTError(Status); return FALSE; @@ -244,55 +274,24 @@ /* * @implemented */ +HANDLE +NTAPI +OpenFileMappingA(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCSTR lpName) +{ + ConvertOpenWin32AnsiObjectApiToUnicodeApi(FileMapping, dwDesiredAccess, bInheritHandle, lpName); +} + +/* + * @implemented + */ /* FIXME: Convert to the new macros */ HANDLE NTAPI -OpenFileMappingA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpName) -{ - NTSTATUS Status; - ANSI_STRING AnsiName; - PUNICODE_STRING UnicodeCache; - - /* Check for a name */ - if (lpName) - { - /* Use TEB Cache */ - UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; - - /* Convert to unicode */ - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Conversion failed */ - BaseSetLastNTError(Status); - return NULL; - } - } - else - { - /* We need a name */ - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* Call the Unicode version */ - return OpenFileMappingW(dwDesiredAccess, - bInheritHandle, - (LPCWSTR)UnicodeCache->Buffer); -} - -/* - * @implemented - */ - /* FIXME: Convert to the new macros */ -HANDLE -NTAPI -OpenFileMappingW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpName) +OpenFileMappingW(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCWSTR lpName) { NTSTATUS Status; HANDLE SectionHandle; @@ -316,12 +315,16 @@ NULL); /* Convert COPY to READ */ - if (dwDesiredAccess == FILE_MAP_COPY) dwDesiredAccess = FILE_MAP_READ; + if (dwDesiredAccess == FILE_MAP_COPY) dwDesiredAccess = SECTION_MAP_READ; + + /* Fixup execute */ + if (dwDesiredAccess == FILE_MAP_EXECUTE) + { + dwDesiredAccess = (dwDesiredAccess & ~FILE_MAP_EXECUTE) | SECTION_MAP_EXECUTE; + } /* Open the section */ - Status = ZwOpenSection(&SectionHandle, - dwDesiredAccess, - &ObjectAttributes); + Status = ZwOpenSection(&SectionHandle, dwDesiredAccess, &ObjectAttributes); if (!NT_SUCCESS(Status)) { /* We failed */ @@ -329,7 +332,6 @@ return NULL; } - SetLastError(ERROR_SUCCESS); /* Otherwise, return the handle */ return SectionHandle; } @@ -339,8 +341,8 @@ */ BOOL NTAPI -FlushViewOfFile(LPCVOID lpBaseAddress, - SIZE_T dwNumberOfBytesToFlush) +FlushViewOfFile(IN LPCVOID lpBaseAddress, + IN SIZE_T dwNumberOfBytesToFlush) { SIZE_T NumberOfBytesToFlush; NTSTATUS Status; @@ -354,7 +356,7 @@ (LPVOID)lpBaseAddress, &NumberOfBytesToFlush, &IoStatusBlock); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && (Status != STATUS_NOT_MAPPED_DATA)) { /* We failed */ BaseSetLastNTError(Status);

1 0

[dgorbachev] 54335: [TRANSLATION] - Add some Romanian strings to the registry. Fulea Stefan, bug #6603. - Add a few Russian strings, too.
by dgorbachev＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: dgorbachev Date: Mon Nov 7 08:01:58 2011 New Revision: 54335 URL: http://svn.reactos.org/svn/reactos?rev=54335&view=rev Log: [TRANSLATION] - Add some Romanian strings to the registry. Fulea Stefan, bug #6603. - Add a few Russian strings, too. Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

1 0

[ion] 54334: [KERNEL32]: Show some love to Get/SetCurrent/Windows/SystemDirectoryA/W. Only SearchPathW and loader stuff remains to be fixed. Also handle SetCurrentDirectory when directory is alread...
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 07:41:52 2011 New Revision: 54334 URL: http://svn.reactos.org/svn/reactos?rev=54334&view=rev Log: [KERNEL32]: Show some love to Get/SetCurrent/Windows/SystemDirectoryA/W. Only SearchPathW and loader stuff remains to be fixed. Also handle SetCurrentDirectory when directory is already current. [KERNEL32]: Rewrite the tape APIs to use a single generic function, and in the process support pending I/O now, which wasn't handled before. [KERNEL32]: Moved the interlocked APIs to synch.c instead of dllmain.c Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/file/tape.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/synch.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Mon Nov 7 07:41:52 2011 @@ -19,9 +19,6 @@ /* GLOBALS *******************************************************************/ -extern UNICODE_STRING SystemDirectory; -extern UNICODE_STRING WindowsDirectory; - PBASE_STATIC_SERVER_DATA BaseStaticServerData; BOOLEAN BaseRunningInServerProcess; @@ -34,7 +31,6 @@ PPEB Peb; ULONG SessionId; BOOL ConsoleInitialized = FALSE; -UNICODE_STRING BaseWindowsDirectory, BaseWindowsSystemDirectory; static BOOL DllInitialized = FALSE; BOOL WINAPI @@ -271,12 +267,10 @@ /* Set the directories */ BaseWindowsDirectory = BaseStaticServerData->WindowsDirectory; BaseWindowsSystemDirectory = BaseStaticServerData->WindowsSystemDirectory; - SystemDirectory = BaseWindowsSystemDirectory; - WindowsDirectory = BaseWindowsDirectory; /* Construct the default path (using the static buffer) */ _snwprintf(BaseDefaultPathBuffer, sizeof(BaseDefaultPathBuffer) / sizeof(WCHAR), - L".;%wZ;%wZ\\system;%wZ;", &SystemDirectory, &WindowsDirectory, &WindowsDirectory); + L".;%wZ;%wZ\\system;%wZ;", &BaseWindowsSystemDirectory, &BaseWindowsDirectory, &BaseWindowsDirectory); BaseDefaultPath.Buffer = BaseDefaultPathBuffer; BaseDefaultPath.Length = wcslen(BaseDefaultPathBuffer) * sizeof(WCHAR); @@ -337,50 +331,4 @@ return TRUE; } -#undef InterlockedIncrement -#undef InterlockedDecrement -#undef InterlockedExchange -#undef InterlockedExchangeAdd -#undef InterlockedCompareExchange - -LONG -WINAPI -InterlockedIncrement(IN OUT LONG volatile *lpAddend) -{ - return _InterlockedIncrement(lpAddend); -} - -LONG -WINAPI -InterlockedDecrement(IN OUT LONG volatile *lpAddend) -{ - return _InterlockedDecrement(lpAddend); -} - -#undef InterlockedExchange -LONG -WINAPI -InterlockedExchange(IN OUT LONG volatile *Target, - IN LONG Value) -{ - return _InterlockedExchange(Target, Value); -} - -LONG -WINAPI -InterlockedExchangeAdd(IN OUT LONG volatile *Addend, - IN LONG Value) -{ - return _InterlockedExchangeAdd(Addend, Value); -} - -LONG -WINAPI -InterlockedCompareExchange(IN OUT LONG volatile *Destination, - IN LONG Exchange, - IN LONG Comperand) -{ - return _InterlockedCompareExchange(Destination, Exchange, Comperand); -} - /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/file/tape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/tape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/tape.c [iso-8859-1] Mon Nov 7 07:41:52 2011 @@ -9,404 +9,311 @@ * Created 01/11/98 */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -DWORD WINAPI -CreateTapePartition (HANDLE hDevice, - DWORD dwPartitionMethod, - DWORD dwCount, - DWORD dwSize) -{ - TAPE_CREATE_PARTITION TapeCreatePartition; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapeCreatePartition.Method = dwPartitionMethod; - TapeCreatePartition.Count = dwCount; - TapeCreatePartition.Size = dwSize; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_CREATE_PARTITION, - &TapeCreatePartition, - sizeof(TAPE_CREATE_PARTITION), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -EraseTape (HANDLE hDevice, - DWORD dwEraseType, - BOOL bImmediate) -{ - TAPE_ERASE TapeErase; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapeErase.Type = dwEraseType; - TapeErase.Immediate = (BOOLEAN)bImmediate; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_ERASE, - &TapeErase, - sizeof(TAPE_ERASE), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -GetTapeParameters (HANDLE hDevice, - DWORD dwOperation, - LPDWORD lpdwSize, - LPVOID lpTapeInformation) -{ - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - if (dwOperation == GET_TAPE_MEDIA_INFORMATION) - { - if (*lpdwSize < sizeof(TAPE_GET_MEDIA_PARAMETERS)) - { - *lpdwSize = sizeof(TAPE_GET_MEDIA_PARAMETERS); - return ERROR_MORE_DATA; - } - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_GET_MEDIA_PARAMS, - NULL, - 0, - lpTapeInformation, - sizeof(TAPE_GET_MEDIA_PARAMETERS)); - } - else if (dwOperation == GET_TAPE_DRIVE_INFORMATION) - { - if (*lpdwSize < sizeof(TAPE_GET_DRIVE_PARAMETERS)) - { - *lpdwSize = sizeof(TAPE_GET_DRIVE_PARAMETERS); - return ERROR_MORE_DATA; - } - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_GET_DRIVE_PARAMS, - NULL, - 0, - lpTapeInformation, - sizeof(TAPE_GET_DRIVE_PARAMETERS)); - } - else - { - return ERROR_INVALID_FUNCTION; - } - - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -GetTapePosition (HANDLE hDevice, - DWORD dwPositionType, - LPDWORD lpdwPartition, - LPDWORD lpdwOffsetLow, - LPDWORD lpdwOffsetHigh) -{ - TAPE_GET_POSITION TapeGetPosition; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapeGetPosition.Type = dwPositionType; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_GET_POSITION, - &TapeGetPosition, - sizeof(TAPE_GET_POSITION), - &TapeGetPosition, - sizeof(TAPE_GET_POSITION)); - if (!NT_SUCCESS(Status)) - { - *lpdwPartition = 0; - *lpdwOffsetLow = 0; - *lpdwOffsetHigh = 0; - - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - *lpdwPartition = TapeGetPosition.Partition; - *lpdwOffsetLow = TapeGetPosition.Offset.u.LowPart; - *lpdwOffsetHigh = TapeGetPosition.Offset.u.HighPart; - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -GetTapeStatus (HANDLE hDevice) -{ - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_GET_STATUS, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -PrepareTape (HANDLE hDevice, - DWORD dwOperation, - BOOL bImmediate) -{ - TAPE_PREPARE TapePrepare; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapePrepare.Operation = dwOperation; - TapePrepare.Immediate = (BOOLEAN)bImmediate; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_PREPARE, - &TapePrepare, - sizeof(TAPE_PREPARE), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -SetTapeParameters (HANDLE hDevice, - DWORD dwOperation, - LPVOID lpTapeInformation) -{ - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - if (dwOperation == SET_TAPE_MEDIA_INFORMATION) - { - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_SET_MEDIA_PARAMS, - lpTapeInformation, - sizeof(TAPE_SET_MEDIA_PARAMETERS), - NULL, - 0); - } - else if (dwOperation == SET_TAPE_DRIVE_INFORMATION) - { - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_SET_DRIVE_PARAMS, - lpTapeInformation, - sizeof(TAPE_SET_DRIVE_PARAMETERS), - NULL, - 0); - } - else - { - return ERROR_INVALID_FUNCTION; - } - - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -SetTapePosition (HANDLE hDevice, - DWORD dwPositionMethod, - DWORD dwPartition, - DWORD dwOffsetLow, - DWORD dwOffsetHigh, - BOOL bImmediate) -{ - TAPE_SET_POSITION TapeSetPosition; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapeSetPosition.Method = dwPositionMethod; - TapeSetPosition.Partition = dwPartition; - TapeSetPosition.Offset.u.LowPart = dwOffsetLow; - TapeSetPosition.Offset.u.HighPart = dwOffsetHigh; - TapeSetPosition.Immediate = (BOOLEAN)bImmediate; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_SET_POSITION, - &TapeSetPosition, - sizeof(TAPE_SET_POSITION), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; -} - - -/* - * @implemented - */ -DWORD WINAPI -WriteTapemark (HANDLE hDevice, - DWORD dwTapemarkType, - DWORD dwTapemarkCount, - BOOL bImmediate) -{ - TAPE_WRITE_MARKS TapeWriteMarks; - IO_STATUS_BLOCK IoStatusBlock; - DWORD ErrorCode; - NTSTATUS Status; - - TapeWriteMarks.Type = dwTapemarkType; - TapeWriteMarks.Count = dwTapemarkCount; - TapeWriteMarks.Immediate = (BOOLEAN)bImmediate; - - Status = NtDeviceIoControlFile (hDevice, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_TAPE_WRITE_MARKS, - &TapeWriteMarks, - sizeof(TAPE_WRITE_MARKS), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - SetLastError (ErrorCode); - return ErrorCode; - } - - return ERROR_SUCCESS; +/* PRIVATE FUNCTIONS **********************************************************/ + +DWORD +WINAPI +BasepDoTapeOperation(IN HANDLE DeviceHandle, + IN ULONG Ioctl, + IN PVOID Input, + IN ULONG InputLength, + IN PVOID Output, + IN ULONG OutputLength) +{ + HANDLE TapeEvent; + DWORD ErrorCode; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + + /* Create the wait event */ + TapeEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!TapeEvent) return GetLastError(); + + /* Send the IOCTL */ + Status = NtDeviceIoControlFile(DeviceHandle, + TapeEvent, + 0, + 0, + &IoStatusBlock, + Ioctl, + Input, + InputLength, + Output, + OutputLength); + if (Status == STATUS_PENDING) + { + /* Wait for its completion */ + WaitForSingleObject(TapeEvent, INFINITE); + Status = IoStatusBlock.Status; + } + + /* Get rid of the wait event and check status */ + CloseHandle(TapeEvent); + if (!NT_SUCCESS(Status)) + { + /* Convert to Win32 */ + BaseSetLastNTError(Status); + ErrorCode = GetLastError(); + } + else + { + /* Set sucess */ + ErrorCode = ERROR_SUCCESS; + } + + /* Return the Win32 error code */ + return ErrorCode; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +DWORD +WINAPI +CreateTapePartition(IN HANDLE hDevice, + IN DWORD dwPartitionMethod, + IN DWORD dwCount, + IN DWORD dwSize) +{ + TAPE_CREATE_PARTITION TapeCreatePartition; + + TapeCreatePartition.Method = dwPartitionMethod; + TapeCreatePartition.Count = dwCount; + TapeCreatePartition.Size = dwSize; + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_CREATE_PARTITION, + &TapeCreatePartition, + sizeof(TapeCreatePartition), + NULL, + 0); +} + +/* + * @implemented + */ +DWORD +WINAPI +EraseTape(IN HANDLE hDevice, + IN DWORD dwEraseType, + IN BOOL bImmediate) +{ + TAPE_ERASE TapeErase; + + TapeErase.Type = dwEraseType; + TapeErase.Immediate = (BOOLEAN)bImmediate; + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_ERASE, + &TapeErase, + sizeof(TapeErase), + NULL, + 0); +} + +/* + * @implemented + */ +DWORD +WINAPI +GetTapeParameters(IN HANDLE hDevice, + IN DWORD dwOperation, + IN LPDWORD lpdwSize, + IN LPVOID lpTapeInformation) +{ + if (dwOperation == GET_TAPE_MEDIA_INFORMATION) + { + if (*lpdwSize < sizeof(TAPE_GET_MEDIA_PARAMETERS)) + { + *lpdwSize = sizeof(TAPE_GET_MEDIA_PARAMETERS); + return ERROR_MORE_DATA; + } + + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_GET_MEDIA_PARAMS, + NULL, + 0, + lpTapeInformation, + sizeof(TAPE_GET_MEDIA_PARAMETERS)); + } + else if (dwOperation == GET_TAPE_DRIVE_INFORMATION) + { + if (*lpdwSize < sizeof(TAPE_GET_DRIVE_PARAMETERS)) + { + *lpdwSize = sizeof(TAPE_GET_DRIVE_PARAMETERS); + return ERROR_MORE_DATA; + } + + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_GET_DRIVE_PARAMS, + NULL, + 0, + lpTapeInformation, + sizeof(TAPE_GET_DRIVE_PARAMETERS)); + } + + return ERROR_INVALID_FUNCTION; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetTapePosition(IN HANDLE hDevice, + IN DWORD dwPositionType, + IN LPDWORD lpdwPartition, + IN LPDWORD lpdwOffsetLow, + IN LPDWORD lpdwOffsetHigh) +{ + TAPE_GET_POSITION TapeGetPosition; + DWORD Result; + + TapeGetPosition.Type = dwPositionType; + Result = BasepDoTapeOperation(hDevice, + IOCTL_TAPE_GET_POSITION, + &TapeGetPosition, + sizeof(TapeGetPosition), + &TapeGetPosition, + sizeof(TapeGetPosition)); + + if (Result) + { + *lpdwPartition = 0; + *lpdwOffsetLow = 0; + *lpdwOffsetHigh = 0; + } + else + { + *lpdwPartition = TapeGetPosition.Partition; + *lpdwOffsetLow = TapeGetPosition.Offset.u.LowPart; + *lpdwOffsetHigh = TapeGetPosition.Offset.u.HighPart; + } + + return Result; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetTapeStatus(IN HANDLE hDevice) +{ + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_GET_STATUS, + NULL, + 0, + NULL, + 0); +} + +/* + * @implemented + */ +DWORD +WINAPI +PrepareTape(IN HANDLE hDevice, + IN DWORD dwOperation, + IN BOOL bImmediate) +{ + TAPE_PREPARE TapePrepare; + + TapePrepare.Operation = dwOperation; + TapePrepare.Immediate = (BOOLEAN)bImmediate; + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_PREPARE, + &TapePrepare, + sizeof(TapePrepare), + NULL, + 0); +} + +/* + * @implemented + */ +DWORD +WINAPI +SetTapeParameters(IN HANDLE hDevice, + IN DWORD dwOperation, + IN LPVOID lpTapeInformation) +{ + if (dwOperation == SET_TAPE_MEDIA_INFORMATION) + { + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_SET_MEDIA_PARAMS, + lpTapeInformation, + sizeof(TAPE_SET_MEDIA_PARAMETERS), + NULL, + 0); + } + else if (dwOperation == SET_TAPE_DRIVE_INFORMATION) + { + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_SET_DRIVE_PARAMS, + lpTapeInformation, + sizeof(TAPE_SET_DRIVE_PARAMETERS), + NULL, + 0); + } + + return ERROR_INVALID_FUNCTION; +} + +/* + * @implemented + */ +DWORD +WINAPI +SetTapePosition(IN HANDLE hDevice, + IN DWORD dwPositionMethod, + IN DWORD dwPartition, + IN DWORD dwOffsetLow, + IN DWORD dwOffsetHigh, + IN BOOL bImmediate) +{ + TAPE_SET_POSITION TapeSetPosition; + + TapeSetPosition.Method = dwPositionMethod; + TapeSetPosition.Partition = dwPartition; + TapeSetPosition.Offset.u.LowPart = dwOffsetLow; + TapeSetPosition.Offset.u.HighPart = dwOffsetHigh; + TapeSetPosition.Immediate = (BOOLEAN)bImmediate; + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_SET_POSITION, + &TapeSetPosition, + sizeof(TapeSetPosition), + NULL, + 0); +} + +/* + * @implemented + */ +DWORD +WINAPI +WriteTapemark(IN HANDLE hDevice, + IN DWORD dwTapemarkType, + IN DWORD dwTapemarkCount, + IN BOOL bImmediate) +{ + TAPE_WRITE_MARKS TapeWriteMarks; + + TapeWriteMarks.Type = dwTapemarkType; + TapeWriteMarks.Count = dwTapemarkCount; + TapeWriteMarks.Immediate = (BOOLEAN)bImmediate; + return BasepDoTapeOperation(hDevice, + IOCTL_TAPE_WRITE_MARKS, + &TapeWriteMarks, + sizeof(TapeWriteMarks), + NULL, + 0); } /* 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] Mon Nov 7 07:41:52 2011 @@ -15,12 +15,13 @@ /* GLOBALS ********************************************************************/ -UNICODE_STRING BaseDllDirectory; UNICODE_STRING NoDefaultCurrentDirectoryInExePath = RTL_CONSTANT_STRING(L"NoDefaultCurrentDirectoryInExePath"); -UNICODE_STRING SystemDirectory; -UNICODE_STRING WindowsDirectory; -UNICODE_STRING BaseDefaultPathAppend; -UNICODE_STRING BaseDefaultPath; + +UNICODE_STRING BaseWindowsSystemDirectory, BaseWindowsDirectory; +UNICODE_STRING BaseDefaultPathAppend, BaseDefaultPath, BaseDllDirectory; + +PVOID gpTermsrvGetWindowsDirectoryA; +PVOID gpTermsrvGetWindowsDirectoryW; /* This is bitmask for each illegal filename character */ /* If someone has time, please feel free to use 0b notation */ @@ -33,6 +34,41 @@ }; /* PRIVATE FUNCTIONS **********************************************************/ + +BOOLEAN +WINAPI +CheckForSameCurdir(IN PUNICODE_STRING DirName) +{ + PUNICODE_STRING CurDir; + USHORT CurLength; + BOOLEAN Result; + UNICODE_STRING CurDirCopy; + + CurDir = &NtCurrentPeb()->ProcessParameters->CurrentDirectory.DosPath; + + CurLength = CurDir->Length; + if (CurDir->Length <= 6) + { + if (CurLength != DirName->Length) return FALSE; + } + else + { + if ((CurLength - 2) != DirName->Length) return FALSE; + } + + RtlAcquirePebLock(); + + CurDirCopy = *CurDir; + if (CurDirCopy.Length > 6) CurDirCopy.Length -= 2; + + Result = 0; + + if (RtlEqualUnicodeString(&CurDirCopy, DirName, TRUE)) Result = TRUE; + + RtlReleasePebLock(); + + return Result; +} /* * Why not use RtlIsNameLegalDOS8Dot3? In fact the actual algorithm body is @@ -790,7 +826,6 @@ return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); } - /* * @implemented */ @@ -1478,81 +1513,6 @@ /* * @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 */ @@ -1640,12 +1600,168 @@ /* * @implemented */ +DWORD +WINAPI +GetCurrentDirectoryA(IN DWORD nBufferLength, + IN LPSTR lpBuffer) +{ + ANSI_STRING AnsiString; + NTSTATUS Status; + PUNICODE_STRING StaticString; + ULONG MaxLength; + + StaticString = &NtCurrentTeb()->StaticUnicodeString; + + MaxLength = nBufferLength; + if (nBufferLength >= UNICODE_STRING_MAX_BYTES) + { + MaxLength = UNICODE_STRING_MAX_BYTES - 1; + } + + StaticString->Length = RtlGetCurrentDirectory_U(StaticString->MaximumLength, + StaticString->Buffer); + Status = RtlUnicodeToMultiByteSize(&nBufferLength, + StaticString->Buffer, + StaticString->Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + if (MaxLength <= nBufferLength) + { + return nBufferLength + 1; + } + + AnsiString.Buffer = lpBuffer; + AnsiString.MaximumLength = MaxLength; + Status = BasepUnicodeStringTo8BitString(&AnsiString, StaticString, FALSE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return AnsiString.Length; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetCurrentDirectoryW(IN DWORD nBufferLength, + IN LPWSTR lpBuffer) +{ + return RtlGetCurrentDirectory_U(nBufferLength * sizeof(WCHAR), lpBuffer) / sizeof(WCHAR); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetCurrentDirectoryA(IN LPCSTR lpPathName) +{ + PUNICODE_STRING DirName; + NTSTATUS Status; + + if (!lpPathName) + { + BaseSetLastNTError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + DirName = Basep8BitStringToStaticUnicodeString(lpPathName); + if (!DirName) return FALSE; + + if (CheckForSameCurdir(DirName)) return FALSE; + + Status = RtlSetCurrentDirectory_U(DirName); + if (NT_SUCCESS(Status)) return TRUE; + + if ((*DirName->Buffer != L'"') || (DirName->Length <= 2)) + { + BaseSetLastNTError(Status); + return 0; + } + + DirName = Basep8BitStringToStaticUnicodeString(lpPathName + 1); + if (!DirName) return FALSE; + + Status = RtlSetCurrentDirectory_U(DirName); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetCurrentDirectoryW(IN LPCWSTR lpPathName) +{ + NTSTATUS Status; + UNICODE_STRING UnicodeString; + + if (!lpPathName) + { + BaseSetLastNTError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlInitUnicodeStringEx(&UnicodeString, lpPathName); + if (NT_SUCCESS(Status)) + { + if (!CheckForSameCurdir(&UnicodeString)) + { + Status = RtlSetCurrentDirectory_U(&UnicodeString); + } + } + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ UINT WINAPI GetSystemDirectoryA(IN LPSTR lpBuffer, IN UINT uSize) { - return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); + ANSI_STRING AnsiString; + NTSTATUS Status; + ULONG AnsiLength; + + /* Get the correct size of the Unicode Base directory */ + Status = RtlUnicodeToMultiByteSize(&AnsiLength, + BaseWindowsSystemDirectory.Buffer, + BaseWindowsSystemDirectory.MaximumLength); + if (!NT_SUCCESS(Status)) return 0; + + if (uSize < AnsiLength) return AnsiLength; + + RtlInitEmptyAnsiString(&AnsiString, lpBuffer, uSize); + + Status = BasepUnicodeStringTo8BitString(&AnsiString, + &BaseWindowsSystemDirectory, + FALSE); + if (!NT_SUCCESS(Status)) return 0; + + return AnsiString.Length; } /* @@ -1656,21 +1772,20 @@ 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 + ULONG ReturnLength; + + ReturnLength = BaseWindowsSystemDirectory.MaximumLength; + if ((uSize * sizeof(WCHAR)) >= ReturnLength) + { + RtlCopyMemory(lpBuffer, + BaseWindowsSystemDirectory.Buffer, + BaseWindowsSystemDirectory.Length); + lpBuffer[BaseWindowsSystemDirectory.Length / sizeof(WCHAR)] = ANSI_NULL; + + ReturnLength = BaseWindowsSystemDirectory.Length; + } + + return ReturnLength / sizeof(WCHAR); } /* @@ -1681,7 +1796,11 @@ GetWindowsDirectoryA(IN LPSTR lpBuffer, IN UINT uSize) { - return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); + /* Is this a TS installation? */ + if (gpTermsrvGetWindowsDirectoryA) UNIMPLEMENTED; + + /* Otherwise, call the System API */ + return GetSystemWindowsDirectoryA(lpBuffer, uSize); } /* @@ -1692,21 +1811,11 @@ 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 + /* Is this a TS installation? */ + if (gpTermsrvGetWindowsDirectoryW) UNIMPLEMENTED; + + /* Otherwise, call the System API */ + return GetSystemWindowsDirectoryW(lpBuffer, uSize); } /* @@ -1717,7 +1826,26 @@ GetSystemWindowsDirectoryA(IN LPSTR lpBuffer, IN UINT uSize) { - return GetWindowsDirectoryA(lpBuffer, uSize); + ANSI_STRING AnsiString; + NTSTATUS Status; + ULONG AnsiLength; + + /* Get the correct size of the Unicode Base directory */ + Status = RtlUnicodeToMultiByteSize(&AnsiLength, + BaseWindowsDirectory.Buffer, + BaseWindowsDirectory.MaximumLength); + if (!NT_SUCCESS(Status)) return 0; + + if (uSize < AnsiLength) return AnsiLength; + + RtlInitEmptyAnsiString(&AnsiString, lpBuffer, uSize); + + Status = BasepUnicodeStringTo8BitString(&AnsiString, + &BaseWindowsDirectory, + FALSE); + if (!NT_SUCCESS(Status)) return 0; + + return AnsiString.Length; } /* @@ -1728,7 +1856,20 @@ GetSystemWindowsDirectoryW(IN LPWSTR lpBuffer, IN UINT uSize) { - return GetWindowsDirectoryW(lpBuffer, uSize); + ULONG ReturnLength; + + ReturnLength = BaseWindowsDirectory.MaximumLength; + if ((uSize * sizeof(WCHAR)) >= ReturnLength) + { + RtlCopyMemory(lpBuffer, + BaseWindowsDirectory.Buffer, + BaseWindowsDirectory.Length); + lpBuffer[BaseWindowsDirectory.Length / sizeof(WCHAR)] = ANSI_NULL; + + ReturnLength = BaseWindowsDirectory.Length; + } + + return ReturnLength / sizeof(WCHAR); } /* Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Mon Nov 7 07:41:52 2011 @@ -12,7 +12,67 @@ #define NDEBUG #include <debug.h> +#undef InterlockedIncrement +#undef InterlockedDecrement +#undef InterlockedExchange +#undef InterlockedExchangeAdd +#undef InterlockedCompareExchange + /* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +LONG +WINAPI +InterlockedIncrement(IN OUT LONG volatile *lpAddend) +{ + return _InterlockedIncrement(lpAddend); +} + +/* + * @implemented + */ +LONG +WINAPI +InterlockedDecrement(IN OUT LONG volatile *lpAddend) +{ + return _InterlockedDecrement(lpAddend); +} + +/* + * @implemented + */ +LONG +WINAPI +InterlockedExchange(IN OUT LONG volatile *Target, + IN LONG Value) +{ + return _InterlockedExchange(Target, Value); +} + +/* + * @implemented + */ +LONG +WINAPI +InterlockedExchangeAdd(IN OUT LONG volatile *Addend, + IN LONG Value) +{ + return _InterlockedExchangeAdd(Addend, Value); +} + +/* + * @implemented + */ +LONG +WINAPI +InterlockedCompareExchange(IN OUT LONG volatile *Destination, + IN LONG Exchange, + IN LONG Comperand) +{ + return _InterlockedCompareExchange(Destination, Exchange, Comperand); +} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Mon Nov 7 07:41:52 2011 @@ -258,6 +258,7 @@ extern PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; extern PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; +extern UNICODE_STRING BaseWindowsDirectory, BaseWindowsSystemDirectory; extern HANDLE BaseNamedObjectDirectory; HANDLE

1 0

[pschweitzer] 54333: [KERNEL32] Fix wrong L usage in new code.
by pschweitzer＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: pschweitzer Date: Mon Nov 7 06:45:17 2011 New Revision: 54333 URL: http://svn.reactos.org/svn/reactos?rev=54333&view=rev Log: [KERNEL32] Fix wrong L usage in new code. 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] Mon Nov 7 06:45:17 2011 @@ -111,7 +111,7 @@ } /* Check if this is perhaps an extension? */ - if (c == L'.') + if (c == '.') { /* Unless the extension is too large or there's more than one */ if ((HasExtension) || (Dots > 3)) return FALSE; @@ -144,7 +144,7 @@ for (i = 0, Dots = Length - 1; i < Length; i++, Dots--) { /* Check if this could be an extension */ - if (FileName[i] == '.') + if (FileName[i] == L'.') { /* Unlike the short case, we WANT more than one extension, or a long one */ if ((HasExtension) || (Dots > 3))

1 0

[ion] 54332: [KERNEL32]: Fix multiple, multiple, bugs in the last commits. Path is now down to 12 failures (way lower than before the streak), most unrelated to actual path APIs.
by ion＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: ion Date: Mon Nov 7 05:07:58 2011 New Revision: 54332 URL: http://svn.reactos.org/svn/reactos?rev=54332&view=rev Log: [KERNEL32]: Fix multiple, multiple, bugs in the last commits. Path is now down to 12 failures (way lower than before the streak), most unrelated to actual path APIs. 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] Mon Nov 7 05:07:58 2011 @@ -144,10 +144,13 @@ for (i = 0, Dots = Length - 1; i < Length; i++, Dots--) { /* Check if this could be an extension */ - if (*FileName == '.') + if (FileName[i] == '.') { /* Unlike the short case, we WANT more than one extension, or a long one */ - if ((HasExtension) || (Dots > 3)) return TRUE; + if ((HasExtension) || (Dots > 3)) + { + return TRUE; + } HasExtension = TRUE; } @@ -219,7 +222,7 @@ PWCHAR WINAPI -SkipPathTypeIndicator_U(IN PWCHAR Path) +SkipPathTypeIndicator_U(IN LPWSTR Path) { PWCHAR ReturnPath; ULONG i; @@ -543,7 +546,7 @@ if (!PathSize) goto Quickie; /* If the *caller's* buffer was too small, fail, but add in space for NULL */ - if (PathSize < nBufferLength) + if (PathSize >= nBufferLength) { PathSize++; goto Quickie; @@ -890,7 +893,7 @@ HANDLE FindHandle; DWORD ReturnLength; ULONG ErrorMode; - BOOLEAN Found; + BOOLEAN Found = FALSE; WIN32_FIND_DATAW FindFileData; /* Initialize so Quickie knows there's nothing to do */ @@ -917,13 +920,12 @@ } /* 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); + Path = SkipPathTypeIndicator_U((LPWSTR)lpszShortPath); /* Is there any path or filename in there? */ - if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) + if (!(Path) || + (*Path == UNICODE_NULL) || + !(FindLFNorSFN_U(Path, &First, &Last, FALSE))) { /* There isn't, so the long path is simply the short path */ ReturnLength = wcslen(lpszShortPath); @@ -953,7 +955,7 @@ Original = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); if (!Original) goto ErrorQuickie; - /* Make a copy ofi t */ + /* Make a copy of it */ RtlMoveMemory(Original, lpszShortPath, Length * sizeof(WCHAR)); /* Compute the new first and last markers */ @@ -1269,7 +1271,7 @@ HANDLE FindHandle; DWORD ReturnLength; ULONG ErrorMode; - BOOLEAN Found; + BOOLEAN Found = FALSE; WIN32_FIND_DATAW FindFileData; /* Initialize so Quickie knows there's nothing to do */ @@ -1288,7 +1290,7 @@ ErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); /* Do a simple check to see if the path exists */ - if (GetFileAttributesW(lpszShortPath) == INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesW(lpszLongPath) == INVALID_FILE_ATTRIBUTES) { /* Windows checks for an application compatibility flag to allow this */ if (!(NtCurrentPeb()) || !(NtCurrentPeb()->AppCompatFlags.LowPart & 1)) @@ -1300,19 +1302,18 @@ } /* 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); + Path = SkipPathTypeIndicator_U((LPWSTR)lpszLongPath); /* Is there any path or filename in there? */ - if (!(Path) || (*Path == UNICODE_NULL) || !(Found)) + if (!(Path) || + (*Path == UNICODE_NULL) || + !(FindLFNorSFN_U(Path, &First, &Last, TRUE))) { /* There isn't, so the long path is simply the short path */ ReturnLength = wcslen(lpszLongPath); /* Is there space for it? */ - if ((cchBuffer > ReturnLength) && (lpszLongPath)) + if ((cchBuffer > ReturnLength) && (lpszShortPath)) { /* Make sure the pointers aren't already the same */ if (lpszLongPath != lpszShortPath)

1 0

[cgutman] 54331: [TCPIP] - Fix a potential double-completion of an IRP
by cgutman＠svn.reactos.org 07 Nov '11

07 Nov '11

Author: cgutman Date: Mon Nov 7 02:02:59 2011 New Revision: 54331 URL: http://svn.reactos.org/svn/reactos?rev=54331&view=rev Log: [TCPIP] - Fix a potential double-completion of an IRP Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Nov 7 02:02:59 2011 @@ -1516,14 +1516,11 @@ return Irp->IoStatus.Status; } - Status = DispPrepareIrpForCancel(TranContext, Irp, NULL); - if (NT_SUCCESS(Status)) { - Request.RequestNotifyObject = DispDataRequestComplete; - Request.RequestContext = Irp; - - Status = InfoTdiSetInformationEx(&Request, &Info->ID, + Request.RequestNotifyObject = NULL; + Request.RequestContext = NULL; + + Status = InfoTdiSetInformationEx(&Request, &Info->ID, &Info->Buffer, Info->BufferSize); - } return Status; }

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