Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[fireball] 35705: - Implement CmpQueryKeyName as a wrapper around CmpConstructName helper function (which is stubbed now).
by fireball＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: fireball Date: Wed Aug 27 10:55:32 2008 New Revision: 35705 URL: http://svn.reactos.org/svn/reactos?rev=35705&view=rev Log: - Implement CmpQueryKeyName as a wrapper around CmpConstructName helper function (which is stubbed now). Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -886,6 +886,14 @@ return Kcb; } +PUNICODE_STRING +NTAPI +CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + UNIMPLEMENTED; + return NULL; +} + VOID NTAPI EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -119,9 +119,74 @@ OUT PULONG ReturnLength, IN KPROCESSOR_MODE PreviousMode) { - DPRINT1("CmpQueryKeyName() called\n"); - ASSERT(FALSE); - return STATUS_SUCCESS; + PUNICODE_STRING KeyName; + NTSTATUS Status = STATUS_SUCCESS; + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)ObjectBody; + PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; + + /* Acquire hive lock */ + CmpLockRegistry(); + + /* Lock KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Check if it's a deleted block */ + if (Kcb->Delete) + { + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + + /* Let the caller know it's deleted */ + return STATUS_KEY_DELETED; + } + + /* Get the name */ + KeyName = CmpConstructName(Kcb); + + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + + /* Check if we got the name */ + if (!KeyName) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the returned length */ + *ReturnLength = KeyName->Length + sizeof(OBJECT_NAME_INFORMATION) + sizeof(WCHAR); + + /* Check if it fits into the provided buffer */ + if ((Length < sizeof(OBJECT_NAME_INFORMATION)) || + (Length < (*ReturnLength - sizeof(OBJECT_NAME_INFORMATION)))) + { + /* Free the buffer allocated by CmpConstructName */ + ExFreePool(KeyName->Buffer); + + /* Return buffer length failure */ + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Fill in the result */ + _SEH_TRY + { + /* Return data to user */ + ObjectNameInfo->Name.Buffer = (PWCHAR)(ObjectNameInfo + 1); + ObjectNameInfo->Name.MaximumLength = KeyName->Length; + ObjectNameInfo->Name.Length = KeyName->Length; + + /* Copy string content*/ + RtlCopyMemory(ObjectNameInfo->Name.Buffer, KeyName->Buffer, *ReturnLength); + } + _SEH_HANDLE + { + /* Get the status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Free the buffer allocated by CmpConstructName */ + ExFreePool(KeyName->Buffer); + + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -896,6 +896,12 @@ VOID NTAPI CmpCleanUpSubKeyInfo( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +PUNICODE_STRING +NTAPI +CmpConstructName( IN PCM_KEY_CONTROL_BLOCK Kcb );

1 0

[tkreuzer] 35704: - implement stub EnableA20 - define MachInit to PcMachInit - use i386 versions of machine dependend code for amd64 -> 13 files / 160 kb less
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 10:41:38 2008 New Revision: 35704 URL: http://svn.reactos.org/svn/reactos?rev=35704&view=rev Log: - implement stub EnableA20 - define MachInit to PcMachInit - use i386 versions of machine dependend code for amd64 -> 13 files / 160 kb less Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mach.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mach.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…

1 0

[tkreuzer] 35703: - Convert PortAddress from ULONG to PUCHAR - Fix some int <-> pointer casts - remove useless #if __i386__ - use %p for pointer sized prints
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 10:37:36 2008 New Revision: 35703 URL: http://svn.reactos.org/svn/reactos?rev=35703&view=rev Log: - Convert PortAddress from ULONG to PUCHAR - Fix some int <-> pointer casts - remove useless #if __i386__ - use %p for pointer sized prints Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -779,21 +779,21 @@ } static VOID -InitializeSerialPort(ULONG Port, +InitializeSerialPort(PUCHAR Port, ULONG LineControl) { - WRITE_PORT_UCHAR((PUCHAR)Port + 3, 0x80); /* set DLAB on */ - WRITE_PORT_UCHAR((PUCHAR)Port, 0x60); /* speed LO byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* speed HI byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 3, LineControl); - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* set comm and DLAB to 0 */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); /* DR int enable */ - READ_PORT_UCHAR((PUCHAR)Port + 5); /* clear error bits */ + WRITE_PORT_UCHAR(Port + 3, 0x80); /* set DLAB on */ + WRITE_PORT_UCHAR(Port, 0x60); /* speed LO byte */ + WRITE_PORT_UCHAR(Port + 1, 0); /* speed HI byte */ + WRITE_PORT_UCHAR(Port + 3, LineControl); + WRITE_PORT_UCHAR(Port + 1, 0); /* set comm and DLAB to 0 */ + WRITE_PORT_UCHAR(Port + 4, 0x09); /* DR int enable */ + READ_PORT_UCHAR(Port + 5); /* clear error bits */ } static ULONG -DetectSerialMouse(ULONG Port) +DetectSerialMouse(PUCHAR Port) { CHAR Buffer[4]; ULONG i; @@ -801,8 +801,8 @@ UCHAR LineControl; /* Shutdown mouse or something like that */ - LineControl = READ_PORT_UCHAR((PUCHAR)Port + 4); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, (LineControl & ~0x02) | 0x01); + LineControl = READ_PORT_UCHAR(Port + 4); + WRITE_PORT_UCHAR(Port + 4, (LineControl & ~0x02) | 0x01); StallExecutionProcessor(100000); /* @@ -812,18 +812,18 @@ * therefore we must give up after some time. */ TimeOut = 200; - while (READ_PORT_UCHAR((PUCHAR)Port + 5) & 0x01) + while (READ_PORT_UCHAR(Port + 5) & 0x01) { if (--TimeOut == 0) return MOUSE_TYPE_NONE; - READ_PORT_UCHAR((PUCHAR)Port); + READ_PORT_UCHAR(Port); } /* * Send modem control with 'Data Terminal Ready', 'Request To Send' and * 'Output Line 2' message. This enables mouse to identify. */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); @@ -832,14 +832,14 @@ TimeOut = 200; for (i = 0; i < 4; i++) { - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return MOUSE_TYPE_NONE; } - Buffer[i] = READ_PORT_UCHAR((PUCHAR)Port); + Buffer[i] = READ_PORT_UCHAR(Port); } DbgPrint((DPRINT_HWDETECT, @@ -891,26 +891,26 @@ static ULONG -GetSerialMousePnpId(ULONG Port, char *Buffer) +GetSerialMousePnpId(PUCHAR Port, char *Buffer) { ULONG TimeOut; ULONG i = 0; char c; char x; - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); + WRITE_PORT_UCHAR(Port + 4, 0x09); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); StallExecutionProcessor(10000); for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; @@ -920,7 +920,7 @@ } } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); if (c == 0x08 || c == 0x28) break; } @@ -931,14 +931,14 @@ for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return 0; } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); Buffer[i++] = c; if (c == x) break; @@ -952,7 +952,7 @@ static VOID DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, - ULONG Base) + PUCHAR Base) { CM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; @@ -1227,7 +1227,7 @@ if (!Rs232PortInUse(Base)) { /* Detect serial mouse */ - DetectSerialPointerPeripheral(ControllerKey, Base); + DetectSerialPointerPeripheral(ControllerKey, UlongToPtr(Base)); } ControllerNumber++; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -30,7 +30,7 @@ /* Find the 'Root System Descriptor Table Pointer' */ Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + while ((ULONG_PTR)Ptr < 0x100000) { if (!memcmp(Ptr, "RSD PTR ", 8)) { @@ -39,7 +39,7 @@ return (PRSDP_DESCRIPTOR)Ptr; } - Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + 0x10); } DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -71,7 +71,7 @@ ULONG i; Table = (PPCI_IRQ_ROUTING_TABLE)0xF0000; - while ((ULONG)Table < 0x100000) + while ((ULONG_PTR)Table < 0x100000) { if (Table->Signature == 0x52495024) { @@ -98,7 +98,7 @@ return Table; } - Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG)Table + 0x10); + Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); } return NULL; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -25,8 +25,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS ///////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __i386__ BOOLEAN DiskResetController(ULONG DriveNumber) { @@ -177,7 +175,7 @@ DbgPrint((DPRINT_DISK, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) { - PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); + PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); @@ -198,6 +196,4 @@ return TRUE; } -#endif /* defined __i386__ */ - /* EOF */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -83,8 +83,8 @@ Packet->PacketSize = sizeof(I386_DISK_ADDRESS_PACKET); Packet->Reserved = 0; Packet->LBABlockCount = SectorCount; - Packet->TransferBufferOffset = ((ULONG)Buffer) & 0x0F; - Packet->TransferBufferSegment = ((ULONG)Buffer) >> 4; + Packet->TransferBufferOffset = ((ULONG_PTR)Buffer) & 0x0F; + Packet->TransferBufferSegment = ((ULONG_PTR)Buffer) >> 4; Packet->LBAStartBlock = SectorNumber; // BIOS int 0x13, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ @@ -211,8 +211,8 @@ RegsIn.b.cl = (PhysicalSector + ((PhysicalTrack & 0x300) >> 2)); RegsIn.b.dh = PhysicalHead; RegsIn.b.dl = DriveNumber; - RegsIn.w.es = ((ULONG)Buffer) >> 4; - RegsIn.w.bx = ((ULONG)Buffer) & 0x0F; + RegsIn.w.es = ((ULONG_PTR)Buffer) >> 4; + RegsIn.w.bx = ((ULONG_PTR)Buffer) & 0x0F; // // Perform the read Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -194,8 +194,8 @@ /* Copy data to caller's buffer */ RtlCopyMemory(&BiosMemoryMap[MapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%x%x\n", BiosMemoryMap[MapCount].BaseAddress)); - DbgPrint((DPRINT_MEMORY, "Length: 0x%x%x\n", BiosMemoryMap[MapCount].Length)); + DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].BaseAddress)); + DbgPrint((DPRINT_MEMORY, "Length: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].Length)); DbgPrint((DPRINT_MEMORY, "Type: 0x%x\n", BiosMemoryMap[MapCount].Type)); DbgPrint((DPRINT_MEMORY, "Reserved: 0x%x\n", BiosMemoryMap[MapCount].Reserved)); DbgPrint((DPRINT_MEMORY, "\n")); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -361,7 +361,7 @@ static VOID PcVideoSet480ScanLines(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -418,7 +418,7 @@ static VOID PcVideoSetDisplayEnd(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -1054,7 +1054,7 @@ { USHORT *BufPtr; - BufPtr = (USHORT *) (VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); + BufPtr = (USHORT *) (ULONG_PTR)(VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); *BufPtr = ((USHORT) Attr << 8) | (Ch & 0xff); }

1 0

[arty] 35702: We don't need MmIsCOWAddress any longer.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 10:22:10 2008 New Revision: 35702 URL: http://svn.reactos.org/svn/reactos?rev=35702&view=rev Log: We don't need MmIsCOWAddress any longer. Modified: branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 27 10:22:10 2008 @@ -374,21 +374,6 @@ */ RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); return STATUS_SUCCESS; -} - -BOOLEAN -NTAPI -MmIsCOWAddress(IN PEPROCESS Process, IN PVOID Address) -{ - BOOLEAN IsCow = TRUE; /* Don't write unless we're sure */ - PMEMORY_AREA MemoryArea; - - MmLockAddressSpace(&Process->VadRoot); - MemoryArea = MmLocateMemoryAreaByAddress(&Process->VadRoot, Address); - ASSERT(MemoryArea); - IsCow = MemoryArea->Data.SectionData.WriteCopyView; - MmUnlockAddressSpace(&Process->VadRoot); - return IsCow; } /* Note: Mmsp prefix denotes "Memory Manager Section Private". */

1 0

