Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[sserapion] 37392: - Use TARGET_CPPFLAGS, needs latest ROSBE. - Link crt runtime to dlls too.
by sserapion＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sserapion Date: Mon Nov 17 00:08:13 2008 New Revision: 37392 URL: http://svn.reactos.org/svn/reactos?rev=37392&view=rev Log: - Use TARGET_CPPFLAGS, needs latest ROSBE. - Link crt runtime to dlls too. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 17 00:08:13 2008 @@ -1915,8 +1915,7 @@ { if ( module.cplusplus ) { - // HACK: use host headers when building C++ - globalCflags += " $(HOST_CPPFLAGS)"; + globalCflags += " $(TARGET_CPPFLAGS)"; } else globalCflags += " -nostdinc"; @@ -2684,8 +2683,8 @@ { if ( module.IsDLL () ) { - //pLibrary = new Library ( module, "__mingw_dllmain" ); - //module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); + pLibrary = new Library ( module, "mingw_dllmain" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); } else {

1 0

[sserapion] 37391: - call __main (C++ initialization) gcc inserts this call automatically for a function called "main", but not for "wmain" fixes explorer - support pseudo runtime relocation v2. - re-enable commented out code for security cookies. - rename entry point __tmainCRTStartup. - gccmain.c re-add comment explaining this file's purpose.
by sserapion＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sserapion Date: Sun Nov 16 23:51:18 2008 New Revision: 37391 URL: http://svn.reactos.org/svn/reactos?rev=37391&view=rev Log: - call __main (C++ initialization) gcc inserts this call automatically for a function called "main", but not for "wmain" fixes explorer - support pseudo runtime relocation v2. - re-enable commented out code for security cookies. - rename entry point __tmainCRTStartup. - gccmain.c re-add comment explaining this file's purpose. Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,5 @@ +extern void (*_imp___fpreset)(void) ; +void _fpreset (void) +{ (*_imp___fpreset)(); } + +void __attribute__ ((alias ("_fpreset"))) fpreset(void); Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -2,8 +2,13 @@ int WINAPI wWinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPWSTR lpCmdLine,int nShowCmd); - +void __main(void); int wmain (int flags, wchar_t **cmdline, wchar_t **inst) { +#ifdef __GNUC__ + /* C++ initialization. (gcc inserts this call automatically for + * a function called "main", but not for "wmain") */ + __main(); +#endif return (int) wWinMain ((HINSTANCE) inst, NULL, (LPWSTR) cmdline,(DWORD) flags); } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,5 +1,5 @@ #undef CRTDLL -#define _DLL +//#define _DLL #define SPECIAL_CRTEXE @@ -31,7 +31,7 @@ #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') -_CRTIMP void __setusermatherr(int (__cdecl *)(struct _exception *)); +__declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); extern int *_imp___fmode; extern int *_imp___commode; @@ -68,9 +68,9 @@ static char **envp; #endif -static int argret=0; +static int argret; static int mainret=0; -static int managedapp=0; +static int managedapp; static int has_cctor = 0; static _startupinfo startinfo; @@ -102,8 +102,10 @@ *_imp___fmode = _fmode; *_imp___commode = _commode; -#ifndef WPRFLAG - _dowildcard = 1; +#ifdef WPRFLAG + _wsetargv(); +#else + _setargv(); #endif if (! __defaultmatherr) @@ -119,15 +121,15 @@ pre_cpp_init (void) { startinfo.newmode = _newmode; + #ifdef WPRFLAG argret = __wgetmainargs(&argc,&argv,&envp,_dowildcard,&startinfo); #else argret = __getmainargs(&argc,&argv,&envp,_dowildcard,&startinfo); #endif - -} - -static int __mingw_CRTStartup (void); +} + +static int __tmainCRTStartup (void); #ifdef WPRFLAG int wWinMainCRTStartup (void) @@ -136,8 +138,8 @@ #endif { mingw_app_type = 1; - //__security_init_cookie (); - return __mingw_CRTStartup (); + __security_init_cookie (); + return __tmainCRTStartup (); } #ifdef WPRFLAG @@ -147,26 +149,25 @@ #endif { mingw_app_type = 0; - //__security_init_cookie (); - return __mingw_CRTStartup (); + __security_init_cookie (); + return __tmainCRTStartup (); } __declspec(noinline) int -__mingw_CRTStartup (void) +__tmainCRTStartup (void) { _TCHAR *lpszCommandLine = NULL; STARTUPINFO StartupInfo; BOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - int nested = FALSE; - + if (mingw_app_type) GetStartupInfo (&StartupInfo); { -#if 0 //not ready for this yet void *lock_free = NULL; void *fiberid = ((PNT_TIB)NtCurrentTeb())->StackBase; + int nested = FALSE; while((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock, fiberid, 0)) != 0) { @@ -177,7 +178,6 @@ } Sleep(1000); } -#endif if (__native_startup_state == __initializing) { _amsg_exit (31); @@ -404,7 +404,7 @@ static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data) { /* TODO this is not chainablem, therefore need rewrite. Disabled the ill code. */ - + #if 0 #ifdef _WIN64 __asm__ __volatile__ ( "movq %gs:0,%rax" "\n\t" @@ -421,6 +421,7 @@ "jmp *4(%eax)\n\r" "l1:\n\t" "nop\n"); +#endif #endif return _gnu_exception_handler(exception_data); } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,30 @@ +#ifdef CRTDLL +#undef CRTDLL +#endif + +#include "internal.h" + +extern int _dowildcard; + +#ifdef WPRFLAG +int __CRTDECL +_wsetargv (void) +#else +int __CRTDECL +_setargv (void) +#endif +{ + return 0; +} + +#ifdef WPRFLAG +int __CRTDECL +__wsetargv (void) +#else +int __CRTDECL +__setargv (void) +#endif +{ + _dowildcard = 1; + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c (removed) @@ -1,9 +1,0 @@ -#define _DECL_DLLMAIN -#define _WINDOWS_ -#include <windows.h> -#include <process.h> - -BOOL WINAPI DllMain(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) -{ - return TRUE; -} Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,3 +1,15 @@ +/* + * gccmain.c + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * A separate version of __main, __do_global_ctors and __do_global_dtors for + * Mingw32 for use with Cygwin32 b19. Hopefully this object file will only + * be linked if the libgcc.a doesn't include __main, __do_global_dtors and + * __do_global_ctors. + * + */ #include <windows.h> #include <stdlib.h> #include <setjmp.h> @@ -6,7 +18,7 @@ extern func_ptr __CTOR_LIST__[]; extern func_ptr __DTOR_LIST__[]; -//static HMODULE hMsvcrt = NULL; +static HMODULE hMsvcrt = NULL; typedef void __cdecl flongjmp(jmp_buf _Buf,int _Value); @@ -22,11 +34,11 @@ (*(p)) (); p++; } - //if (hMsvcrt) - // { - // FreeLibrary (hMsvcrt); - // hMsvcrt = NULL; - // } + if (hMsvcrt) + { + FreeLibrary (hMsvcrt); + hMsvcrt = NULL; + } } void @@ -35,10 +47,10 @@ unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; unsigned long i; - //if (!hMsvcrt) { - // hMsvcrt = LoadLibrary ("msvcrt.dll"); - // fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); - //} + if (!hMsvcrt) { + hMsvcrt = LoadLibrary ("msvcrt.dll"); + fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); + } if (nptrs == (unsigned long) -1) { Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -4,6 +4,7 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="mingw_common">include</include> + <library>kernel32</library> <file>_newmode.c</file> <file>_wgetopt.c</file> <file>argv.c</file> @@ -12,17 +13,17 @@ <file>charmax.c</file> <file>cinitexe.c</file> <file>CRT_fp10.c</file> - <file>crtdll.c</file> + <file>CRT_fp8.c</file> <file>dllentry.c</file> - <file>dllmain.c</file> <file>gccmain.c</file> <file>getopt.c</file> -  + <file>gs_support.c</file> <file>merr.c</file> <file>mingw_helpers.c</file> <file>natstart.c</file> <file>pesect.c</file> <file>pseudo-reloc.c</file> + <file>pseudo-reloc-list.c</file> <file>tlssup.c</file> <file>wildcard.c</file> <file>xncommod.c</file> @@ -33,16 +34,18 @@ <include base="mingw_common">include</include> <file>crt0_c.c</file> <file>crtexe.c</file> + <file>dllargv.c</file> </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true" unicode="yes" crt="dll"> <include base="mingw_common">include</include> <define name="WPRFLAG"/> <file>crt0_w.c</file> <file>crtexe.c</file> + <file>dllargv.c</file> </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll"> <include base="mingw_common">include</include> - <file>dllentry.c</file> - <file>dllmain.c</file> + <file>dllargv.c</file> + <file>crtdll.c</file> </module> </group> Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,2 @@ +char __RUNTIME_PSEUDO_RELOC_LIST_END__ = 0; +char __RUNTIME_PSEUDO_RELOC_LIST__ = 0; Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,50 +1,127 @@ -/* pseudo-reloc.c - - Written by Egor Duda <deo(a)logos-m.ru> - THIS SOFTWARE IS NOT COPYRIGHTED - - This source code is offered for use in the public domain. You may - use, modify or distribute it freely. - - This code is distributed in the hope that it will be useful but - WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - DISCLAMED. This includes but is not limited to warrenties of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - /* Only necesary on x86 and amd64 targets */ #if defined(__i386__) || defined(__x86_64__) - #include <windows.h> +#include <stdio.h> extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; extern char _image_base__; -typedef struct - { - DWORD addend; - DWORD target; - } -runtime_pseudo_reloc; +typedef struct { + DWORD addend; + DWORD target; +} runtime_pseudo_reloc_item_v1; + +typedef struct { + DWORD sym; + DWORD target; + DWORD flags; +} runtime_pseudo_reloc_item_v2; + +typedef struct { + DWORD magic1; + DWORD magic2; + DWORD version; +} runtime_pseudo_reloc_v2; + +#define RP_VERSION_V1 0 +#define RP_VERSION_V2 1 static void -do_pseudo_reloc (void* start, void* end, void* base) +do_pseudo_reloc (void* start,void *end,void *base) { - ptrdiff_t reloc_target; - runtime_pseudo_reloc* r; - for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) + ptrdiff_t addr_imp, reldata; + ptrdiff_t reloc_target = (ptrdiff_t) ((char *)end - (char*)start); + runtime_pseudo_reloc_v2 *v2_hdr = (runtime_pseudo_reloc_v2 *) start; + runtime_pseudo_reloc_item_v2 *r; + + if (reloc_target < 8) + return; + /* Check if this is old version pseudo relocation version. */ + if (reloc_target >= 12 + && v2_hdr->magic1 == 0 && v2_hdr->magic2 == 0 + && v2_hdr->version == RP_VERSION_V1) + v2_hdr++; + if (v2_hdr->magic1 != 0 || v2_hdr->magic2 != 0) + { + runtime_pseudo_reloc_item_v1 *o; + for (o = (runtime_pseudo_reloc_item_v1 *) v2_hdr; o < (runtime_pseudo_reloc_item_v1 *)end; o++) + { + reloc_target = (ptrdiff_t) base + o->target; + *((DWORD*) reloc_target) += o->addend; + } + return; + } + /* Check if this is a known version. */ + if (v2_hdr->version != RP_VERSION_V2) + { + fprintf (stderr, "pseudo_relocation protocol version %d is unknown to this runtime.\n", + (int) v2_hdr->version); + return; + } + /* Walk over header. */ + r = (runtime_pseudo_reloc_item_v2 *) &v2_hdr[1]; + + for (; r < (runtime_pseudo_reloc_item_v2 *) end; r++) { reloc_target = (ptrdiff_t) base + r->target; - *((ptrdiff_t*) reloc_target) += r->addend; + addr_imp = (ptrdiff_t) base + r->sym; + addr_imp = *((ptrdiff_t *) addr_imp); + + switch ((r->flags&0xff)) + { + case 8: + reldata = (ptrdiff_t) (*((unsigned char *)reloc_target)); + if ((reldata&0x80) != 0) + reldata |= ~((ptrdiff_t) 0xff); + break; + case 16: + reldata = (ptrdiff_t) (*((unsigned short *)reloc_target)); + if ((reldata&0x8000) != 0) + reldata |= ~((ptrdiff_t) 0xffff); + break; + case 32: + reldata = (ptrdiff_t) (*((unsigned int *)reloc_target)); +#ifdef _WIN64 + if ((reldata&0x80000000) != 0) + reldata |= ~((ptrdiff_t) 0xffffffff); +#endif + break; +#ifdef _WIN64 + case 64: + reldata = (ptrdiff_t) (*((unsigned long long *)reloc_target)); + break; +#endif + default: + reldata=0; + fprintf(stderr, "Unknown pseudo relocation bit size %d\n",(int) (r->flags & 0xff)); + break; + } + reldata -= ((ptrdiff_t) base + r->sym); + reldata += addr_imp; + switch ((r->flags & 0xff)) + { + case 8: + *((unsigned char*)reloc_target)=(unsigned char) reldata; + break; + case 16: + *((unsigned short*)reloc_target)=(unsigned short) reldata; + break; + case 32: + *((unsigned int*)reloc_target)=(unsigned int) reldata; + break; +#ifdef _WIN64 + case 64: + *((unsigned long long*)reloc_target)=(unsigned long long) reldata; + break; +#endif + } } } void _pei386_runtime_relocator () { - do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, - &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &_image_base__); + do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,&__RUNTIME_PSEUDO_RELOC_LIST_END__,&_image_base__); } #endif

