Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 37538: merge from trunk: fastfat that boots real windows
by arty＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: arty Date: Fri Nov 21 18:13:31 2008 New Revision: 37538 URL: http://svn.reactos.org/svn/reactos?rev=37538&view=rev Log: merge from trunk: fastfat that boots real windows Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c branches/arty-newcc/drivers/filesystems/fastfat/create.c branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c branches/arty-newcc/drivers/filesystems/fastfat/fastio.c branches/arty-newcc/drivers/filesystems/fastfat/fcb.c branches/arty-newcc/drivers/filesystems/fastfat/finfo.c branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c branches/arty-newcc/drivers/filesystems/fastfat/misc.c branches/arty-newcc/drivers/filesystems/fastfat/rw.c Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -82,12 +82,7 @@ ObDereferenceObject(tmpFileObject); } -#if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); -#endif } /* Uninitialize file cache if. */ if (FileObject->SectionObjectPointer->SharedCacheMap) Modified: branches/arty-newcc/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -198,7 +198,7 @@ DPRINT ("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFindU, DirContext->DirIndex); - DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); + DPRINT ("FindFile: Path %wZ\n",&Parent->PathNameU); PathNameBufferLength = LONGNAME_MAX_LENGTH * sizeof(WCHAR); PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength + sizeof(WCHAR), TAG_VFAT); Modified: branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -25,7 +25,6 @@ ULONG dirIndex; ASSERT(pFcb); - ASSERT(pFcb->parentFcb); if (pFcb->Flags & FCB_IS_FATX_ENTRY) { @@ -479,7 +478,7 @@ if (RequestedOptions & FILE_DIRECTORY_FILE) { FileOffset.QuadPart = 0; - CcMapData((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, + CcPinRead((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); /* clear the new directory cluster */ RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster); Modified: branches/arty-newcc/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -175,7 +175,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatAcquireForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static BOOLEAN NTAPI @@ -289,23 +289,41 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { + PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; + DPRINT("VfatAcquireForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + + /* Make sure it is not a volume lock */ + ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); + + /* Acquire the resource */ + ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); + + return STATUS_SUCCESS; } static NTSTATUS NTAPI VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { + PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; + DPRINT("VfatReleaseForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + + /* Make sure it is not a volume lock */ + ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); + + /* Release the resource */ + ExReleaseResourceLite(&(Fcb->MainResource)); + + return STATUS_SUCCESS; } BOOLEAN NTAPI @@ -378,7 +396,6 @@ FastIoDispatch->ReleaseFileForNtCreateSection = VfatReleaseFileForNtCreateSection; FastIoDispatch->FastIoDetachDevice = VfatFastIoDetachDevice; FastIoDispatch->FastIoQueryNetworkOpenInfo = VfatFastIoQueryNetworkOpenInfo; - FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; FastIoDispatch->MdlRead = VfatMdlRead; FastIoDispatch->MdlReadComplete = VfatMdlReadComplete; FastIoDispatch->PrepareMdlWrite = VfatPrepareMdlWrite; @@ -388,6 +405,7 @@ FastIoDispatch->MdlReadCompleteCompressed = VfatMdlReadCompleteCompressed; FastIoDispatch->MdlWriteCompleteCompressed = VfatMdlWriteCompleteCompressed; FastIoDispatch->FastIoQueryOpen = VfatFastIoQueryOpen; + FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; FastIoDispatch->ReleaseForModWrite = VfatReleaseForModWrite; FastIoDispatch->AcquireForCcFlush = VfatAcquireForCcFlush; FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; Modified: branches/arty-newcc/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -332,7 +332,7 @@ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, fcb); Modified: branches/arty-newcc/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -91,7 +91,7 @@ StandardInfo->EndOfFile = FCB->RFCB.FileSize; StandardInfo->Directory = FALSE; } - StandardInfo->NumberOfLinks = 0; + StandardInfo->NumberOfLinks = 1; StandardInfo->DeletePending = FCB->Flags & FCB_DELETE_PENDING ? TRUE : FALSE; *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); @@ -271,7 +271,7 @@ PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; #endif - DPRINT ("FsdSetDispositionInformation()\n"); + DPRINT ("FsdSetDispositionInformation(<%wZ>, Delete %d)\n", &FCB->PathNameU, DispositionInfo->DeleteFile); ASSERT(DeviceExt != NULL); ASSERT(DeviceExt->FatInfo.BytesPerCluster != 0); @@ -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; @@ -551,7 +569,8 @@ ULONG NCluster; BOOLEAN AllocSizeChanged = FALSE; - DPRINT("VfatSetAllocationSizeInformation()\n"); + DPRINT("VfatSetAllocationSizeInformation(File <%wZ>, AllocationSize %d %d)\n", &Fcb->PathNameU, + AllocationSize->HighPart, AllocationSize->LowPart); if (Fcb->Flags & FCB_IS_FATX_ENTRY) OldSize = Fcb->entry.FatX.FileSize; @@ -748,7 +767,7 @@ FILE_INFORMATION_CLASS FileInformationClass; PVFATFCB FCB = NULL; - NTSTATUS RC = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; ULONG BufferLength; @@ -779,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, @@ -824,7 +843,7 @@ break; case FileEaInformation: - RC = VfatGetEaInformation(IrpContext->FileObject, + Status = VfatGetEaInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, @@ -832,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 @@ -851,7 +870,7 @@ IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); VfatFreeIrpContext(IrpContext); - return RC; + return Status; } NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext) Modified: branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -372,6 +372,7 @@ PVFATFCB VolumeFcb = NULL; PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; + PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; @@ -389,6 +390,7 @@ } DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; + Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); if (!NT_SUCCESS(Status)) @@ -422,7 +424,7 @@ Status = IoCreateDevice(VfatGlobalData->DriverObject, ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, - FILE_DEVICE_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &DeviceObject); @@ -438,7 +440,9 @@ DeviceExt->HashTableSize = HashTableSize; /* use same vpb as device disk */ - DeviceObject->Vpb = DeviceToMount->Vpb; + DeviceObject->Vpb = Vpb; + DeviceToMount->Vpb = Vpb; + Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) { @@ -538,7 +542,7 @@ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, Fcb); Modified: branches/arty-newcc/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/misc.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -156,11 +156,6 @@ } else { - if (KeGetCurrentIrql() > PASSIVE_LEVEL) - { - DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql()); - } - FsRtlEnterFileSystem(); Status = VfatDispatchRequest (IrpContext); FsRtlExitFileSystem(); Modified: branches/arty-newcc/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -678,7 +678,7 @@ (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, &IrpContext->Irp->IoStatus)) { - Status = IrpContext->Irp->IoStatus.Status;//STATUS_PENDING; + Status = STATUS_PENDING; goto ByeBye; } if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status))