[arty] 35701: Convert to using a fast mutex.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 10:21:39 2008 New Revision: 35701 URL: http://svn.reactos.org/svn/reactos?rev=35701&view=rev Log: Convert to using a fast mutex. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -21,10 +21,6 @@ NTAPI MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); -BOOLEAN -NTAPI -MmIsCOWAddress(PEPROCESS Process, PVOID Address); - NTSTATUS NTAPI CcpSimpleWrite @@ -43,8 +39,7 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (MmIsDirtyPage(PsInitialSystemProcess, Buffer) && - !MmIsCOWAddress(PsInitialSystemProcess, Buffer)) + if (MmIsDirtyPage(PsInitialSystemProcess, Buffer)) { DPRINT1 ("PAGING WRITE (FLUSH) Offset %x Length %d\n", @@ -100,7 +95,6 @@ } ObDereferenceObject(FileObject); - MmDeleteHyperspaceMapping(Buffer); DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); } Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -44,7 +44,7 @@ CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); - KeInitializeGuardedMutex(&CcMutex); + ExInitializeFastMutex(&CcMutex); Status = PsCreateSystemThread (&CcUnmapThreadHandle, THREAD_ALL_ACCESS, Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -22,7 +22,7 @@ NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; CHAR CcpBitmapBuffer[sizeof(RTL_BITMAP) + ROUND_UP((CACHE_NUM_SECTIONS), 32) / 8]; PRTL_BITMAP CcCacheBitmap = (PRTL_BITMAP)&CcpBitmapBuffer; -KGUARDED_MUTEX CcMutex; +FAST_MUTEX CcMutex; KEVENT CcDeleteEvent; ULONG CcCacheClockHand; LONG CcOutstandingDeletes; @@ -55,7 +55,7 @@ VOID CcpLock() { - KeAcquireGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); //DPRINT("<<<---<<< CC In Mutex!\n"); } @@ -75,14 +75,14 @@ PCHAR BufStart, BufPage; LARGE_INTEGER ToWrite; - KeAcquireGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); while (CcOutstandingDeletes > 0) { NumElements = InterlockedDecrement(&CcOutstandingDeletes); DPRINT1("Unmapping %d ...\n", NumElements); WorkingOn = CcUnmapChain[0]; RtlMoveMemory(&CcUnmapChain[0], &CcUnmapChain[1], NumElements * sizeof(NOCC_UNMAP_CHAIN)); - KeReleaseGuardedMutex(&CcMutex); + ExReleaseFastMutex(&CcMutex); BufStart = (PCHAR)WorkingOn.Buffer; ToWrite = WorkingOn.FileOffset; @@ -98,15 +98,15 @@ MmUnmapViewInSystemSpace(WorkingOn.Buffer); ObDereferenceObject(WorkingOn.SectionObject); DPRINT1("Done unmapping\n"); - KeAcquireGuardedMutex(&CcMutex); - } - KeReleaseGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); + } + ExReleaseFastMutex(&CcMutex); } VOID CcpUnlock() { //DPRINT(">>>--->>> CC Exit Mutex!\n"); - KeReleaseGuardedMutex(&CcMutex); + ExReleaseFastMutex(&CcMutex); } VOID STDCALL Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -202,7 +202,7 @@ extern NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; extern PRTL_BITMAP CcCacheBitmap; -extern KGUARDED_MUTEX CcMutex; +extern FAST_MUTEX CcMutex; extern KEVENT CcDeleteEvent; extern ULONG CcCacheClockHand; extern LIST_ENTRY CcPendingUnmap;

1 0

[janderwald] 35700: - Add constants
by janderwald＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: janderwald Date: Wed Aug 27 10:19:40 2008 New Revision: 35700 URL: http://svn.reactos.org/svn/reactos?rev=35700&view=rev Log: - Add constants Modified: trunk/reactos/include/psdk/ipifcons.h Modified: trunk/reactos/include/psdk/ipifcons.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ipifcons.h?re… ============================================================================== --- trunk/reactos/include/psdk/ipifcons.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ipifcons.h [iso-8859-1] Wed Aug 27 10:19:40 2008 @@ -30,4 +30,9 @@ #define MIB_IF_TYPE_PPP 23 #define MIB_IF_TYPE_LOOPBACK 24 #define MIB_IF_TYPE_SLIP 28 + +#define IF_TYPE_OTHER 1 +#define IF_TYPE_ETHERNET_CSMACD 6 +#define IF_TYPE_IEEE80211 71 + #endif /* _IPIFCONS_H */

1 0

[jmorlan] 35699: Fix StretchBlt ugliness in qemu. Patch by grschneider.
by jmorlan＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: jmorlan Date: Wed Aug 27 09:47:49 2008 New Revision: 35699 URL: http://svn.reactos.org/svn/reactos?rev=35699&view=rev Log: Fix StretchBlt ugliness in qemu. Patch by grschneider. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Wed Aug 27 09:47:49 2008 @@ -466,18 +466,6 @@ /* 16-bit HiColor (565 format) */ __inline PIXEL average16(PIXEL a, PIXEL b) { -// This one doesn't work -/* - if (a == b) - { - return a; - } - else - { - unsigned short mask = ~ (((a | b) & 0x0410) << 1); - return ((a & mask) + (b & mask)) >> 1; - }*/ /* if */ - // This one should be correct, but it's too long /* unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br; @@ -499,8 +487,11 @@ return res; */ - // This one is the short form of the correct one ;-) - return (((a ^ b) & 0xf7deU) >> 1) + (a & b); + // This one is the short form of the correct one, but does not work for QEMU (expects 555 format) + //return (((a ^ b) & 0xf7deU) >> 1) + (a & b); + + //hack until short version works properly + return a; } //NOTE: If you change something here, please do the same in other dibXXbpp.c files!

1 0

