Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37402: - Start deprecating the overabused system_header gcc pragma extension
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 07:49:52 2008 New Revision: 37402 URL: http://svn.reactos.org/svn/reactos?rev=37402&view=rev Log: - Start deprecating the overabused system_header gcc pragma extension Modified: trunk/reactos/include/GL/glu.h Modified: trunk/reactos/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/glu.h?rev=37402… ============================================================================== --- trunk/reactos/include/GL/glu.h [iso-8859-1] (original) +++ trunk/reactos/include/GL/glu.h [iso-8859-1] Mon Nov 17 07:49:52 2008 @@ -30,9 +30,6 @@ #ifndef __glu_h__ #define __glu_h__ #define _GLU_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #include <stddef.h> /* for wchar_t */ #include <GL/gl.h>

1 0

[mkupfer] 37401: - disable non-working device selection code - add a missing "break"
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 07:35:59 2008 New Revision: 37401 URL: http://svn.reactos.org/svn/reactos?rev=37401&view=rev Log: - disable non-working device selection code - add a missing "break" Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 07:35:59 2008 @@ -535,10 +535,10 @@ (WPARAM)sizeof(SetupData.InstallDir)/sizeof(TCHAR),(LPARAM)SetupData.InstallDir); EndDialog(hwndDlg, IDOK); - break; + return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - break; + return TRUE; } } return FALSE; @@ -559,10 +559,10 @@ { case IDOK: EndDialog(hwndDlg, IDOK); - break; + return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - break; + return TRUE; } } return FALSE; @@ -574,10 +574,12 @@ WPARAM wParam, LPARAM lParam) { +#if 0 HDEVINFO h; HWND hList; SP_DEVINFO_DATA DevInfoData; DWORD i; +#endif switch (uMsg) { case WM_INITDIALOG: @@ -596,6 +598,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ +#if 0 h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); if (h != INVALID_HANDLE_VALUE) @@ -627,6 +630,7 @@ } SetupDiDestroyDeviceInfoList(h); } +#endif } break; case WM_COMMAND: @@ -634,14 +638,15 @@ switch(LOWORD(wParam)) { case IDC_PARTMOREOPTS: - DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); + DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,(DLGPROC)MoreOptDlgProc); break; case IDC_PARTCREATE: - DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,PartitionDlgProc); + DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,(DLGPROC)PartitionDlgProc); break; case IDC_PARTDELETE: break; } + break; } case WM_NOTIFY:

1 0

[fireball] 37400: - Remove hack around VFATFS (and CDFS) bugs which were fixed in r37393.
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 07:19:22 2008 New Revision: 37400 URL: http://svn.reactos.org/svn/reactos?rev=37400&view=rev Log: - Remove hack around VFATFS (and CDFS) bugs which were fixed in r37393. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Nov 17 07:19:22 2008 @@ -1355,14 +1355,6 @@ return Status; } - /* ROS HACK. VFAT SUCKS */ - if (NT_WARNING(Status)) - { - DPRINT("Status 0x%08x, LRN 0x%x, FileLength 0x%x\n", Status, - LocalReturnLength, FileLength); - LocalReturnLength = FileLength; - } - /* If the provided buffer is too small, return the required size */ if (LengthMismatch) {

1 0

[fireball] 37399: - Cleanup 37394, 37396 and 37397: * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE. * Fix headers, actual stub, and usage in kernel32 respectively. * We don't use hungarian notation in RTL ("hFileHandle") .
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 07:16:07 2008 New Revision: 37399 URL: http://svn.reactos.org/svn/reactos?rev=37399&view=rev Log: - Cleanup 37394, 37396 and 37397: * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE. * Fix headers, actual stub, and usage in kernel32 respectively. * We don't use hungarian notation in RTL ("hFileHandle") . Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -355,7 +355,7 @@ DPRINT("(%p, %p, %d)\n", FileHandle, Function, Flags); Status = RtlSetIoCompletionCallback(FileHandle, - (PRTL_OVERLAPPED_COMPLETION_ROUTINE) Function, + (PIO_APC_ROUTINE)Function, Flags); if (!NT_SUCCESS(Status)) 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 17 07:16:07 2008 @@ -2065,7 +2065,7 @@ NTAPI RtlSetIoCompletionCallback( IN HANDLE FileHandle, - IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, + IN PIO_APC_ROUTINE Callback, IN ULONG Flags ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -430,16 +430,6 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; #endif - -// -// Callback for RtlSetIoCompletionCallback -// -typedef VOID -(NTAPI *PRTL_OVERLAPPED_COMPLETION_ROUTINE)( - ULONG, - ULONG, - PVOID -); // // Callback for RTL Heap Enumeration Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=373… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -885,8 +885,8 @@ */ NTSTATUS NTAPI -RtlSetIoCompletionCallback(IN HANDLE hFileHandle, - IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, +RtlSetIoCompletionCallback(IN HANDLE FileHandle, + IN PIO_APC_ROUTINE Callback, IN ULONG Flags) { UNIMPLEMENTED;