1 0

[sginsberg] 37537: - Silence more "has virtual functions but non-virtual destructor"
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Fri Nov 21 17:14:30 2008 New Revision: 37537 URL: http://svn.reactos.org/svn/reactos?rev=37537&view=rev Log: - Silence more "has virtual functions but non-virtual destructor" Modified: trunk/rostests/tests/primitives/primitives.rbuild trunk/rostests/tests/txtscale/txtscale.rbuild trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild Modified: trunk/rostests/tests/primitives/primitives.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/primitives/primitiv… ============================================================================== --- trunk/rostests/tests/primitives/primitives.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/primitives/primitives.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -3,6 +3,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>primitives.cpp</file> <file>mk_font.cpp</file> </module> Modified: trunk/rostests/tests/txtscale/txtscale.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/txtscale/txtscale.r… ============================================================================== --- trunk/rostests/tests/txtscale/txtscale.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/txtscale/txtscale.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -4,6 +4,7 @@ <library>user32</library> <library>gdi32</library> <library>comctl32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>txtscale.cpp</file> <file>mk_font.cpp</file> </module> Modified: trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wm_erasebkgnd/wm_er… ============================================================================== --- trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>wm_erasebkgnd.cpp</file> </module>

1 0

[tkreuzer] 37536: Add KTRAP_FRAME offsets to asm.h
by tkreuzer＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: tkreuzer Date: Fri Nov 21 17:12:02 2008 New Revision: 37536 URL: http://svn.reactos.org/svn/reactos?rev=37536&view=rev Log: Add KTRAP_FRAME offsets to asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Fri Nov 21 17:12:02 2008 @@ -132,6 +132,62 @@ #define CONTEXT_LastExceptionFromRip 0x4c8 // +// KTRAP_FRAME Offsets +// +#define KTRAP_FRAME_P1Home 0x00 +#define KTRAP_FRAME_P2Home 0x08 +#define KTRAP_FRAME_P3Home 0x10 +#define KTRAP_FRAME_P4Home 0x18 +#define KTRAP_FRAME_P5 0x20 +#define KTRAP_FRAME_PreviousMode 0x28 +#define KTRAP_FRAME_PreviousIrql 0x29 +#define KTRAP_FRAME_FaultIndicator 0x2A +#define KTRAP_FRAME_ExceptionActive 0x2B +#define KTRAP_FRAME_MxCsr 0x2C +#define KTRAP_FRAME_Rax 0x30 +#define KTRAP_FRAME_Rcx 0x38 +#define KTRAP_FRAME_Rdx 0x40 +#define KTRAP_FRAME_R8 0x48 +#define KTRAP_FRAME_R9 0x50 +#define KTRAP_FRAME_R10 0x58 +#define KTRAP_FRAME_R11 0x60 +#define KTRAP_FRAME_Spare0 0x68 +#define KTRAP_FRAME_Xmm0 0x70 +#define KTRAP_FRAME_Xmm1 0x80 +#define KTRAP_FRAME_Xmm2 0x90 +#define KTRAP_FRAME_Xmm3 0xA0 +#define KTRAP_FRAME_Xmm4 0xB0 +#define KTRAP_FRAME_Xmm5 0xC0 +#define KTRAP_FRAME_FaultAddress 0xD0 +#define KTRAP_FRAME_Dr0 0xD8 +#define KTRAP_FRAME_Dr1 0xE0 +#define KTRAP_FRAME_Dr2 0xE8 +#define KTRAP_FRAME_Dr3 0xF0 +#define KTRAP_FRAME_Dr6 0xF8 +#define KTRAP_FRAME_Dr7 0x100 +#define KTRAP_FRAME_DebugControl 0x108 +#define KTRAP_FRAME_LastBranchToRip 0x110 +#define KTRAP_FRAME_LastBranchFromRip 0x118 +#define KTRAP_FRAME_LastExceptionToRip 0x120 +#define KTRAP_FRAME_LastExceptionFromRip 0x128 +#define KTRAP_FRAME_SegDs 0x130 +#define KTRAP_FRAME_SegEs 0x132 +#define KTRAP_FRAME_SegFs 0x134 +#define KTRAP_FRAME_SegGs 0x136 +#define KTRAP_FRAME_TrapFrame 0x138 +#define KTRAP_FRAME_Rbx 0x140 +#define KTRAP_FRAME_Rdi 0x148 +#define KTRAP_FRAME_Rsi 0x150 +#define KTRAP_FRAME_Rbp 0x158 +#define KTRAP_FRAME_ErrorCode 0x160 +#define KTRAP_FRAME_Rip 0x168 +#define KTRAP_FRAME_SegCs 0x170 +#define KTRAP_FRAME_EFlags 0x178 +#define KTRAP_FRAME_Rsp 0x180 +#define KTRAP_FRAME_SegSs 0x188 +#define SIZE_KTRAP_FRAME 0x190 + +// // CR0 // #define CR0_PE 0x1