[arty] 35698: Replace my rtl/bitmap.c change. Completely replace my section.c adaptations. Some WIP in cache. Much better, not perfect yet.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 09:25:09 2008 New Revision: 35698 URL: http://svn.reactos.org/svn/reactos?rev=35698&view=rev Log: Replace my rtl/bitmap.c change. Completely replace my section.c adaptations. Some WIP in cache. Much better, not perfect yet. Modified: branches/arty-newcc/lib/rtl/bitmap.c branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/bitmap.c?rev… ============================================================================== --- branches/arty-newcc/lib/rtl/bitmap.c [iso-8859-1] (original) +++ branches/arty-newcc/lib/rtl/bitmap.c [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -867,14 +867,14 @@ RtlTestBit(PRTL_BITMAP BitMapHeader, ULONG BitNumber) { - PULONG Ptr; + PUCHAR Ptr; if (BitNumber >= BitMapHeader->SizeOfBitMap) return FALSE; - Ptr = (PULONG)BitMapHeader->Buffer + (BitNumber / 32); - - return (BOOLEAN)(*Ptr & (1 << (BitNumber % 32))); + Ptr = (PUCHAR)BitMapHeader->Buffer + (BitNumber / 8); + + return (BOOLEAN)(*Ptr & (1 << (BitNumber % 8))); } /* Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -185,6 +185,16 @@ LARGE_INTEGER ToWrite = *FileOffset; IO_STATUS_BLOCK IOSB; + if (!SectionObjectPointer->SharedCacheMap) + { + if (IoStatus) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = 0; + } + return; + } + BOOLEAN Result = CcpMapData ((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap, FileOffset, @@ -227,6 +237,48 @@ IoStatus->Status = IOSB.Status; IoStatus->Information = 0; } +} + +BOOLEAN +NTAPI +CcFlushImageSection +(PSECTION_OBJECT_POINTERS SectionObjectPointer, + MMFLUSH_TYPE FlushType) +{ + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap; + PNOCC_BCB Bcb; + PLIST_ENTRY Entry; + IO_STATUS_BLOCK IOSB; + BOOLEAN Result = TRUE; + + for (Entry = Map->AssociatedBcb.Flink; + Entry != &Map->AssociatedBcb; + Entry = Entry->Flink) + { + Bcb = CONTAINING_RECORD(Entry, NOCC_BCB, ThisFileList); + + if (!Bcb->Dirty) continue; + + switch (FlushType) + { + case MmFlushForDelete: + CcPurgeCacheSection + (Bcb->FileObject->SectionObjectPointer, + &Bcb->FileOffset, + Bcb->Length, + FALSE); + break; + case MmFlushForWrite: + CcFlushCache + (Bcb->FileObject->SectionObjectPointer, + &Bcb->FileOffset, + Bcb->Length, + &IOSB); + break; + } + } + + return Result; } // Always succeeds for us Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -108,8 +108,9 @@ FileObject->SectionObjectPointer->SharedCacheMap = Map; Map->FileObject = FileObject; Map->NumberOfMaps = 0; + Map->FileSizes = *FileSizes; + DPRINT("FileSizes->ValidDataLength %x\n", FileSizes->ValidDataLength.LowPart); InitializeListHead(&Map->AssociatedBcb); - return; } BOOLEAN @@ -174,7 +175,21 @@ CcSetFileSizes(IN PFILE_OBJECT FileObject, IN PCC_FILE_SIZES FileSizes) { - /* Nothing to do */ + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + if (!Map) return; + Map->FileSizes = *FileSizes; + DPRINT("FileSizes->ValidDataLength %x\n", FileSizes->ValidDataLength.LowPart); +} + +BOOLEAN +NTAPI +CcGetFileSizes(IN PFILE_OBJECT FileObject, + IN PCC_FILE_SIZES FileSizes) +{ + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + if (!Map) return FALSE; + *FileSizes = Map->FileSizes; + return TRUE; } BOOLEAN Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -454,9 +454,13 @@ if (!SectionObject) { + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + ULONG SectionSize = min(CACHE_STRIPE, Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart); + DPRINT("Allocating a cache stripe at %x:%d\n", + Target.LowPart, SectionSize); Status = CcpAllocateSection (FileObject, - CACHE_STRIPE, + SectionSize, PAGE_READWRITE, &SectionObject); @@ -587,7 +591,17 @@ FALSE, FALSE, NULL); - MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); + _SEH_TRY + { + MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); + } + _SEH_HANDLE + { + IoFreeMdl(TheBcb->Pinned); + TheBcb->Pinned = NULL; + Result = FALSE; + } + _SEH_END; } return TRUE; @@ -607,6 +621,58 @@ if (Result) { PNOCC_BCB TheBcb = (PNOCC_BCB)*Bcb; + if (!TheBcb->Pinned) + { + TheBcb->Pinned = IoAllocateMdl + (TheBcb->BaseAddress, + TheBcb->Length, + FALSE, + FALSE, + NULL); + _SEH_TRY + { + MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); + } + _SEH_HANDLE + { + IoFreeMdl(TheBcb->Pinned); + TheBcb->Pinned = NULL; + Result = FALSE; + } + _SEH_END; + } + } + + return Result; +} + +BOOLEAN +NTAPI +CcPreparePinWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Zero, + IN ULONG Flags, + OUT PVOID *Bcb, + OUT PVOID *Buffer) +{ + BOOLEAN GotIt = CcPinMappedData + (FileObject, + FileOffset, + Length, + Flags, + Bcb); + + PNOCC_BCB TheBcb = (PNOCC_BCB)*Bcb; + ULONG Start = TheBcb - CcCacheSections; + + DPRINT("CcPreparePinWrite(#%x)\n", Start); + + if (GotIt) + { + CcCacheSections[Start].Dirty = TRUE; + *Buffer = (PVOID)((PCHAR)TheBcb->BaseAddress + (FileOffset->QuadPart - TheBcb->FileOffset.QuadPart)); + DPRINT("Returning Buffer: %x\n", *Buffer); if (!TheBcb->Pinned) { TheBcb->Pinned = IoAllocateMdl @@ -619,48 +685,6 @@ } } - return Result; -} - -BOOLEAN -NTAPI -CcPreparePinWrite(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Zero, - IN ULONG Flags, - OUT PVOID *Bcb, - OUT PVOID *Buffer) -{ - BOOLEAN GotIt = CcPinMappedData - (FileObject, - FileOffset, - Length, - Flags, - Bcb); - - PNOCC_BCB TheBcb = (PNOCC_BCB)*Bcb; - ULONG Start = TheBcb - CcCacheSections; - - DPRINT("CcPreparePinWrite(#%x)\n", Start); - - if (GotIt) - { - CcCacheSections[Start].Dirty = TRUE; - *Buffer = (PVOID)((PCHAR)TheBcb->BaseAddress + (FileOffset->QuadPart - TheBcb->FileOffset.QuadPart)); - DPRINT("Returning Buffer: %x\n", *Buffer); - if (!TheBcb->Pinned) - { - TheBcb->Pinned = IoAllocateMdl - (TheBcb->BaseAddress, - TheBcb->Length, - FALSE, - FALSE, - NULL); - MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); - } - } - DPRINT("Done\n"); return GotIt; } Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -102,27 +102,6 @@ LONG ActivePrefetches; } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS; -#if 0 -typedef struct _BCB -{ - LIST_ENTRY BcbSegmentListHead; - LIST_ENTRY BcbRemoveListEntry; - BOOLEAN RemoveOnClose; - ULONG TimeStamp; - PFILE_OBJECT FileObject; - ULONG CacheSegmentSize; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER FileSize; - PCACHE_MANAGER_CALLBACKS Callbacks; - PVOID LazyWriteContext; - KSPIN_LOCK BcbLock; - ULONG RefCount; -#if defined(DBG) || defined(KDBG) - BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ -#endif -} BCB, *PBCB; -#endif - typedef struct _NOCC_BCB { /* Public part */ @@ -150,9 +129,10 @@ typedef struct _NOCC_CACHE_MAP { - LIST_ENTRY AssociatedBcb; - PFILE_OBJECT FileObject; - ULONG NumberOfMaps; + LIST_ENTRY AssociatedBcb; + PFILE_OBJECT FileObject; + ULONG NumberOfMaps; + CC_FILE_SIZES FileSizes; } NOCC_CACHE_MAP, *PNOCC_CACHE_MAP; VOID @@ -188,28 +168,14 @@ NTAPI CcInitCacheZeroPage(VOID); -NTSTATUS -NTAPI -CcRosFlushDirtyPages( - ULONG Target, - PULONG Count -); - -VOID -NTAPI -CcRosDereferenceCache(PFILE_OBJECT FileObject); - -VOID -NTAPI -CcRosReferenceCache(PFILE_OBJECT FileObject); - -VOID -NTAPI -CcRosSetRemoveOnClose(PSECTION_OBJECT_POINTERS SectionObjectPointer); - -NTSTATUS -NTAPI -CcTryToInitializeFileCache(PFILE_OBJECT FileObject); +/* Called by section.c */ +BOOLEAN +NTAPI +CcFlushImageSection(PSECTION_OBJECT_POINTERS SectionObjectPointer, MMFLUSH_TYPE FlushType); + +BOOLEAN +NTAPI +CcGetFileSizes(PFILE_OBJECT FileObject, PCC_FILE_SIZES FileSizes); /* * Macro for generic cache manage bugchecking. Note that this macro assumes Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 27 09:25:09 2008 @@ -45,7 +45,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <internal/debug.h> #include <reactos/exeformat.h> @@ -155,66 +155,79 @@ ULONG Length, PIO_STATUS_BLOCK ReadStatus) { - NTSTATUS Status; - PIRP Irp = NULL; - KEVENT ReadWait; - PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); - PIO_STACK_LOCATION IrpSp; - - DPRINT1 - ("PAGING READ File %wZ Offset %x Length %d\n", - &FileObject->FileName, - FileOffset->u.LowPart, - Length); - - KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); - - Irp = IoBuildAsynchronousFsdRequest - (IRP_MJ_READ, - DeviceObject, - Buffer, - PAGE_SIZE, - FileOffset, - ReadStatus); - - if (!Irp) + NTSTATUS Status; + PIRP Irp = NULL; + KEVENT ReadWait; + PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); + PCHAR BufferWalk; + PHYSICAL_ADDRESS Page; + PIO_STACK_LOCATION IrpSp; + + DPRINT1 + ("PAGING READ File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); + + Irp = IoBuildAsynchronousFsdRequest + (IRP_MJ_READ, + DeviceObject, + Buffer, + Length, + FileOffset, + ReadStatus); + + if (!Irp) + { + return STATUS_NO_MEMORY; + } + + Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; + + ObReferenceObject(FileObject); + + Irp->UserEvent = &ReadWait; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + IrpSp = IoGetNextIrpStackLocation(Irp); + IrpSp->FileObject = FileObject; + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (!NT_SUCCESS + (KeWaitForSingleObject + (&ReadWait, + Suspended, + KernelMode, + FALSE, + NULL))) { - return STATUS_NO_MEMORY; + DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ASSERT(FALSE); + ObDereferenceObject(FileObject); + return Status; } - - Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; - - ObReferenceObject(FileObject); - - Irp->UserEvent = &ReadWait; - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->FileObject = FileObject; - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (!NT_SUCCESS - (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, - NULL))) - { - DPRINT1("Warning: Failed to wait for synchronous IRP\n"); - ASSERT(FALSE); - ObDereferenceObject(FileObject); - return Status; - } - } - - ObDereferenceObject(FileObject); - - DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - - return ReadStatus->Status; + } + + ObDereferenceObject(FileObject); + + DPRINT("Paging IO Done: %08x [%02x %02x %02x %02x ...]\n", ReadStatus->Status, + ((PCHAR)Buffer)[0] & 0xff, + ((PCHAR)Buffer)[1] & 0xff, + ((PCHAR)Buffer)[2] & 0xff, + ((PCHAR)Buffer)[3] & 0xff); + + for (BufferWalk = (PCHAR)Buffer; BufferWalk < (PCHAR)Buffer + Length; BufferWalk += PAGE_SIZE) + { + Page = MmGetPhysicalAddress((PVOID)BufferWalk); + DPRINT("Setting page clean: %x\n", Page.u.LowPart); + //MmSetCleanAllRmaps((PFN_TYPE)(Page.QuadPart >> PAGE_SHIFT)); + } + + return ReadStatus->Status; } NTSTATUS @@ -226,75 +239,82 @@ ULONG Length, PIO_STATUS_BLOCK ReadStatus) { - NTSTATUS Status; - PIRP Irp = NULL; - KEVENT ReadWait; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION IrpSp; - - ASSERT(FileObject); - ASSERT(FileOffset); - ASSERT(Buffer); - ASSERT(ReadStatus); - - DeviceObject = MmGetDeviceObjectForFile(FileObject); - - ASSERT(DeviceObject); - - DPRINT1 - ("PAGING WRITE: FileObject %x Offset %x Length %d\n", - &FileObject, - FileOffset->LowPart, - Length); - - KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); - - Irp = IoBuildAsynchronousFsdRequest - (IRP_MJ_WRITE, - DeviceObject, - Buffer, - Length, - FileOffset, - ReadStatus); - - if (!Irp) + NTSTATUS Status; + PIRP Irp = NULL; + KEVENT ReadWait; + PDEVICE_OBJECT DeviceObject; + PCHAR BufferWalk; + PHYSICAL_ADDRESS Page; + PIO_STACK_LOCATION IrpSp; + + ASSERT(FileObject); + ASSERT(FileOffset); + ASSERT(Buffer); + ASSERT(ReadStatus); + + DeviceObject = MmGetDeviceObjectForFile(FileObject); + + ASSERT(DeviceObject); + + DPRINT1 + ("PAGING WRITE: FileObject %x Offset %x Length %d\n", + &FileObject, + FileOffset->LowPart, + Length); + + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); + + Irp = IoBuildAsynchronousFsdRequest + (IRP_MJ_WRITE, + DeviceObject, + Buffer, + Length, + FileOffset, + ReadStatus); + + if (!Irp) + { + return STATUS_NO_MEMORY; + } + + Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; + + ObReferenceObject(FileObject); + + Irp->UserEvent = &ReadWait; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + IrpSp = IoGetNextIrpStackLocation(Irp); + IrpSp->FileObject = FileObject; + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (!NT_SUCCESS + (KeWaitForSingleObject + (&ReadWait, + Suspended, + KernelMode, + FALSE, + NULL))) { - return STATUS_NO_MEMORY; + DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ASSERT(FALSE); + ObDereferenceObject(FileObject); + return Status; } - - Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; - - ObReferenceObject(FileObject); - - Irp->UserEvent = &ReadWait; - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->FileObject = FileObject; - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (!NT_SUCCESS - (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, - NULL))) - { - DPRINT1("Warning: Failed to wait for synchronous IRP\n"); - ASSERT(FALSE); - ObDereferenceObject(FileObject); - return Status; - } - } - - ObDereferenceObject(FileObject); - - DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - - return ReadStatus->Status; + } + + ObDereferenceObject(FileObject); + + DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); + for (BufferWalk = (PCHAR)Buffer; BufferWalk < (PCHAR)Buffer + Length; BufferWalk += PAGE_SIZE) + { + Page = MmGetPhysicalAddress((PVOID)BufferWalk); + //MmSetCleanAllRmaps((PFN_TYPE)(Page.QuadPart >> PAGE_SHIFT)); + } + + return ReadStatus->Status; } NTSTATUS @@ -457,7 +477,7 @@ { DPRINT1("Image segment %d still referenced (was %d)\n", i, SectionSegments[i].ReferenceCount); - KEBUGCHECK(0); + ASSERT(FALSE); } MmFreePageTablesSectionSegment(&SectionSegments[i]); } @@ -475,7 +495,7 @@ if (Segment->ReferenceCount != 0) { DPRINT1("Data segment still referenced\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmFreePageTablesSectionSegment(Segment); ExFreePool(Segment); @@ -523,7 +543,7 @@ TAG_SECTION_PAGE_TABLE); if (Table == NULL) { - KEBUGCHECK(0); + ASSERT(FALSE); } memset(Table, 0, sizeof(SECTION_PAGE_TABLE)); DPRINT("Table %x\n", Table); @@ -576,16 +596,16 @@ if (Entry == 0) { DPRINT1("Entry == 0 for MmSharePageEntrySectionSegment\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } if (SHARE_COUNT_FROM_SSE(Entry) == MAX_SHARE_COUNT) { DPRINT1("Maximum share count reached\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } if (IS_SWAP_FROM_SSE(Entry)) { - KEBUGCHECK(0); + ASSERT(FALSE); } Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); MmSetPageEntrySectionSegment(Segment, Offset, Entry); @@ -600,21 +620,22 @@ BOOLEAN PageOut) { ULONG Entry; + BOOLEAN IsDirectMapped = FALSE; Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) { DPRINT1("Entry == 0 for MmUnsharePageEntrySectionSegment\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } if (SHARE_COUNT_FROM_SSE(Entry) == 0) { DPRINT1("Zero share count for unshare\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } if (IS_SWAP_FROM_SSE(Entry)) { - KEBUGCHECK(0); + ASSERT(FALSE); } Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) - 1); /* @@ -629,12 +650,33 @@ BOOLEAN IsImageSection; LARGE_INTEGER FileOffset; - FileOffset.QuadPart = Segment->FileOffset.QuadPart + Offset; + FileOffset.QuadPart = Offset + Segment->FileOffset.QuadPart; IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; Page = PFN_FROM_SSE(Entry); FileObject = Section->FileObject; + if (FileObject != NULL && + !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + { + + if ((FileOffset.QuadPart % PAGE_SIZE) == 0 && + (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection)) + { + IO_STATUS_BLOCK IOSB; + IsDirectMapped = TRUE; + CcFlushCache + (FileObject->SectionObjectPointer, + &FileOffset, + PAGE_SIZE, + &IOSB); + if (!NT_SUCCESS(IOSB.Status)) + { + DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", IOSB.Status); + ASSERT(FALSE); + } + } + } SavedSwapEntry = MmGetSavedSwapEntryPage(Page); if (SavedSwapEntry == 0) @@ -655,6 +697,10 @@ else { MmSetPageEntrySectionSegment(Segment, Offset, 0); + if (!IsDirectMapped) + { + MmReleasePageMemoryConsumer(MC_USER, Page); + } } } else @@ -676,7 +722,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } } MmSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); @@ -687,7 +733,7 @@ else { DPRINT1("Found a swapentry for a non private page in an image or data file sgment\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } } } @@ -696,88 +742,6 @@ MmSetPageEntrySectionSegment(Segment, Offset, Entry); } return(SHARE_COUNT_FROM_SSE(Entry) > 0); -} - -NTSTATUS -NTAPI -MiReadPage(PMEMORY_AREA MemoryArea, - PLARGE_INTEGER FileOffset, - PPFN_TYPE Page) -/* - * FUNCTION: Read a page for a section backed memory area. - * PARAMETERS: - * MemoryArea - Memory area to read the page for. - * Offset - Offset of the page to read. - * Page - Variable that receives a page contains the read data. - */ -{ - PFILE_OBJECT FileObject; - NTSTATUS Status = STATUS_SUCCESS; - BOOLEAN IsImageSection; - PVOID Buffer = NULL; - IO_STATUS_BLOCK ReadStatus; - FILE_STANDARD_INFORMATION FileInfo; - PMM_SECTION_SEGMENT Segment; - PROS_SECTION_OBJECT Section; - - *Page = 0; - - Segment = MemoryArea->Data.SectionData.Segment; - Section = MemoryArea->Data.SectionData.Section; - FileObject = Section->FileObject; - ASSERT(FileObject); - IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; - - DPRINT("MiReadPage: FileObject %x, Offset %x\n", FileObject, FileOffset->LowPart); - - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, Page); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Buffer = MmCreateHyperspaceMapping(*Page); - if (!Buffer) - { - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - DPRINT("Read File Name:[%wZ] At:%x\n", &FileObject->FileName, FileOffset->LowPart); - - /* Delayed section info, if needed */ - if (Section->MaximumSize.QuadPart == ~0ll) - { - Status = IoQueryFileInformation - (FileObject, - FileStandardInformation, - sizeof(FILE_STANDARD_INFORMATION), - &FileInfo, - &ReadStatus.Information); - - if (NT_SUCCESS(Status)) - { - Section->MaximumSize = FileInfo.EndOfFile; - Segment->RawLength = FileInfo.EndOfFile.QuadPart - Segment->FileOffset.QuadPart; - Segment->Length = PAGE_ROUND_UP(Segment->RawLength); - } - } - - /* - * If the cache segment isn't up to date then call the file - * system to read in the data. - */ - - Status = MiSimpleRead(FileObject, FileOffset, Buffer, max(PAGE_SIZE, Segment->FileOffset.QuadPart + Segment->RawLength - FileOffset->QuadPart), &ReadStatus); - DPRINT("MiSimpleRead: Status %08x\n", Status); - -cleanup: - if (Buffer) MmDeleteHyperspaceMapping(Buffer); - if (!NT_SUCCESS(Status) && *Page) MmReleasePageMemoryConsumer(MC_USER, *Page); - - DPRINT("Finished MiReadPage: Status %x\n", Status); - - return Status; } NTSTATUS @@ -850,7 +814,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -868,12 +832,12 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); /* @@ -931,7 +895,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmInsertRmap(Page, Process, (PVOID)PAddress); } @@ -945,6 +909,16 @@ DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } + else + { + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + DPRINT("Didn't get a page\n"); + ASSERT(FALSE); + return Status; + } + } HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (HasSwapEntry) @@ -960,7 +934,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a swaped out private page in a pagefile section.\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmUnlockSectionSegment(Segment); @@ -970,14 +944,14 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, @@ -988,7 +962,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KEBUGCHECK(0); + ASSERT(FALSE); return(Status); } @@ -1033,7 +1007,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMappingUnsafe failed, not out of memory\n"); - KEBUGCHECK(0); + ASSERT(FALSE); return(Status); } /* @@ -1069,7 +1043,7 @@ } if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } Status = MmCreateVirtualMapping(Process, Address, @@ -1079,7 +1053,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KEBUGCHECK(0); + ASSERT(FALSE); return(Status); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -1115,7 +1089,7 @@ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || + if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || (Offset >= PAGE_ROUND_UP(Segment->RawLength) && Section->AllocationAttributes & SEC_IMAGE)) { Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); @@ -1126,17 +1100,37 @@ } else { - LARGE_INTEGER ReadOffset; - ReadOffset.QuadPart = - Segment->FileOffset.QuadPart + - Offset; - Status = MiReadPage(MemoryArea, &ReadOffset, &Page); + PVOID Buffer = MmCreateHyperspaceMapping(Page); + ULONG RemainingLength; + LARGE_INTEGER TotalOffset; + IO_STATUS_BLOCK IOSB; + + TotalOffset.QuadPart = Segment->FileOffset.QuadPart + Offset; + RemainingLength = Segment->RawLength - Offset; + + if ((RemainingLength > PAGE_SIZE) || (Segment->Length == 0)) + RemainingLength = PAGE_SIZE; + + DPRINT("Segment->RawLength %d\n", Segment->RawLength); + DPRINT("Segment->Length %d\n", Segment->Length); + DPRINT("Reading at offset %x (relative %x)\n", TotalOffset.LowPart, Offset); + DPRINT("RemainingLength %x\n", RemainingLength); + + Status = MiSimpleRead + (Section->FileObject, + &TotalOffset, + Buffer, + RemainingLength, + &IOSB); + if (!NT_SUCCESS(Status)) { DPRINT1("MiReadPage failed (Status %x)\n", Status); } - DPRINT("PAGING IO DONE: %08x\n", Status); - } + + MmDeleteHyperspaceMapping(Buffer); + } + if (!NT_SUCCESS(Status)) { /* @@ -1165,7 +1159,7 @@ if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1184,7 +1178,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -1213,13 +1207,13 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1236,7 +1230,7 @@ if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1259,7 +1253,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) @@ -1291,7 +1285,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) @@ -1385,7 +1379,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1401,12 +1395,12 @@ if (Status == STATUS_TIMEOUT) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* * Restart the operation @@ -1428,7 +1422,7 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1453,13 +1447,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KEBUGCHECK(0); + ASSERT(FALSE); return(Status); } if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } if (Locked) { @@ -1541,6 +1535,7 @@ LARGE_INTEGER FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; + BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -1552,13 +1547,27 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; - FileOffset.QuadPart = Context.Segment->FileOffset.QuadPart + Context.Offset; + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + FileOffset.QuadPart = Context.Offset + Context.Segment->FileOffset.QuadPart; IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; FileObject = Context.Section->FileObject; + if (FileObject != NULL && + !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + { + /* + * If the file system is letting us go directly to the cache and the + * memory area was mapped at an offset in the file which is page aligned + * then note this is a direct mapped page. + */ + if ((FileOffset.QuadPart % PAGE_SIZE) == 0 && + (Context.Offset + PAGE_SIZE <= Context.Segment->RawLength || !IsImageSection)) + { + DirectMapped = TRUE; + } + } + /* * This should never happen since mappings of physical memory are never @@ -1569,7 +1578,7 @@ DPRINT1("Trying to page out from physical memory section address 0x%X " "process %d\n", Address, Process ? Process->UniqueProcessId : 0); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1580,7 +1589,7 @@ { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", Process ? Process->UniqueProcessId : 0, Address); - KEBUGCHECK(0); + ASSERT(FALSE); } Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); @@ -1600,6 +1609,7 @@ Context.Private = FALSE; } + MmReferencePage(Page); MmDeleteAllRmaps(Page, (PVOID)&Context, MmPageOutDeleteMapping); /* @@ -1611,7 +1621,7 @@ if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT) && !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { - KEBUGCHECK(0); + ASSERT(FALSE); } } @@ -1629,7 +1639,7 @@ { DPRINT1("Found a %s private page (address %x) in a pagefile segment.\n", Context.WasDirty ? "dirty" : "clean", Address); - KEBUGCHECK(0); + ASSERT(FALSE); } if (!Context.WasDirty && SwapEntry != 0) { @@ -1647,7 +1657,7 @@ { DPRINT1("Found a %s private page (address %x) in a shared section segment.\n", Context.WasDirty ? "dirty" : "clean", Address); - KEBUGCHECK(0); + ASSERT(FALSE); } if (!Context.WasDirty || SwapEntry != 0) { @@ -1662,6 +1672,45 @@ return(STATUS_SUCCESS); } } + else if (!Context.Private && DirectMapped) + { + IO_STATUS_BLOCK IOSB; + + if (SwapEntry != 0) + { + DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n", + Address); + ASSERT(FALSE); + } + CcFlushCache + (FileObject->SectionObjectPointer, + &FileOffset, + PAGE_SIZE, + &IOSB); + Status = IOSB.Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); + ASSERT(FALSE); + } + MmReleasePageMemoryConsumer(MC_CACHE, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } + else if (!Context.WasDirty && !DirectMapped && !Context.Private) + { + if (SwapEntry != 0) + { + DPRINT1("Found a swap entry for a non dirty, non private and not direct mapped page (address %x)\n", + Address); + ASSERT(FALSE); + } + MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) { MmSetSavedSwapEntryPage(Page, 0); @@ -1672,7 +1721,7 @@ MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; @@ -1800,7 +1849,7 @@ MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { - KEBUGCHECK(0); + ASSERT(FALSE); } } else @@ -1822,6 +1871,7 @@ PMM_PAGEOP PageOp) { ULONG Offset; + LARGE_INTEGER TotalOffset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PFN_TYPE Page; @@ -1830,22 +1880,38 @@ BOOLEAN Private; NTSTATUS Status; PFILE_OBJECT FileObject; + BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get the segment and section. */ Segment = MemoryArea->Data.SectionData.Segment; + TotalOffset.QuadPart = Segment->FileOffset.QuadPart + Offset; Section = MemoryArea->Data.SectionData.Section; IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; FileObject = Section->FileObject; + DirectMapped = FALSE; + if (FileObject != NULL && + !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + { + /* + * If the file system is letting us go directly to the cache and the + * memory area was mapped at an offset in the file which is page aligned + * then note this is a direct mapped page. + */ + if (((Offset + Segment->FileOffset.QuadPart) % PAGE_SIZE) == 0 && + (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection)) + { + DirectMapped = TRUE; + } + } /* * This should never happen since mappings of physical memory are never @@ -1856,7 +1922,7 @@ DPRINT1("Trying to write back page from physical memory mapped at %X " "process %d\n", Address, Process ? Process->UniqueProcessId : 0); - KEBUGCHECK(0); + ASSERT(FALSE); } /* @@ -1867,7 +1933,7 @@ { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", Process ? Process->UniqueProcessId : 0, Address); - KEBUGCHECK(0); + ASSERT(FALSE); } Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); @@ -1890,6 +1956,23 @@ * Speculatively set all mappings of the page to clean. */ MmSetCleanAllRmaps(Page); + + /* + * If this page was direct mapped from the cache then the cache manager + * will take care of writing it back to disk. + */ + if (DirectMapped && !Private) + { + ASSERT(SwapEntry == 0); + CcFlushCache + (FileObject->SectionObjectPointer, + &TotalOffset, + PAGE_SIZE, + NULL); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } /* * If necessary, allocate an entry in the paging file for this page @@ -1972,7 +2055,7 @@ PFN_TYPE Page; Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + + MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); Page = MmGetPfnForProcess(Process, Address); @@ -2017,7 +2100,6 @@ if ((MemoryArea->Flags & SEC_NO_CHANGE) && Region->Protect != Protect) { - CHECKPOINT1; return STATUS_INVALID_PAGE_PROTECTION; } @@ -2222,7 +2304,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create PhysicalMemory section\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } Status = ObInsertObject(PhysSection, NULL, @@ -2353,12 +2435,14 @@ */ { PROS_SECTION_OBJECT Section; + NTSTATUS Status; LARGE_INTEGER MaximumSize; PMM_SECTION_SEGMENT Segment; - NTSTATUS Status; ULONG FileAccess; - - DPRINT("MmCreateDataFileSection [%wZ]\n", &FileObject->FileName); + IO_STATUS_BLOCK Iosb; + CC_FILE_SIZES FileSizes; + FILE_STANDARD_INFORMATION FileInfo; + KIRQL OldIrql; /* * Create the section @@ -2374,7 +2458,6 @@ (PVOID*)(PVOID)&Section); if (!NT_SUCCESS(Status)) { - DPRINT("Failed: %08x\n", Status); return(Status); } /* @@ -2398,6 +2481,46 @@ } /* + * Reference the file handle + */ + ObReferenceObject(FileObject); + + /* A hack: If we're cached, we can overcome deadlocking with the upper + * layer filesystem call by retriving the object sizes from the cache + * which is made to keep track. If I had to guess, they were figuring + * out a similar problem. + */ + if (!CcGetFileSizes(FileObject, &FileSizes)) + { + /* This means the file isn't cached (yet) ... consequently, this + * call is not recursive from the cache. */ + /* + * FIXME: This is propably not entirely correct. We can't look into + * the standard FCB header because it might not be initialized yet + * (as in case of the EXT2FS driver by Manoj Paul Joseph where the + * standard file information is filled on first request). + */ + DPRINT("IoQueryFileInformation\n"); + Status = IoQueryFileInformation + (FileObject, + FileStandardInformation, + sizeof(FILE_STANDARD_INFORMATION), + &FileInfo, + &Iosb.Information); + DPRINT("IoQueryFileInformation -> %08x\n", Status); + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Section); + ObDereferenceObject(FileObject); + return Status; + } + + FileSizes.ValidDataLength = FileInfo.EndOfFile; + FileSizes.FileSize = FileInfo.EndOfFile; + } + + /* * FIXME: Revise this once a locking order for file size changes is * decided */ @@ -2407,52 +2530,68 @@ } else { - MaximumSize.QuadPart = ~0ll; - } - - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - DPRINT("Failed: %08x\n", Status); - return(Status); - } - + MaximumSize = FileSizes.ValidDataLength; + /* Mapping zero-sized files isn't allowed. */ + if (MaximumSize.QuadPart == 0) + { + ObDereferenceObject(Section); + ObDereferenceObject(FileObject); + return STATUS_FILE_INVALID; + } + } + + if (MaximumSize.QuadPart > FileSizes.ValidDataLength.QuadPart) + { + DPRINT("IoSetInformation expanding from %x to %x\n", + MaximumSize.LowPart, FileSizes.ValidDataLength.LowPart); + Status = IoSetInformation(FileObject, + FileAllocationInformation, + sizeof(LARGE_INTEGER), + &MaximumSize); + DPRINT("IoSetInformation -> %08x\n", Status); + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Section); + ObDereferenceObject(FileObject); + return(STATUS_SECTION_NOT_EXTENDED); + } + } + + Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), + TAG_MM_SECTION_SEGMENT); + if (Segment == NULL) + { + ObDereferenceObject(Section); + ObDereferenceObject(FileObject); + return(STATUS_NO_MEMORY); + } + + ExInitializeFastMutex(&Segment->Lock); + Segment->ReferenceCount = 1; + Section->Segment = Segment; + + KeAcquireSpinLock(&FileObject->IrpListLock, &OldIrql); /* * If this file hasn't been mapped as a data file before then allocate a * section segment to describe the data file mapping */ if (FileObject->SectionObjectPointer->DataSectionObject == NULL) { - Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), - TAG_MM_SECTION_SEGMENT); - if (Segment == NULL) - { - //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - DPRINT("Failed: STATUS_NO_MEMORY\n"); - return(STATUS_NO_MEMORY); - } - Section->Segment = Segment; - Segment->ReferenceCount = 1; - ExInitializeFastMutex(&Segment->Lock); + FileObject->SectionObjectPointer->DataSectionObject = (PVOID)Segment; + KeReleaseSpinLock(&FileObject->IrpListLock, OldIrql); + /* * Set the lock before assigning the segment to the file object */ ExAcquireFastMutex(&Segment->Lock); - FileObject->SectionObjectPointer->DataSectionObject = (PVOID)Segment; - + + DPRINT("Filling out Segment info (No previous data section)\n"); Segment->FileOffset.QuadPart = 0; Segment->Protection = SectionPageProtection; Segment->Flags = MM_DATAFILE_SEGMENT; Segment->Characteristics = 0; Segment->WriteCopy = FALSE; - if (AllocationAttributes & SEC_RESERVE) { Segment->Length = Segment->RawLength = 0; @@ -2460,13 +2599,18 @@ else { Segment->RawLength = MaximumSize.u.LowPart; - Segment->Length = MaximumSize.u.LowPart; + Segment->Length = PAGE_ROUND_UP(Segment->RawLength); } Segment->VirtualAddress = 0; RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); } else { + KeReleaseSpinLock(&FileObject->IrpListLock, OldIrql); + ExFreePool(Segment); + + DPRINT("Filling out Segment info (previous data section)\n"); + /* * If the file is already mapped as a data file then we may need * to extend it @@ -2476,6 +2620,7 @@ DataSectionObject; Section->Segment = Segment; (void)InterlockedIncrementUL(&Segment->ReferenceCount); + MmLockSectionSegment(Segment); if (MaximumSize.u.LowPart > Segment->RawLength && @@ -2485,11 +2630,15 @@ Segment->Length = PAGE_ROUND_UP(Segment->RawLength); } } + MmUnlockSectionSegment(Segment); + Section->FileObject = FileObject; Section->MaximumSize = MaximumSize; + + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + *SectionObject = Section; - DPRINT("Success\n"); return(STATUS_SUCCESS); } @@ -2564,20 +2713,19 @@ OUT PULONG ReadSize) { NTSTATUS Status; - PFILE_OBJECT FileObject = (PFILE_OBJECT)File; LARGE_INTEGER FileOffset; ULONG AdjustOffset; ULONG OffsetAdjustment; ULONG BufferSize; ULONG UsedSize; PVOID Buffer; - IO_STATUS_BLOCK ReadStatus; - + IO_STATUS_BLOCK Iosb; + ASSERT_IRQL_LESS(DISPATCH_LEVEL); if(Length == 0) { - KEBUGCHECK(STATUS_INVALID_PARAMETER_4); + ASSERT(FALSE); } FileOffset = *Offset; @@ -2585,7 +2733,7 @@ /* Negative/special offset: it cannot be used in this context */ if(FileOffset.u.HighPart < 0) { - KEBUGCHECK(STATUS_INVALID_PARAMETER_5); + ASSERT(FALSE); } AdjustOffset = PAGE_ROUND_DOWN(FileOffset.u.LowPart); @@ -2607,26 +2755,21 @@ UsedSize = 0; - Status = MiSimpleRead(FileObject, &FileOffset, Buffer, Length, &ReadStatus); - DPRINT("MiSimpleRead: Status %08x\n", Status); - - UsedSize = ReadStatus.Information; - - DPRINT("ExeFmtpReadFile -> %x:%x\n", Status, UsedSize); + Status = MiSimpleRead(File, &FileOffset, Buffer, BufferSize, &Iosb); if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) { Status = STATUS_IN_PAGE_ERROR; ASSERT(!NT_SUCCESS(Status)); } + + UsedSize = Iosb.Information; if(NT_SUCCESS(Status)) { *Data = (PVOID)((ULONG_PTR)Buffer + OffsetAdjustment); *AllocBase = Buffer; *ReadSize = UsedSize - OffsetAdjustment; - DPRINT("Data @ %x Buffer @ %x Read Size %d\n", *Data, *AllocBase, *ReadSize); - DPRINT("First couple of bytes: %02x%02x\n", ((PCHAR)Data)[0] & 0xff, ((PCHAR)Data)[1] & 0xff); } else { @@ -2914,8 +3057,8 @@ /* Unaligned segments must be contiguous within the file */ if (Segment->FileOffset.QuadPart != - (EffectiveSegment->FileOffset.QuadPart + - EffectiveSegment->RawLength)) + (EffectiveSegment->FileOffset.QuadPart + + EffectiveSegment->RawLength)) { return FALSE; } @@ -3001,6 +3144,8 @@ &FileHeaderBuffer, &FileHeaderSize); + DPRINT("ExeFmtpReadFile %x\n", Status); + if (!NT_SUCCESS(Status)) return Status; @@ -3068,10 +3213,10 @@ if(ImageSectionObject->ImageBase == 0) { - if(ImageSectionObject->ImageCharacteristics & IMAGE_FILE_DLL) - ImageSectionObject->ImageBase = 0x10000000; - else - ImageSectionObject->ImageBase = 0x00400000; + if(ImageSectionObject->ImageCharacteristics & IMAGE_FILE_DLL) + ImageSectionObject->ImageBase = 0x10000000; + else + ImageSectionObject->ImageBase = 0x00400000; } /* @@ -3116,7 +3261,7 @@ { ExInitializeFastMutex(&ImageSectionObject->Segments[i].Lock); ImageSectionObject->Segments[i].ReferenceCount = 1; - + RtlZeroMemory(&ImageSectionObject->Segments[i].PageDirectory, sizeof(ImageSectionObject->Segments[i].PageDirectory)); } @@ -3165,12 +3310,7 @@ /* * Reference the file handle */ - Status = ObReferenceObject(FileObject); - - if (!NT_SUCCESS(Status)) - { - return Status; - } + ObReferenceObject(FileObject); /* * Create the section @@ -3196,7 +3336,7 @@ Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; - if (!NT_SUCCESS(Status) || FileObject->SectionObjectPointer->ImageSectionObject == NULL) + if (FileObject->SectionObjectPointer->ImageSectionObject == NULL) { NTSTATUS StatusExeFmt; @@ -3214,6 +3354,7 @@ if (!NT_SUCCESS(StatusExeFmt)) { + DPRINT("StatusExeFmt %08x\n", StatusExeFmt); if(ImageSectionObject->Segments != NULL) ExFreePool(ImageSectionObject->Segments); @@ -3287,6 +3428,7 @@ Status = STATUS_SUCCESS; } Section->FileObject = FileObject; + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(Status); } @@ -3348,7 +3490,6 @@ SectionHandle); } - DPRINT("NtCreateSection -> %08x\n", Status); return Status; } @@ -3544,7 +3685,6 @@ */ if (Protect & ~PAGE_FLAGS_VALID_FROM_USER_MODE) { - CHECKPOINT1; return STATUS_INVALID_PARAMETER_10; } @@ -3558,7 +3698,6 @@ tmpProtect != PAGE_EXECUTE_READWRITE && tmpProtect != PAGE_EXECUTE_WRITECOPY) { - CHECKPOINT1; return STATUS_INVALID_PAGE_PROTECTION; } @@ -3685,11 +3824,12 @@ return(Status); } -VOID +VOID static MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; + PFILE_OBJECT FileObject; ULONG Offset; SWAPENTRY SavedSwapEntry; PMM_PAGEOP PageOp; @@ -3698,7 +3838,6 @@ PMM_SECTION_SEGMENT Segment; PMM_AVL_TABLE AddressSpace; PEPROCESS Process; - AddressSpace = (PMM_AVL_TABLE)Context; Process = MmGetAddressSpaceOwner(AddressSpace); @@ -3706,7 +3845,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + - MemoryArea->Data.SectionData.ViewOffset; + MemoryArea->Data.SectionData.ViewOffset; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; @@ -3722,7 +3861,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); @@ -3739,39 +3878,17 @@ */ if (Segment->Flags & MM_DATAFILE_SEGMENT) { - if (Page == PFN_FROM_SSE(Entry) && Dirty) - { - LARGE_INTEGER FileOffset; - IO_STATUS_BLOCK ReadStatus; - ULONG RemainingLength; - PVOID Buffer = MmCreateHyperspaceMapping(Page); - NTSTATUS Status; - - FileOffset.QuadPart = Offset; - - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - RemainingLength = min(PAGE_SIZE, Segment->FileOffset.QuadPart + Segment->Length - FileOffset.QuadPart); - DPRINT("Writing no more than %d bytes\n", RemainingLength); - - if (RemainingLength > 0) - { - Status = MiSimpleWrite - (Section->FileObject, - &FileOffset, - Buffer, - min(RemainingLength, PAGE_SIZE), - &ReadStatus); - } - else - Status = STATUS_SUCCESS; - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - MmDeleteHyperspaceMapping(Buffer); - } + if (Page == PFN_FROM_SSE(Entry) && Dirty) + { + IO_STATUS_BLOCK IOSB; + FileObject = MemoryArea->Data.SectionData.Section->FileObject; + CcFlushCache + (FileObject->SectionObjectPointer, + &Segment->FileOffset, + Segment->Length, + &IOSB); + ASSERT(SwapEntry == 0); + } } if (SwapEntry != 0) @@ -3782,7 +3899,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a swap entry for a page in a pagefile section.\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } MmFreeSwapPage(SwapEntry); } @@ -3797,7 +3914,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a private page in a pagefile section.\n"); - KEBUGCHECK(0); + ASSERT(FALSE); } /* * Just dereference private pages @@ -3923,7 +4040,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - KEBUGCHECK(0); + ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -3969,7 +4086,7 @@ } if (i >= NrSegments) { - KEBUGCHECK(0); + ASSERT(FALSE); } for (i = 0; i < NrSegments; i++) @@ -4391,7 +4508,6 @@ Protect != PAGE_EXECUTE_READWRITE && Protect != PAGE_EXECUTE_WRITECOPY) { - CHECKPOINT1; return STATUS_INVALID_PAGE_PROTECTION; } @@ -4488,21 +4604,18 @@ if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && !(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) { - CHECKPOINT1; return STATUS_SECTION_PROTECTION; } /* check for read access */ if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { - CHECKPOINT1; return STATUS_SECTION_PROTECTION; } /* check for execute access */ if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { - CHECKPOINT1; return STATUS_SECTION_PROTECTION; } @@ -4510,7 +4623,7 @@ { /* Following this pointer would lead to us to the dark side */ /* What to do? Bugcheck? Return status? Do the mambo? */ - KEBUGCHECK(MEMORY_MANAGEMENT); + KeBugCheck(MEMORY_MANAGEMENT); } if (SectionOffset == NULL) @@ -4588,30 +4701,7 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, IN MMFLUSH_TYPE FlushType) { - - switch(FlushType) - { - case MmFlushForDelete: - if (SectionObjectPointer->ImageSectionObject || - SectionObjectPointer->DataSectionObject) - { - return FALSE; - } - break; - - case MmFlushForWrite: - break; - } - -#if 0 - CcFlushCache - (SectionObjectPointer, - NULL, - 0, - NULL); -#endif - - return FALSE; + return CcFlushImageSection(SectionObjectPointer, FlushType); } /* @@ -4627,50 +4717,6 @@ } -NTSTATUS STDCALL -MmMapViewInSystemSpaceAtOffset -(IN PVOID SectionObject, - OUT PVOID *MappedBase, - PLARGE_INTEGER FileOffset, - IN OUT PULONG ViewSize) -{ - PROS_SECTION_OBJECT Section; - PMM_AVL_TABLE AddressSpace; - NTSTATUS Status; - - DPRINT("MmMapViewInSystemSpaceAtOffset() called offset %x\n", FileOffset->LowPart); - - Section = (PROS_SECTION_OBJECT)SectionObject; - AddressSpace = MmGetKernelAddressSpace(); - - MmLockAddressSpace(AddressSpace); - - if ((*ViewSize) == 0) - { - (*ViewSize) = Section->MaximumSize.u.LowPart; - } - else if ((*ViewSize) > Section->MaximumSize.u.LowPart) - { - (*ViewSize) = Section->MaximumSize.u.LowPart; - } - - MmLockSectionSegment(Section->Segment); - - Status = MmMapViewOfSegment(AddressSpace, - Section, - Section->Segment, - MappedBase, - *ViewSize, - PAGE_READWRITE, - FileOffset->LowPart, - 0); - - MmUnlockSectionSegment(Section->Segment); - MmUnlockAddressSpace(AddressSpace); - - return Status; -} - /* * @implemented */ @@ -4690,6 +4736,7 @@ MmLockAddressSpace(AddressSpace); + if ((*ViewSize) == 0) { (*ViewSize) = Section->MaximumSize.u.LowPart; @@ -4700,6 +4747,7 @@ } MmLockSectionSegment(Section->Segment); + Status = MmMapViewOfSegment(AddressSpace, Section, @@ -4707,13 +4755,57 @@ MappedBase, *ViewSize, PAGE_READWRITE, - 0, + 0, 0); MmUnlockSectionSegment(Section->Segment); MmUnlockAddressSpace(AddressSpace); return Status; +} + +NTSTATUS STDCALL +MmMapViewInSystemSpaceAtOffset +(IN PVOID SectionObject, + OUT PVOID *MappedBase, + PLARGE_INTEGER FileOffset, + IN OUT PULONG ViewSize) +{ + PROS_SECTION_OBJECT Section; + PMM_AVL_TABLE AddressSpace; + NTSTATUS Status; + + DPRINT("MmMapViewInSystemSpaceAtOffset() called offset %x\n", FileOffset->LowPart); + + Section = (PROS_SECTION_OBJECT)SectionObject; + AddressSpace = MmGetKernelAddressSpace(); + + MmLockAddressSpace(AddressSpace); + + if ((*ViewSize) == 0) + { + (*ViewSize) = Section->MaximumSize.u.LowPart; + } + else if ((*ViewSize) > Section->MaximumSize.u.LowPart) + { + (*ViewSize) = Section->MaximumSize.u.LowPart; + } + + MmLockSectionSegment(Section->Segment); + + Status = MmMapViewOfSegment(AddressSpace, + Section, + Section->Segment, + MappedBase, + *ViewSize, + PAGE_READWRITE, + FileOffset->LowPart, + 0); + + MmUnlockSectionSegment(Section->Segment); + MmUnlockAddressSpace(AddressSpace); + + return Status; } /* @@ -4745,11 +4837,7 @@ AddressSpace = MmGetKernelAddressSpace(); - MmLockAddressSpace(AddressSpace); - Status = MmUnmapViewOfSegment(AddressSpace, MappedBase); - - MmUnlockAddressSpace(AddressSpace); return Status; } @@ -4830,9 +4918,8 @@ * Handle to a file to create a section mapped to a file * instead of a memory backed section; * - * FileObject - * Specifies a FILE_OBJECT. If this isn't NULL, then FileHandle - * is ignored. + * File + * Unknown. * * RETURN VALUE * Status. @@ -4846,100 +4933,104 @@ IN PLARGE_INTEGER MaximumSize, IN ULONG SectionPageProtection, IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL, - IN PFILE_OBJECT FileObject OPTIONAL) -{ - PFILE_OBJECT OriginalFileObject = FileObject; - ULONG Protection; - NTSTATUS Status; - ULONG FileAccess = 0; - BOOLEAN ReferencedFile = FALSE; - PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; - - /* - * Check the protection - */ - Protection = SectionPageProtection & ~(PAGE_GUARD|PAGE_NOCACHE); - if (Protection != PAGE_NOACCESS && - Protection != PAGE_READONLY && - Protection != PAGE_READWRITE && - Protection != PAGE_WRITECOPY && - Protection != PAGE_EXECUTE && - Protection != PAGE_EXECUTE_READ && - Protection != PAGE_EXECUTE_READWRITE && - Protection != PAGE_EXECUTE_WRITECOPY) - { - CHECKPOINT1; - return STATUS_INVALID_PAGE_PROTECTION; - } - - if ((DesiredAccess == SECTION_ALL_ACCESS || - (DesiredAccess & SECTION_MAP_WRITE)) && - (Protection == PAGE_READWRITE || - Protection == PAGE_EXECUTE_READWRITE)) - FileAccess = FILE_GENERIC_WRITE; - else - FileAccess = FILE_GENERIC_READ; - - /* - * Reference the file handle - */ - if (!FileObject && FileHandle) - { - Status = ObReferenceObjectByHandle(FileHandle, - FileAccess, - IoFileObjectType, - ExGetPreviousMode(), - (PVOID*)(PVOID)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed: %x\n", Status); - return Status; - } - else - ReferencedFile = TRUE; - } - - if (AllocationAttributes & SEC_IMAGE) - { - DPRINT("Creating an image section\n"); - Status = MmCreateImageSection(SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes, - FileObject); - if (!NT_SUCCESS(Status)) - DPRINT("Failed: %x\n", Status); - } - - else if (FileHandle != NULL || OriginalFileObject != NULL) - { - Status = MmCreateDataFileSection(SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes, - FileObject); - if (!NT_SUCCESS(Status)) - DPRINT("Failed: %x\n", Status); - } - else - { - Status = MmCreatePageFileSection(SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes); - if (!NT_SUCCESS(Status)) - DPRINT("Failed: %x\n", Status); - } - - return(Status); + IN HANDLE FileHandle OPTIONAL, + IN PFILE_OBJECT FileObject OPTIONAL) +{ + PFILE_OBJECT OriginalFileObject = FileObject; + ULONG Protection; + NTSTATUS Status; + ULONG FileAccess = 0; + BOOLEAN ReferencedFile = FALSE; + PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; + + /* + * Check the protection + */ + Protection = SectionPageProtection & ~(PAGE_GUARD|PAGE_NOCACHE); + if (Protection != PAGE_NOACCESS && + Protection != PAGE_READONLY && + Protection != PAGE_READWRITE && + Protection != PAGE_WRITECOPY && + Protection != PAGE_EXECUTE && + Protection != PAGE_EXECUTE_READ && + Protection != PAGE_EXECUTE_READWRITE && + Protection != PAGE_EXECUTE_WRITECOPY) + { + return STATUS_INVALID_PAGE_PROTECTION; + } + + if ((DesiredAccess == SECTION_ALL_ACCESS || + (DesiredAccess & SECTION_MAP_WRITE)) && + (Protection == PAGE_READWRITE || + Protection == PAGE_EXECUTE_READWRITE)) + FileAccess = FILE_GENERIC_WRITE; + else + FileAccess = FILE_GENERIC_READ; + + /* + * Reference the file handle + */ + if (!FileObject && FileHandle) + { + Status = ObReferenceObjectByHandle + (FileHandle, + FileAccess, + IoFileObjectType, + ExGetPreviousMode(), + (PVOID*)(PVOID)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed: %x\n", Status); + return Status; + } + else + ReferencedFile = TRUE; + } + + if (AllocationAttributes & SEC_IMAGE) + { + DPRINT("Creating an image section\n"); + Status = MmCreateImageSection + (SectionObject, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileObject); + if (!NT_SUCCESS(Status)) + DPRINT("Failed: %x\n", Status); + } + else if (FileHandle != NULL || OriginalFileObject != NULL) + { + DPRINT("Creating a data section\n"); + Status = MmCreateDataFileSection + (SectionObject, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileObject); + if (!NT_SUCCESS(Status)) + DPRINT("Failed: %x\n", Status); + } + else + { + DPRINT("Creating a page file section\n"); + Status = MmCreatePageFileSection + (SectionObject, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes); + if (!NT_SUCCESS(Status)) + DPRINT("Failed: %x\n", Status); + } + + return(Status); } NTSTATUS