1 0

[sginsberg] 37398: - Remove deprecated header cruft
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 07:03:54 2008 New Revision: 37398 URL: http://svn.reactos.org/svn/reactos?rev=37398&view=rev Log: - Remove deprecated header cruft Modified: trunk/reactos/dll/win32/user32/include/controls.h Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Mon Nov 17 07:03:54 2008 @@ -8,16 +8,6 @@ #endif #ifndef WM_ISACTIVEICON #define WM_ISACTIVEICON 0x0035 -#endif - -#ifndef __USE_W32API -#if defined(STRICT) -typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT); -typedef INT (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT); -#else -typedef FARPROC EDITWORDBREAKPROCA; -typedef FARPROC EDITWORDBREAKPROCW; -#endif #endif #ifndef HBMMENU_CALLBACK

1 0

[dchapyshev] 37397: - Fix build
by dchapyshev＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: dchapyshev Date: Mon Nov 17 06:13:28 2008 New Revision: 37397 URL: http://svn.reactos.org/svn/reactos?rev=37397&view=rev Log: - Fix build Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Nov 17 06:13:28 2008 @@ -406,6 +406,32 @@ ); // +// RTL Library Allocation/Free Routines +// +typedef PVOID +(NTAPI *PRTL_ALLOCATE_STRING_ROUTINE)( + SIZE_T NumberOfBytes +); + +typedef PVOID +(NTAPI *PRTL_REALLOCATE_STRING_ROUTINE)( + SIZE_T NumberOfBytes, + PVOID Buffer +); + +typedef +VOID +(NTAPI *PRTL_FREE_STRING_ROUTINE)( + PVOID Buffer +); + +extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine; +extern const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine; +extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; + +#endif + +// // Callback for RtlSetIoCompletionCallback // typedef VOID @@ -414,32 +440,6 @@ ULONG, PVOID ); - -// -// RTL Library Allocation/Free Routines -// -typedef PVOID -(NTAPI *PRTL_ALLOCATE_STRING_ROUTINE)( - SIZE_T NumberOfBytes -); - -typedef PVOID -(NTAPI *PRTL_REALLOCATE_STRING_ROUTINE)( - SIZE_T NumberOfBytes, - PVOID Buffer -); - -typedef -VOID -(NTAPI *PRTL_FREE_STRING_ROUTINE)( - PVOID Buffer -); - -extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine; -extern const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine; -extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; - -#endif // // Callback for RTL Heap Enumeration

1 0