1 0

[sginsberg] 37535: - ...revert until all Winetests/rostests are fixed. Using a broken RosBe beta which doesn't build /rostests/ or /rosapps/ when doing header changes is a bad, bad idea.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:48:38 2008 New Revision: 37535 URL: http://svn.reactos.org/svn/reactos?rev=37535&view=rev Log: - ...revert until all Winetests/rostests are fixed. Using a broken RosBe beta which doesn't build /rostests/ or /rosapps/ when doing header changes is a bad, bad idea. Modified: trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/windows.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Fri Nov 21 16:48:38 2008 @@ -1,5 +1,9 @@ #ifndef _WINDEF_H #define _WINDEF_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Nov 21 16:48:38 2008 @@ -12,6 +12,10 @@ */ #ifndef _WINDOWS_H #define _WINDOWS_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif #ifdef __GNUC__ #include <msvctarget.h>

1 0

[sginsberg] 37534: - Winetests treats ntdef.h as a psdk header, so temporarily hack it...
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:38:23 2008 New Revision: 37534 URL: http://svn.reactos.org/svn/reactos?rev=37534&view=rev Log: - Winetests treats ntdef.h as a psdk header, so temporarily hack it... Modified: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Fri Nov 21 16:38:23 2008 @@ -1,5 +1,9 @@ #ifndef _NTDEF_H #define _NTDEF_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif #include <stdarg.h> #include <windef.h>

1 0

[sginsberg] 37533: - Fix rostests build, part 1 of ?
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:23:46 2008 New Revision: 37533 URL: http://svn.reactos.org/svn/reactos?rev=37533&view=rev Log: - Fix rostests build, part 1 of ? Modified: trunk/rostests/tests/enumfonts/enumfonts.rbuild Modified: trunk/rostests/tests/enumfonts/enumfonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/enumfonts/enumfonts… ============================================================================== --- trunk/rostests/tests/enumfonts/enumfonts.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/enumfonts/enumfonts.rbuild [iso-8859-1] Fri Nov 21 16:23:46 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>enumfonts.cpp</file> </module>

1 0