1 0

[sginsberg] 35697: - Get gdi32 and user32 to compile again - Update some system call prototypes and definitions
by sginsberg＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: sginsberg Date: Wed Aug 27 09:22:38 2008 New Revision: 35697 URL: http://svn.reactos.org/svn/reactos?rev=35697&view=rev Log: - Get gdi32 and user32 to compile again - Update some system call prototypes and definitions Modified: branches/nwin32/dll/win32/gdi32/misc/hacks.c branches/nwin32/dll/win32/gdi32/objects/bitmap.c branches/nwin32/dll/win32/gdi32/objects/coord.c branches/nwin32/dll/win32/gdi32/objects/font.c branches/nwin32/dll/win32/user32/controls/scrollbar.c branches/nwin32/dll/win32/user32/misc/display.c branches/nwin32/dll/win32/user32/windows/bitmap.c branches/nwin32/dll/win32/user32/windows/class.c branches/nwin32/dll/win32/user32/windows/cursor.c branches/nwin32/dll/win32/user32/windows/icon.c branches/nwin32/dll/win32/user32/windows/input.c branches/nwin32/dll/win32/user32/windows/menu.c branches/nwin32/dll/win32/user32/windows/message.c branches/nwin32/dll/win32/user32/windows/nonclient.c branches/nwin32/dll/win32/user32/windows/window.c branches/nwin32/dll/win32/user32/windows/winpos.c branches/nwin32/include/reactos/win32k/ntuser.h branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c branches/nwin32/subsystems/win32/win32k/ntuser/display.c Modified: branches/nwin32/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/misc/hac… ============================================================================== --- branches/nwin32/dll/win32/gdi32/misc/hacks.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/misc/hacks.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -21,7 +21,8 @@ int nYOffset, LPPOINT lpPoint) { - return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); + /* Unimplemented for now */ + return FALSE; } /* @@ -35,7 +36,8 @@ int nYOffset, LPPOINT lpPoint) { - return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint); + /* Unimplemented for now */ + return FALSE; } Modified: branches/nwin32/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -315,7 +315,6 @@ 0); } -#if 0 /* * @implemented */ @@ -406,20 +405,6 @@ RestoreDC(SavehDC, -1); return LinesCopied; -} -#endif - -INT -STDCALL -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); } /* Modified: branches/nwin32/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/coord.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/coord.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -377,7 +377,8 @@ } return TRUE; #endif - return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); + /* Unimplemented for now */ + return FALSE; } /* @@ -439,7 +440,8 @@ Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); return TRUE; #endif - return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); + /* Unimplemented for now */ + return FALSE; } /* @@ -510,7 +512,8 @@ } return TRUE; // Return TRUE. #endif - return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); + /* Unimplemented for now */ + return FALSE; } /* @@ -559,7 +562,8 @@ Dc_Attr->ptlViewportOrg.y = Y; return TRUE; #endif - return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); + /* Unimplemented for now */ + return FALSE; } /* Modified: branches/nwin32/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -283,74 +283,8 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, BOOL Unicode) { - int FontFamilyCount; - int FontFamilySize; - PFONTFAMILYINFO Info; - int Ret = 0; - int i; - ENUMLOGFONTEXA EnumLogFontExA; - NEWTEXTMETRICEXA NewTextMetricExA; - - Info = RtlAllocateHeap(GetProcessHeap(), 0, - INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); - if (NULL == Info) - { - return 0; - } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT); - if (FontFamilyCount < 0) - { - RtlFreeHeap(GetProcessHeap(), 0, Info); - return 0; - } - if (INITIAL_FAMILY_COUNT < FontFamilyCount) - { - FontFamilySize = FontFamilyCount; - RtlFreeHeap(GetProcessHeap(), 0, Info); - Info = RtlAllocateHeap(GetProcessHeap(), 0, - FontFamilyCount * sizeof(FONTFAMILYINFO)); - if (NULL == Info) - { - return 0; - } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, FontFamilySize); - if (FontFamilyCount < 0 || FontFamilySize < FontFamilyCount) - { - RtlFreeHeap(GetProcessHeap(), 0, Info); - return 0; - } - } - - for (i = 0; i < FontFamilyCount; i++) - { - if (Unicode) - { - Ret = ((FONTENUMPROCW) EnumProc)( - &Info[i].EnumLogFontEx, - &Info[i].NewTextMetricEx, - Info[i].FontType, lParam); - } - else - { // Could use EnumLogFontExW2A here? - LogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1, - (LPSTR)EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfStyle, -1, - (LPSTR)EnumLogFontExA.elfStyle, LF_FACESIZE, NULL, NULL); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfScript, -1, - (LPSTR)EnumLogFontExA.elfScript, LF_FACESIZE, NULL, NULL); - NewTextMetricExW2A(&NewTextMetricExA, - &Info[i].NewTextMetricEx); - Ret = ((FONTENUMPROCA) EnumProc)( - &EnumLogFontExA, - &NewTextMetricExA, - Info[i].FontType, lParam); - } - } - - RtlFreeHeap(GetProcessHeap(), 0, Info); - - return Ret; + /* Unimplemented for now, should use NewEnumFontFamiliesExW */ + return 0; } /* Modified: branches/nwin32/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/control… ============================================================================== --- branches/nwin32/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -58,14 +58,14 @@ #define SCROLL_MIN_THUMB 6 /* Thumb-tracking info */ -static HWND ScrollTrackingWin = 0; -static INT ScrollTrackingBar = 0; -static INT ScrollTrackingPos = 0; -static INT ScrollTrackingVal = 0; -static BOOL ScrollMovingThumb = FALSE; - -static DWORD ScrollTrackHitTest = SCROLL_NOWHERE; -static BOOL ScrollTrackVertical; +//static HWND ScrollTrackingWin = 0; +//static INT ScrollTrackingBar = 0; +//static INT ScrollTrackingPos = 0; +//static INT ScrollTrackingVal = 0; +//static BOOL ScrollMovingThumb = FALSE; + +//static DWORD ScrollTrackHitTest = SCROLL_NOWHERE; +//static BOOL ScrollTrackVertical; HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); @@ -254,6 +254,7 @@ DrawFrameControl(hDC, &RectRB, DFC_SCROLL, ScrollDirFlagRB); } +#if 0 static VOID FASTCALL IntScrollDrawMovingThumb(HDC Dc, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { @@ -306,13 +307,13 @@ return OBJID_CLIENT; } +#endif static BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) { - ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); - - return NtUserGetScrollBarInfo(Wnd, IntScrollGetObjectId(Bar), ScrollBarInfo); + UNIMPLEMENTED; + return FALSE; } void @@ -383,6 +384,7 @@ } } +#if 0 static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { @@ -467,6 +469,7 @@ return SCROLL_THUMB; } +#endif /*********************************************************************** @@ -485,6 +488,9 @@ INT *ArrowSize, INT *ThumbSize, INT *ThumbPos) { + UNIMPLEMENTED; + return FALSE; +#if 0 INT Pixels; BOOL Vertical; RECT ClientRect; @@ -622,6 +628,7 @@ } return Vertical; +#endif } /*********************************************************************** @@ -630,6 +637,7 @@ * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ +#if 0 static UINT FASTCALL IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) @@ -699,6 +707,7 @@ return Pt; } +#endif /*********************************************************************** * IntScrollDrawSizeGrip @@ -782,6 +791,9 @@ static VOID FASTCALL IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { + UNIMPLEMENTED; + return; +#if 0 static POINT PrevPt; /* Previous mouse position for timer events */ static UINT TrackThumbPos; /* Thumb position when tracking started. */ static INT LastClickPos; /* Position in the scroll-bar of the last @@ -1057,6 +1069,7 @@ } ReleaseDC(Wnd, Dc); +#endif } @@ -1140,16 +1153,8 @@ static INT FASTCALL IntScrollGetScrollPos(HWND Wnd, INT Bar) { - SCROLLINFO ScrollInfo; - - ScrollInfo.cbSize = sizeof(SCROLLINFO); - ScrollInfo.fMask = SIF_POS; - if (! NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo)) - { - return 0; - } - - return ScrollInfo.nPos; + UNIMPLEMENTED; + return 0; } static BOOL FASTCALL @@ -1166,7 +1171,7 @@ ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; - Result = NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo); + Result = FALSE; if (Result) { *MinPos = ScrollInfo.nMin; @@ -1436,7 +1441,7 @@ return NtUserSetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam, wParam); case SBM_GETSCROLLINFO: - return NtUserGetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam); + return FALSE; case 0x00e5: case 0x00e7: @@ -1491,7 +1496,8 @@ BOOL STDCALL GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) { - return NtUserGetScrollBarInfo(hWnd, idObject, psbi); + UNIMPLEMENTED; + return FALSE; } /* @@ -1506,7 +1512,8 @@ } else { - return NtUserGetScrollInfo(Wnd, SBType, Info); + UNIMPLEMENTED; + return FALSE; } } @@ -1580,7 +1587,7 @@ * Call NtUserGetScrollInfo() to get the previous position that * we will later return. */ - if (NtUserGetScrollInfo(hWnd, nBar, &ScrollInfo)) + if (FALSE) { Result = ScrollInfo.nPos; if (Result != nPos) Modified: branches/nwin32/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/misc/di… ============================================================================== --- branches/nwin32/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/misc/display.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -134,66 +134,8 @@ MONITORENUMPROC lpfnEnum, LPARAM dwData) { - INT iCount, i; - HMONITOR *hMonitorList; - LPRECT pRectList; - HANDLE hHeap; - - /* get list of monitors/rects */ - iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, NULL, NULL, 0); - if (iCount < 0) - { - /* FIXME: SetLastError() */ - return FALSE; - } - if (iCount == 0) - { - return TRUE; - } - - hHeap = GetProcessHeap(); - hMonitorList = HeapAlloc(hHeap, 0, sizeof (HMONITOR) * iCount); - if (hMonitorList == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - pRectList = HeapAlloc(hHeap, 0, sizeof (RECT) * iCount); - if (pRectList == NULL) - { - HeapFree(hHeap, 0, hMonitorList); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, hMonitorList, pRectList, iCount); - if (iCount <= 0) - { - /* FIXME: SetLastError() */ - HeapFree(hHeap, 0, hMonitorList); - HeapFree(hHeap, 0, pRectList); - return FALSE; - } - - /* enumerate list */ - for (i = 0; i < iCount; i++) - { - HMONITOR hMonitor = hMonitorList[i]; - LPRECT pMonitorRect = pRectList + i; - HDC hMonitorDC = NULL; - - if (hdc != NULL) - { - /* make monitor DC */ - hMonitorDC = hdc; - } - - if (!lpfnEnum(hMonitor, hMonitorDC, pMonitorRect, dwData)) - break; - } - HeapFree(hHeap, 0, hMonitorList); - HeapFree(hHeap, 0, pRectList); - return TRUE; + UNIMPLEMENTED; + return FALSE; } @@ -361,7 +303,7 @@ { if (lpmi->cbSize == sizeof (MONITORINFO)) { - return NtUserGetMonitorInfo(hMonitor, lpmi); + return FALSE; } else if (lpmi->cbSize != sizeof (MONITORINFOEXA)) { @@ -374,7 +316,7 @@ INT res; miExW.cbSize = sizeof (MONITORINFOEXW); - if (!NtUserGetMonitorInfo(hMonitor, (LPMONITORINFO)&miExW)) + if (FALSE) { return FALSE; } @@ -402,7 +344,8 @@ HMONITOR hMonitor, LPMONITORINFO lpmi) { - return NtUserGetMonitorInfo(hMonitor, lpmi); + UNIMPLEMENTED; + return FALSE; } @@ -415,7 +358,8 @@ IN POINT ptPoint, IN DWORD dwFlags ) { - return NtUserMonitorFromPoint(ptPoint, dwFlags); + UNIMPLEMENTED; + return NULL; } @@ -428,7 +372,8 @@ IN LPCRECT lpcRect, IN DWORD dwFlags ) { - return NtUserMonitorFromRect(lpcRect, dwFlags); + UNIMPLEMENTED; + return NULL; } @@ -441,7 +386,8 @@ IN HWND hWnd, IN DWORD dwFlags ) { - return NtUserMonitorFromWindow(hWnd, dwFlags); + UNIMPLEMENTED; + return NULL; } @@ -478,7 +424,7 @@ else pDevModeW = NULL; - rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam ); + rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, dwflags, lParam ); if (lpszDeviceName != NULL) RtlFreeUnicodeString ( &DeviceName ); @@ -521,7 +467,7 @@ else pDeviceName = NULL; - rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam ); + rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, dwflags, lParam ); return rc; } Modified: branches/nwin32/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/bitmap.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -242,7 +242,8 @@ * Let's see if we already loaded it */ if (fuLoad & LR_SHARED) { - hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, 0, 0); + PPOINT Point = NULL; + hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, Point); if (hIcon) { return hIcon; @@ -270,7 +271,7 @@ if (hIcon && 0 != (fuLoad & LR_SHARED)) { -#if 1 +#if 0 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); #else Modified: branches/nwin32/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/class.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -23,6 +23,9 @@ LPCSTR lpszClass, LPWNDCLASSEXA lpwcx) { + UNIMPLEMENTED; + return FALSE; +#if 0 UNICODE_STRING ClassName = {0}; BOOL Ret; @@ -71,6 +74,7 @@ } return Ret; +#endif } @@ -84,6 +88,9 @@ LPCWSTR lpszClass, LPWNDCLASSEXW lpwcx) { + UNIMPLEMENTED; + return FALSE; +#if 0 UNICODE_STRING ClassName = {0}; TRACE("%p class/atom: %S/%04x %p\n", hInstance, @@ -120,6 +127,7 @@ lpwcx, NULL, FALSE); +#endif } @@ -292,7 +300,7 @@ _SEH_END; if (Wnd == NULL) - Ret = NtUserGetClassLong(hWnd, nIndex, TRUE); + Ret = 0; return Ret; } @@ -405,7 +413,7 @@ _SEH_END; if (Wnd == NULL) - Ret = NtUserGetClassLong(hWnd, nIndex, FALSE); + Ret = 0; return Ret; } @@ -426,9 +434,10 @@ ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName; + /* FIXME: Conver to unicode!!! */ Result = NtUserGetClassName(hWnd, - (PUNICODE_STRING)&ClassName, - TRUE); + FALSE, + (PUNICODE_STRING)&ClassName); TRACE("%p class/atom: %s/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -456,8 +465,8 @@ ClassName.Buffer = lpClassName; Result = NtUserGetClassName(hWnd, - &ClassName, - FALSE); + FALSE, + &ClassName); TRACE("%p class/atom: %S/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -485,7 +494,7 @@ if ((nIndex < 0) && (nIndex != GCW_ATOM)) return 0; - return (WORD) NtUserGetClassLong ( hWnd, nIndex, TRUE ); + return 0; } @@ -536,7 +545,7 @@ case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ - return NtUserGetWindowLong(hWnd, nIndex, TRUE); + return 0; default: SetLastError(ERROR_INVALID_PARAMETER); @@ -593,7 +602,7 @@ case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ - return NtUserGetWindowLong(hWnd, nIndex, FALSE); + return 0; default: SetLastError(ERROR_INVALID_PARAMETER); @@ -654,6 +663,7 @@ /* * Create a small icon based on a standard icon */ +#if 0 static HICON CreateSmallIcon(HICON StdIcon) { @@ -814,6 +824,7 @@ return SmallIcon; } +#endif ATOM STDCALL @@ -832,6 +843,9 @@ ATOM STDCALL RegisterClassExA(CONST WNDCLASSEXA *lpwcx) { + UNIMPLEMENTED; + return 0; +#if 0 RTL_ATOM Atom; WNDCLASSEXA WndClass; UNICODE_STRING ClassName; @@ -917,6 +931,7 @@ RtlFreeUnicodeString(&ClassName); return (ATOM)Atom; +#endif } /* @@ -925,6 +940,9 @@ ATOM STDCALL RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { + UNIMPLEMENTED; + return 0; +#if 0 ATOM Atom; WNDCLASSEXW WndClass; UNICODE_STRING ClassName; @@ -1005,6 +1023,7 @@ lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); return Atom; +#endif } /* Modified: branches/nwin32/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/cursor.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/cursor.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -76,7 +76,7 @@ if(GetIconInfo((HANDLE)pcur, &IconInfo)) { - return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); + return 0; } return (HCURSOR)0; } @@ -145,7 +145,7 @@ IconInfo.yHotspot = yHotSpot; IconInfo.hbmColor = 0; - return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); + return NULL; } Modified: branches/nwin32/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -88,7 +88,8 @@ ImageData, bwBIH, DIB_RGB_COLORS); /* Create the icon based on everything we have so far */ - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; } HICON @@ -139,7 +140,8 @@ IconInfo.hbmColor = (HBITMAP)0; /* Create the icon based on everything we have so far */ - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; } @@ -195,7 +197,8 @@ return (HICON)0; } - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; } @@ -343,7 +346,8 @@ return (HICON)0; }*/ - return (HICON)NtUserCreateCursorIconHandle(IconInfo, TRUE); + UNIMPLEMENTED; + return NULL; } Modified: branches/nwin32/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/input.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -289,7 +289,8 @@ BOOL STDCALL GetLastInputInfo(PLASTINPUTINFO plii) { - return NtUserGetLastInputInfo(plii); + UNIMPLEMENTED; + return FALSE; } Modified: branches/nwin32/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -131,7 +131,8 @@ MenuInfo->cbSize = sizeof(ROSMENUINFO); MenuInfo->fMask = MIM_BACKGROUND | MIM_HELPID | MIM_MAXHEIGHT | MIM_MENUDATA | MIM_STYLE; - return NtUserMenuInfo(Menu, MenuInfo, FALSE); + UNIMPLEMENTED; + return FALSE; } /*********************************************************************** @@ -145,7 +146,8 @@ MenuInfo->cbSize = sizeof(ROSMENUINFO); MenuInfo->fMask = MIM_BACKGROUND | MIM_HELPID | MIM_MAXHEIGHT | MIM_MENUDATA | MIM_STYLE; - return NtUserMenuInfo(MenuInfo->Self, MenuInfo, TRUE); + UNIMPLEMENTED; + return FALSE; } /*********************************************************************** @@ -180,9 +182,10 @@ | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; ItemInfo->dwTypeData = NULL; - if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) + if (TRUE) { ItemInfo->fType = 0; + UNIMPLEMENTED; return FALSE; } @@ -196,9 +199,10 @@ return FALSE; } - if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) + if (TRUE) { ItemInfo->fType = 0; + UNIMPLEMENTED; return FALSE; } ItemInfo->dwTypeData[ItemInfo->cch - 1] = UNICODE_NULL; @@ -222,7 +226,8 @@ { ItemInfo->cch = strlenW(ItemInfo->dwTypeData); } - Ret = NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, TRUE); + UNIMPLEMENTED; + Ret = FALSE; return Ret; } @@ -250,6 +255,9 @@ static INT FASTCALL MenuGetAllRosMenuItemInfo(HMENU Menu, PROSMENUITEMINFO *ItemInfo) { + UNIMPLEMENTED; + return -1; +#if 0 DWORD BufSize; BufSize = NtUserBuildMenuItemList(Menu, (VOID *) 1, 0, 0); @@ -264,6 +272,7 @@ } return NtUserBuildMenuItemList(Menu, *ItemInfo, BufSize, 0); +#endif } /*********************************************************************** @@ -4128,7 +4137,8 @@ UINT fByPos, UINT gmdiFlags) { - return NtUserGetMenuDefaultItem(hMenu, fByPos, gmdiFlags); + UNIMPLEMENTED; + return -1; } @@ -4149,7 +4159,8 @@ mi.cbSize = sizeof(MENUINFO); mi.fMask = lpcmi->fMask; - res = NtUserMenuInfo(hmenu, &mi, FALSE); + UNIMPLEMENTED; + res = FALSE; memcpy(lpcmi, &mi, sizeof(MENUINFO)); return res; @@ -4180,7 +4191,7 @@ mii.cbSize = sizeof(MENUITEMINFOW); mii.fMask = MIIM_ID | MIIM_SUBMENU; - if (! NtUserMenuItemInfo(hMenu, nPos, MF_BYPOSITION, &mii, FALSE)) + if (TRUE) { return -1; } @@ -4222,7 +4233,8 @@ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ - return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + UNIMPLEMENTED; + return FALSE; } AnsiBuffer = mii->dwTypeData; @@ -4238,7 +4250,7 @@ miiW.dwTypeData[0] = 0; } - if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) + if (TRUE) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; @@ -4305,7 +4317,8 @@ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ - return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + UNIMPLEMENTED; + return FALSE; } String = mii->dwTypeData; @@ -4321,7 +4334,7 @@ miiW.dwTypeData[0] = 0; } - if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) + if (TRUE) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; @@ -4379,7 +4392,7 @@ mii.fMask = MIIM_STATE | MIIM_FTYPE | MIIM_SUBMENU; SetLastError(0); - if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE)) + if(FALSE) { UINT nSubItems = 0; if(mii.hSubMenu) @@ -4473,7 +4486,7 @@ mi.cbSize = sizeof(MENUITEMINFOW); mi.fMask = MIIM_SUBMENU; - if (NtUserMenuItemInfo(hMenu, (UINT)nPos, MF_BYPOSITION, &mi, FALSE)) + if (FALSE) { return IsMenu(mi.hSubMenu) ? mi.hSubMenu : NULL; } @@ -4925,7 +4938,9 @@ return res; memcpy(&mi, lpcmi, sizeof(MENUINFO)); - return NtUserMenuInfo(hmenu, &mi, TRUE); + + UNIMPLEMENTED; + return FALSE; } @@ -4945,8 +4960,7 @@ memset ( &uItem, 0, sizeof(uItem) ); uItem.fMask = MIIM_STATE | MIIM_BITMAP; - if(!(NtUserMenuItemInfo(hMenu, uPosition, - (BOOL)(MF_BYPOSITION & uFlags), &uItem, FALSE))) return FALSE; + if(TRUE) return FALSE; if (!hBitmapChecked && !hBitmapUnchecked) { @@ -4958,8 +4972,7 @@ uItem.hbmpUnchecked = hBitmapUnchecked; uItem.fState |= MF_USECHECKBITMAPS; } - return NtUserMenuItemInfo(hMenu, uPosition, - (BOOL)(MF_BYPOSITION & uFlags), &uItem, TRUE); + return FALSE; } @@ -5013,8 +5026,8 @@ UnicodeString.Buffer = NULL; } - Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, - (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + UNIMPLEMENTED; + Result = FALSE; if (UnicodeString.Buffer != NULL) { @@ -5054,8 +5067,8 @@ { MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); } - Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, - (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + UNIMPLEMENTED; + Result = FALSE; return Result; } @@ -5183,10 +5196,7 @@ mi.cbSize = sizeof(ROSMENUINFO); mi.fMask = MIM_HELPID; - if(NtUserMenuInfo(hmenu, &mi, FALSE)) - { - return mi.dwContextHelpID; - } + UNIMPLEMENTED; return 0; } Modified: branches/nwin32/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/message.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -265,6 +265,7 @@ return; } +#if 0 static BOOL FASTCALL MsgiUMToKMReply(PMSG UMMsg, PMSG KMMsg, LRESULT *Result) { @@ -272,6 +273,7 @@ return TRUE; } +#endif static BOOL FASTCALL MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) @@ -1702,6 +1704,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return 0; +#if 0 MSG UMMsg, KMMsg; NTUSERSENDMESSAGEINFO Info; LRESULT Result; @@ -1749,6 +1754,7 @@ } return Result; +#endif } @@ -1758,6 +1764,9 @@ LRESULT STDCALL SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return 0; +#if 0 MSG AnsiMsg, UcMsg; MSG KMMsg; LRESULT Result; @@ -1831,6 +1840,7 @@ } return Result; +#endif } /* @@ -1891,6 +1901,9 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { + UNIMPLEMENTED; + return 0; +#if 0 MSG AnsiMsg; MSG UcMsg; LRESULT Result; @@ -1955,6 +1968,7 @@ SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); return Result; +#endif } @@ -1972,6 +1986,9 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { + UNIMPLEMENTED; + return 0; +#if 0 NTUSERSENDMESSAGEINFO Info; LRESULT Result; @@ -1993,6 +2010,7 @@ SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); return Result; +#endif } @@ -2007,6 +2025,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return FALSE; +#if 0 MSG AnsiMsg, UcMsg; MSG KMMsg; LRESULT Result; @@ -2031,6 +2052,7 @@ MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); return Result; +#endif } @@ -2045,6 +2067,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return FALSE; +#if 0 MSG UMMsg, KMMsg; LRESULT Result; @@ -2061,6 +2086,7 @@ MsgiUMToKMCleanup(&UMMsg, &KMMsg); return Result; +#endif } Modified: branches/nwin32/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/nonclient.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -583,7 +583,7 @@ ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; else ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - NtUserSetScrollBarInfo(hWnd, OBJID_VSCROLL, &ssbi); + //NtUserSetScrollBarInfo(hWnd, OBJID_VSCROLL, &ssbi); if(ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) Style &= ~WS_VSCROLL; } @@ -602,7 +602,7 @@ ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; else ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - NtUserSetScrollBarInfo(hWnd, OBJID_HSCROLL, &ssbi); + //NtUserSetScrollBarInfo(hWnd, OBJID_HSCROLL, &ssbi); if(ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) Style &= ~WS_HSCROLL; } Modified: branches/nwin32/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/window.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -1043,7 +1043,8 @@ _SEH_END; if (!Wnd) /* Fall back to win32k... */ - Ret = NtUserGetWindow(hWnd, uCmd); + UNIMPLEMENTED; + Ret = NULL; return Ret; } Modified: branches/nwin32/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… ============================================================================== --- branches/nwin32/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/winpos.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -75,6 +75,9 @@ WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack) { + UNIMPLEMENTED; + return 0; +#if o MINMAXINFO MinMax; if(NtUserGetMinMaxInfo(hWnd, &MinMax, TRUE)) @@ -90,6 +93,7 @@ if (MaxTrack) *MaxTrack = MinMax.ptMaxTrackSize; } return 0; //FIXME: what does it return? +#endif } Modified: branches/nwin32/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -882,7 +882,6 @@ NtUserChangeDisplaySettings( PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, - HWND hwnd, DWORD dwflags, LPVOID lParam); @@ -1204,8 +1203,7 @@ NtUserFindExistingCursorIcon( HMODULE hModule, HRSRC hRsrc, - LONG cx, - LONG cy); + PPOINT Point); // FIXME: Verify! HWND NTAPI @@ -2127,11 +2125,9 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo); DWORD NTAPI Modified: branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -35,8 +35,7 @@ APIENTRY NtUserFindExistingCursorIcon(HMODULE hModule, HRSRC hRsrc, - LONG cx, - LONG cy) + PPOINT Point) { UNIMPLEMENTED; return NULL; @@ -86,15 +85,12 @@ return FALSE; } - BOOL -APIENTRY +NTAPI NtUserSetCursorIconData(HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo) { UNIMPLEMENTED; return FALSE; Modified: branches/nwin32/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -18,7 +18,6 @@ APIENTRY NtUserChangeDisplaySettings(PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, - HWND hWnd, DWORD dwflags, LPVOID lParam) {

1 0

[tkreuzer] 35696: enhance macros
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 09:16:04 2008 New Revision: 35696 URL: http://svn.reactos.org/svn/reactos?rev=35696&view=rev Log: enhance macros Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Wed Aug 27 09:16:04 2008 @@ -34,10 +34,10 @@ #define PtrToPfn(p) \ ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL) -#define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF) -#define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF) -#define VAtoPDI(va) (((va) >> PDI_SHIFT) & 0x1FF) -#define VAtoPTI(va) (((va) >> PTI_SHIFT) & 0x1FF) +#define VAtoPXI(va) ((((ULONG64)va) >> PXI_SHIFT) & 0x1FF) +#define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) +#define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) +#define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) #define HYPERSPACE_BASE 0xfffff70000000000ULL #define HAL_BASE 0xffffffff80000000ULL

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
86
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 August 2008