[dchapyshev] 37396: - Implement BindIoCompletionCallback, ReadFileScatter, WriteFileGather (based on Wine) - Move DnsHostnameToComputerNameA/W to computername.c
by dchapyshev＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: dchapyshev Date: Mon Nov 17 05:53:59 2008 New Revision: 37396 URL: http://svn.reactos.org/svn/reactos?rev=37396&view=rev Log: - Implement BindIoCompletionCallback, ReadFileScatter, WriteFileGather (based on Wine) - Move DnsHostnameToComputerNameA/W to computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Mon Nov 17 05:53:59 2008 @@ -461,4 +461,73 @@ } } + +/* + * @implemented + */ +BOOL +STDCALL +DnsHostnameToComputerNameA(LPCSTR Hostname, + LPSTR ComputerName, + LPDWORD nSize) +{ + DWORD len; + + DPRINT("(%s, %p, %p)\n", Hostname, ComputerName, nSize); + + if (!Hostname || !nSize) + return FALSE; + + len = lstrlenA(Hostname); + + if (len > MAX_COMPUTERNAME_LENGTH) + len = MAX_COMPUTERNAME_LENGTH; + + if (*nSize < len) + { + *nSize = len; + return FALSE; + } + + if (!ComputerName) return FALSE; + + memcpy( ComputerName, Hostname, len ); + ComputerName[len + 1] = 0; + return TRUE; +} + + +/* + * @implemented + */ +BOOL +STDCALL +DnsHostnameToComputerNameW ( + LPCWSTR hostname, + LPWSTR computername, + LPDWORD size + ) +{ + DWORD len; + + DPRINT("(%s, %p, %p): stub\n", hostname, computername, size); + + if (!hostname || !size) return FALSE; + len = lstrlenW(hostname); + + if (len > MAX_COMPUTERNAME_LENGTH) + len = MAX_COMPUTERNAME_LENGTH; + + if (*size < len) + { + *size = len; + return FALSE; + } + if (!computername) return FALSE; + + memcpy( computername, hostname, len * sizeof(WCHAR) ); + computername[len + 1] = 0; + return TRUE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 17 05:53:59 2008 @@ -342,18 +342,29 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -BindIoCompletionCallback ( - HANDLE FileHandle, - LPOVERLAPPED_COMPLETION_ROUTINE Function, - ULONG Flags - ) -{ - STUB; - return 0; + * @implemented + */ +BOOL +STDCALL +BindIoCompletionCallback(HANDLE FileHandle, + LPOVERLAPPED_COMPLETION_ROUTINE Function, + ULONG Flags) +{ + NTSTATUS Status = 0; + + DPRINT("(%p, %p, %d)\n", FileHandle, Function, Flags); + + Status = RtlSetIoCompletionCallback(FileHandle, + (PRTL_OVERLAPPED_COMPLETION_ROUTINE) Function, + Flags); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } /* @@ -562,20 +573,45 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -ReadFileScatter( - HANDLE hFile, - FILE_SEGMENT_ELEMENT aSegmentArray[], - DWORD nNumberOfBytesToRead, - LPDWORD lpReserved, - LPOVERLAPPED lpOverlapped - ) -{ - STUB; - return 0; + * @implemented + */ +BOOL +STDCALL +ReadFileScatter(HANDLE hFile, + FILE_SEGMENT_ELEMENT aSegmentArray[], + DWORD nNumberOfBytesToRead, + LPDWORD lpReserved, + LPOVERLAPPED lpOverlapped) +{ + PIO_STATUS_BLOCK pIOStatus; + LARGE_INTEGER Offset; + NTSTATUS Status; + + DPRINT("(%p %p %u %p)\n", hFile, aSegmentArray, nNumberOfBytesToRead, lpOverlapped); + + Offset.LowPart = lpOverlapped->Offset; + Offset.HighPart = lpOverlapped->OffsetHigh; + pIOStatus = (PIO_STATUS_BLOCK) lpOverlapped; + pIOStatus->Status = STATUS_PENDING; + pIOStatus->Information = 0; + + Status = NtReadFileScatter(hFile, + NULL, + NULL, + NULL, + pIOStatus, + aSegmentArray, + nNumberOfBytesToRead, + &Offset, + NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } /* @@ -678,20 +714,45 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -WriteFileGather( - HANDLE hFile, - FILE_SEGMENT_ELEMENT aSegmentArray[], - DWORD nNumberOfBytesToWrite, - LPDWORD lpReserved, - LPOVERLAPPED lpOverlapped - ) -{ - STUB; - return 0; + * @implemented + */ +BOOL +STDCALL +WriteFileGather(HANDLE hFile, + FILE_SEGMENT_ELEMENT aSegmentArray[], + DWORD nNumberOfBytesToWrite, + LPDWORD lpReserved, + LPOVERLAPPED lpOverlapped) +{ + PIO_STATUS_BLOCK IOStatus; + LARGE_INTEGER Offset; + NTSTATUS Status; + + DPRINT("%p %p %u %p\n", hFile, aSegmentArray, nNumberOfBytesToWrite, lpOverlapped); + + Offset.LowPart = lpOverlapped->Offset; + Offset.HighPart = lpOverlapped->OffsetHigh; + IOStatus = (PIO_STATUS_BLOCK) lpOverlapped; + IOStatus->Status = STATUS_PENDING; + IOStatus->Information = 0; + + Status = NtWriteFileGather(hFile, + NULL, + NULL, + NULL, + IOStatus, + aSegmentArray, + nNumberOfBytesToWrite, + &Offset, + NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } /* @@ -705,39 +766,6 @@ { STUB; return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -DnsHostnameToComputerNameW ( - LPCWSTR hostname, - LPWSTR computername, - LPDWORD size - ) -{ - DWORD len; - - DPRINT("(%s, %p, %p): stub\n", hostname, computername, size); - - if (!hostname || !size) return FALSE; - len = lstrlenW(hostname); - - if (len > MAX_COMPUTERNAME_LENGTH) - len = MAX_COMPUTERNAME_LENGTH; - - if (*size < len) - { - *size = len; - return FALSE; - } - if (!computername) return FALSE; - - memcpy( computername, hostname, len * sizeof(WCHAR) ); - computername[len + 1] = 0; - return TRUE; } /* @@ -919,21 +947,6 @@ /* * @unimplemented */ -BOOL -STDCALL -DnsHostnameToComputerNameA ( - LPCSTR Hostname, - LPSTR ComputerName, - LPDWORD nSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ HANDLE STDCALL FindFirstVolumeMountPointA( @@ -947,23 +960,22 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -FindNextVolumeA( - HANDLE handle, - LPSTR volume, - DWORD len - ) -{ - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + * @implemented + */ +BOOL +STDCALL +FindNextVolumeA(HANDLE handle, + LPSTR volume, + DWORD len) +{ + WCHAR *buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); BOOL ret; if ((ret = FindNextVolumeW( handle, buffer, len ))) { if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) ret = FALSE; } + HeapFree( GetProcessHeap(), 0, buffer ); return ret; }