[sginsberg] 37532: - More hack, less build breakage
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:03:45 2008 New Revision: 37532 URL: http://svn.reactos.org/svn/reactos?rev=37532&view=rev Log: - More hack, less build breakage Modified: trunk/reactos/include/psdk/powrprof.h Modified: trunk/reactos/include/psdk/powrprof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/powrprof.h?re… ============================================================================== --- trunk/reactos/include/psdk/powrprof.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/powrprof.h [iso-8859-1] Fri Nov 21 16:03:45 2008 @@ -1,10 +1,12 @@ #ifndef _POWRPROF_H #define _POWRPROF_H +#ifndef __WINE_WINTERNL_H /* FIXME: Include this, so NTSTATUS gets defined. Not very clean, but I can't get the hacH^H^H^override used by official PSDK to work. */ #include <ntsecapi.h> +#endif #ifdef __cplusplus extern "C" {

1 0

[sginsberg] 37531: - Remove system_header from the remaining PSDK headers. The era of liberally sprinkling the overkill system_header gcc hacH^H^H^extension has now come to an end and...oh, wait. What's that you say? DDK does this too? Uh, right. Will fix that too.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:46:58 2008 New Revision: 37531 URL: http://svn.reactos.org/svn/reactos?rev=37531&view=rev Log: - Remove system_header from the remaining PSDK headers. The era of liberally sprinkling the overkill system_header gcc hacH^H^H^extension has now come to an end and...oh, wait. What's that you say? DDK does this too? Uh, right. Will fix that too. Modified: trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/windowsx.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Fri Nov 21 15:46:58 2008 @@ -1,8 +1,5 @@ #ifndef _WINDEF_H #define _WINDEF_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Nov 21 15:46:58 2008 @@ -12,9 +12,6 @@ */ #ifndef _WINDOWS_H #define _WINDOWS_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __GNUC__ #include <msvctarget.h> Modified: trunk/reactos/include/psdk/windowsx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windowsx.h?re… ============================================================================== --- trunk/reactos/include/psdk/windowsx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windowsx.h [iso-8859-1] Fri Nov 21 15:46:58 2008 @@ -1,8 +1,5 @@ #ifndef _WINDOWSX_H #define _WINDOWSX_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #define WM_CTLCOLOR 25 #define Button_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))

1 0

[sginsberg] 37530: - Hack-include ntsecapi.h in powrprof.h, so NTSTATUS gets defined in an NDK-safe way. Not the best way, and most likely not compatible with the official header set, but I can't get the hack used by MS headers to work.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:31:01 2008 New Revision: 37530 URL: http://svn.reactos.org/svn/reactos?rev=37530&view=rev Log: - Hack-include ntsecapi.h in powrprof.h, so NTSTATUS gets defined in an NDK-safe way. Not the best way, and most likely not compatible with the official header set, but I can't get the hack used by MS headers to work. Modified: trunk/reactos/include/psdk/powrprof.h Modified: trunk/reactos/include/psdk/powrprof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/powrprof.h?re… ============================================================================== --- trunk/reactos/include/psdk/powrprof.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/powrprof.h [iso-8859-1] Fri Nov 21 15:31:01 2008 @@ -1,8 +1,10 @@ #ifndef _POWRPROF_H #define _POWRPROF_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif + +/* FIXME: Include this, so NTSTATUS gets defined. + Not very clean, but I can't get the hacH^H^H^override used + by official PSDK to work. */ +#include <ntsecapi.h> #ifdef __cplusplus extern "C" { @@ -16,9 +18,6 @@ #define NEWSCHEME (UINT)-1 #ifndef RC_INVOKED -#ifndef NTSTATUS -typedef LONG NTSTATUS, *PNTSTATUS; -#endif typedef struct _GLOBAL_MACHINE_POWER_POLICY{ ULONG Revision;

1 0

[sginsberg] 37529: - LANG_WELSH and LANG_BRETON are present in newer official winnt.h (and our winnt.h), so no need to put hacked-up versions of them in "Wine compatibility" winnt.h. - Don't define wchar_t in winnt.h (kudos to Colin Finck for this fix) - Remove system_header
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:27:30 2008 New Revision: 37529 URL: http://svn.reactos.org/svn/reactos?rev=37529&view=rev Log: - LANG_WELSH and LANG_BRETON are present in newer official winnt.h (and our winnt.h), so no need to put hacked-up versions of them in "Wine compatibility" winnt.h. - Don't define wchar_t in winnt.h (kudos to Colin Finck for this fix) - Remove system_header Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Nov 21 15:27:30 2008 @@ -1,8 +1,5 @@ #ifndef _WINNT_H #define _WINNT_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #ifdef __GNUC__ #include <msvctarget.h> @@ -40,10 +37,6 @@ #include <basetsd.h> #include <guiddef.h> - -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif #include <ctype.h> #undef __need_wchar_t Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] Fri Nov 21 15:27:30 2008 @@ -33,8 +33,6 @@ #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x91 -#define LANG_WELSH 0x92 -#define LANG_BRETON 0x93 /* FIXME: these are not in the Windows header */ #define LANG_GAELIC 0x94

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