1 0

[fireball] 37390: Daniel Zimmerman - Fix random widl crashes when compiling on Vista x86. Patch from Wine bugzilla: http://bugs.winehq.org/show_bug.cgi?id=16084 . See issue #3877 for more details.
by fireball＠svn.reactos.org 16 Nov '08

16 Nov '08

Author: fireball Date: Sun Nov 16 10:24:23 2008 New Revision: 37390 URL: http://svn.reactos.org/svn/reactos?rev=37390&view=rev Log: Daniel Zimmerman - Fix random widl crashes when compiling on Vista x86. Patch from Wine bugzilla: http://bugs.winehq.org/show_bug.cgi?id=16084 . See issue #3877 for more details. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sun Nov 16 10:24:23 2008 @@ -3091,7 +3091,7 @@ size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; continue; } - else if (stmt->type != STMT_TYPE && stmt->u.type->type != RPC_FC_IP) + else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) continue; iface = stmt->u.type;

1 0

[dreimer] 37389: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. Fixed sSVN.ps1. Works now. Left TODO: reladdr2line
by dreimer＠svn.reactos.org 16 Nov '08

16 Nov '08

Author: dreimer Date: Sun Nov 16 08:46:40 2008 New Revision: 37389 URL: http://svn.reactos.org/svn/reactos?rev=37389&view=rev Log: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. Fixed sSVN.ps1. Works now. Left TODO: reladdr2line Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Nov 16 08:46:40 2008 @@ -8,8 +8,8 @@ # function UP { - "Local Revision: $OFFSVN" - "Online HEAD Revision: $ONSVN" + "Local $OFFSVN" + "Online HEAD $ONSVN" "" if ($OFFSVN -lt $ONSVN) { "Your tree is not up to date. Do you want to update it?" @@ -76,8 +76,8 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | findstr "Revision:" + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | findstr "Revision:" UP } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun Nov 16 08:46:40 2008 @@ -136,7 +136,7 @@ echo Right now: %OARCH% set /p OARCH_CH= if "%OARCH_CH%" == "" ( - set OARCH_CH=pentium + set OARCH_CH=%OARCH% ) cls @@ -152,7 +152,7 @@ echo Right now: %OPTIMIZE% set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" if "%OPTIMIZE_CH%" == "" ( - set OPTIMIZE_CH=1 + set OPTIMIZE_CH=%OPTIMIZE% ) cls @@ -164,7 +164,7 @@ echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" if "%KDBG_CH%" == "" ( - set KDBG_CH=1 + set KDBG_CH=%KDBG% ) cls @@ -177,7 +177,7 @@ echo Right now: %DBG% set /p DBG_CH="(0), (1)" if "%DBG_CH%" == "" ( - set DBG_CH=1 + set DBG_CH=%DBG% ) cls @@ -190,7 +190,7 @@ echo Right now: %GDB% set /p GDB_CH="(0), (1)" if "%GDB_CH%" == "" ( - set GDB_CH=0 + set GDB_CH=%GDB% ) cls @@ -205,7 +205,7 @@ echo Right now: %NSWPAT% set /p NSWPAT_CH="(0), (1)" if "%NSWPAT_CH%" == "" ( - set NSWPAT_CH=0 + set NSWPAT_CH=%NSWPAT% ) cls @@ -222,7 +222,7 @@ echo Right now: %WINKD% set /p WINKD_CH="(0), (1)" if "%WINKD_CH%" == "" ( - set WINKD_CH=0 + set WINKD_CH=%WINKD% ) cls

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