1 0

[gedmurphy] 37395: - reference the correct data - set the response info before returning See issue #2808 for more details.
by gedmurphy＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: gedmurphy Date: Mon Nov 17 05:51:33 2008 New Revision: 37395 URL: http://svn.reactos.org/svn/reactos?rev=37395&view=rev Log: - reference the correct data - set the response info before returning See issue #2808 for more details. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Mon Nov 17 05:51:33 2008 @@ -1514,7 +1514,7 @@ ai->ai_family = PF_INET; ai->ai_addrlen = sizeof(struct sockaddr_in); ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen); - sin = (struct sockaddr_in *)ret->ai_addr; + sin = (struct sockaddr_in *)ai->ai_addr; sin->sin_family = AF_INET; sin->sin_port = port; if (hints) @@ -1531,6 +1531,7 @@ if (ai->ai_protocol == 0) ai->ai_protocol = hints->ai_protocol; } + ret = ai; } if (ret == NULL)

1 0

[dchapyshev] 37394: - Add stubs for RtlSetIoCompletionCallback
by dchapyshev＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: dchapyshev Date: Mon Nov 17 05:44:31 2008 New Revision: 37394 URL: http://svn.reactos.org/svn/reactos?rev=37394&view=rev Log: - Add stubs for RtlSetIoCompletionCallback Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Mon Nov 17 05:44:31 2008 @@ -869,7 +869,7 @@ RtlSetGroupSecurityDescriptor@12 RtlSetHeapInformation@16 RtlSetInformationAcl@16 -;RtlSetIoCompletionCallback +RtlSetIoCompletionCallback@12 RtlSetLastWin32Error@4 RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 ;RtlSetMemoryStreamSize 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 17 05:44:31 2008 @@ -2063,6 +2063,15 @@ NTSYSAPI NTSTATUS NTAPI +RtlSetIoCompletionCallback( + IN HANDLE FileHandle, + IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, + IN ULONG Flags +); + +NTSYSAPI +NTSTATUS +NTAPI RtlRegisterWait( IN PHANDLE phNewWaitObject, IN HANDLE hObject, Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Nov 17 05:44:31 2008 @@ -403,6 +403,16 @@ IN PVOID EstablisherFrame, IN OUT struct _CONTEXT *ContextRecord, IN OUT PVOID DispatcherContext +); + +// +// Callback for RtlSetIoCompletionCallback +// +typedef VOID +(NTAPI *PRTL_OVERLAPPED_COMPLETION_ROUTINE)( + ULONG, + ULONG, + PVOID ); // Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=373… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Mon Nov 17 05:44:31 2008 @@ -879,3 +879,16 @@ return Status; } + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlSetIoCompletionCallback(IN HANDLE hFileHandle, + IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +}

1 0

[fireball] 37393: - FASTFAT: when querying file name information, fill in the whole buffer provided by the caller, even if filename does not fully fit (driver by Microsoft(R) does the same). Also, return the actual amount of data written in IoSb.Information, even in case of buffer overflow result. - CDFS: Fix a guaranteed buffer overwrite when zero-terminating a filename. Also apply the same fixes described above.
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 05:25:36 2008 New Revision: 37393 URL: http://svn.reactos.org/svn/reactos?rev=37393&view=rev Log: - FASTFAT: when querying file name information, fill in the whole buffer provided by the caller, even if filename does not fully fit (driver by Microsoft(R) does the same). Also, return the actual amount of data written in IoSb.Information, even in case of buffer overflow result. - CDFS: Fix a guaranteed buffer overwrite when zero-terminating a filename. Also apply the same fixes described above. Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Mon Nov 17 05:25:36 2008 @@ -145,23 +145,38 @@ PULONG BufferLength) { ULONG NameLength; + ULONG BytesToCopy; DPRINT("CdfsGetNameInformation() called\n"); ASSERT(NameInfo != NULL); ASSERT(Fcb != NULL); + /* If buffer can't hold at least the file name length, bail out */ + if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + return STATUS_BUFFER_OVERFLOW; + + /* Calculate file name length in bytes */ NameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); NameInfo->FileNameLength = NameLength; - if (*BufferLength < (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength)) + + /* Calculate amount of bytes to copy not to overflow the buffer */ + BytesToCopy = min(NameLength, + *BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])); + + /* Fill in the bytes */ + RtlCopyMemory(NameInfo->FileName, Fcb->PathName, BytesToCopy); + + /* Check if we could write more but are not able to */ + if (*BufferLength < NameLength + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + { + /* Return number of bytes written */ + *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; return STATUS_BUFFER_OVERFLOW; - - RtlCopyMemory(NameInfo->FileName, - Fcb->PathName, - NameLength + sizeof(WCHAR)); - - *BufferLength -= - (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength); + } + + /* We filled up as many bytes, as needed */ + *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + NameLength); return STATUS_SUCCESS; } @@ -395,7 +410,7 @@ } Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) Irp->IoStatus.Information = Stack->Parameters.QueryFile.Length - BufferLength; else Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Nov 17 05:25:36 2008 @@ -338,15 +338,33 @@ * FUNCTION: Retrieve the file name information */ { + ULONG BytesToCopy; ASSERT(NameInfo != NULL); ASSERT(FCB != NULL); + /* If buffer can't hold at least the file name length, bail out */ + if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + return STATUS_BUFFER_OVERFLOW; + + /* Save file name length, and as much file len, as buffer length allows */ NameInfo->FileNameLength = FCB->PathNameU.Length; - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length) + + /* Calculate amount of bytes to copy not to overflow the buffer */ + BytesToCopy = min(FCB->PathNameU.Length, + *BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])); + + /* Fill in the bytes */ + RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy); + + /* Check if we could write more but are not able to */ + if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + { + /* Return number of bytes written */ + *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; return STATUS_BUFFER_OVERFLOW; - - RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, FCB->PathNameU.Length); - + } + + /* We filled up as many bytes, as needed */ *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length); return STATUS_SUCCESS; @@ -749,7 +767,7 @@ FILE_INFORMATION_CLASS FileInformationClass; PVFATFCB FCB = NULL; - NTSTATUS RC = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; ULONG BufferLength; @@ -780,44 +798,44 @@ switch (FileInformationClass) { case FileStandardInformation: - RC = VfatGetStandardInformation(FCB, + Status = VfatGetStandardInformation(FCB, SystemBuffer, &BufferLength); break; case FilePositionInformation: - RC = VfatGetPositionInformation(IrpContext->FileObject, + Status = VfatGetPositionInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileBasicInformation: - RC = VfatGetBasicInformation(IrpContext->FileObject, + Status = VfatGetBasicInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileNameInformation: - RC = VfatGetNameInformation(IrpContext->FileObject, + Status = VfatGetNameInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileInternalInformation: - RC = VfatGetInternalInformation(FCB, + Status = VfatGetInternalInformation(FCB, SystemBuffer, &BufferLength); break; case FileNetworkOpenInformation: - RC = VfatGetNetworkOpenInformation(FCB, + Status = VfatGetNetworkOpenInformation(FCB, IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; case FileAllInformation: - RC = VfatGetAllInformation(IrpContext->FileObject, + Status = VfatGetAllInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, @@ -825,7 +843,7 @@ break; case FileEaInformation: - RC = VfatGetEaInformation(IrpContext->FileObject, + Status = VfatGetEaInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, @@ -833,18 +851,18 @@ break; case FileAlternateNameInformation: - RC = STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; break; default: - RC = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; } if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { ExReleaseResourceLite(&FCB->MainResource); } - IrpContext->Irp->IoStatus.Status = RC; - if (NT_SUCCESS(RC)) + IrpContext->Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) IrpContext->Irp->IoStatus.Information = IrpContext->Stack->Parameters.QueryFile.Length - BufferLength; else @@ -852,7 +870,7 @@ IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); VfatFreeIrpContext(IrpContext); - return RC; + return Status; } NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008