Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 56039: [NTOS]: Use ARM3 sections for the NLS mapping -- excercises both the system mapping as well as the per-process mapping. WorksForMe(c). Hopefully things will be better than last...
by sir_richard＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sir_richard Date: Mon Mar 5 17:10:51 2012 New Revision: 56039 URL: http://svn.reactos.org/svn/reactos?rev=56039&view=rev Log: [NTOS]: Use ARM3 sections for the NLS mapping -- excercises both the system mapping as well as the per-process mapping. WorksForMe(c). Hopefully things will be better than last time now, and their usage can increase. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=560… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Mar 5 17:10:51 2012 @@ -298,7 +298,7 @@ NULL, &SectionSize, PAGE_READWRITE, - SEC_COMMIT,// | 0x1, + SEC_COMMIT | 0x1, NULL); if (!NT_SUCCESS(Status)) {

1 0

[cgutman] 56038: [NTOSKRNL] - Use ARM3 hyperspace mapping calls instead of the legacy RosMm API
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 17:08:02 2012 New Revision: 56038 URL: http://svn.reactos.org/svn/reactos?rev=56038&view=rev Log: [NTOSKRNL] - Use ARM3 hyperspace mapping calls instead of the legacy RosMm API Modified: trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/reqtools.c Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Mon Mar 5 17:08:02 2012 @@ -290,11 +290,14 @@ if (!PageBuffer) return STATUS_NO_MEMORY; - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - Hyperspace = MmCreateHyperspaceMapping(Page); + Hyperspace = MiMapPageInHyperSpace(PsGetCurrentProcess(), Page, &OldIrql); + if (!Hyperspace) + { + ExFreePool(PageBuffer); + return STATUS_NO_MEMORY; + } RtlCopyMemory(PageBuffer, Hyperspace, PAGE_SIZE); - MmDeleteHyperspaceMapping(Hyperspace); - KeLowerIrql(OldIrql); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), Hyperspace, OldIrql); DPRINT("MiWriteBackPage(%wZ,%08x%08x,%s:%d)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart, File, Line); Status = MiSimpleWrite Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Mon Mar 5 17:08:02 2012 @@ -135,13 +135,16 @@ MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); } - OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - PageBuf = MmCreateHyperspaceMapping(*Page); + PageBuf = MiMapPageInHyperSpace(PsGetCurrentProcess(), *Page, &OldIrql); + if (!PageBuf) + { + MmReleasePageMemoryConsumer(RequiredResources->Consumer, *Page); + return STATUS_NO_MEMORY; + } RtlZeroMemory ((PCHAR)PageBuf+RequiredResources->Amount, PAGE_SIZE-RequiredResources->Amount); - MmDeleteHyperspaceMapping(PageBuf); - KfLowerIrql(OldIrql); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PageBuf, OldIrql); DPRINT("Read Status %x (Page %x)\n", Status, *Page);

1 0

[rharabien] 56037: [KBDHID][HIDPARSER] - Fix extended keys (scan-codes prefixed with E0) translation. Fixes Win-key.
by rharabien＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: rharabien Date: Mon Mar 5 17:07:15 2012 New Revision: 56037 URL: http://svn.reactos.org/svn/reactos?rev=56037&view=rev Log: [KBDHID][HIDPARSER] - Fix extended keys (scan-codes prefixed with E0) translation. Fixes Win-key. Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Mon Mar 5 17:07:15 2012 @@ -45,6 +45,7 @@ KEYBOARD_INPUT_DATA InputData; ULONG Index; PKBDHID_DEVICE_EXTENSION DeviceExtension; + CHAR Prefix = 0; /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; @@ -52,6 +53,13 @@ for(Index = 0; Index < Length; Index++) { DPRINT("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); + + /* check if this is E0 or E1 prefix */ + if (NewScanCodes[Index] == (CHAR)0xE0 || NewScanCodes[Index] == (CHAR)0xE1) + { + Prefix = NewScanCodes[Index]; + continue; + } /* init input data */ RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); @@ -59,14 +67,21 @@ /* use keyboard unit id */ InputData.UnitId = DeviceExtension->KeyboardTypematic.UnitId; - if (((UCHAR)(NewScanCodes[Index] & 0xFF))> 0x7F) + if (NewScanCodes[Index] & 0x80) { - /* scan codes greater than 0x7F are a key break */ + /* scan codes with 0x80 flag are a key break */ InputData.Flags |= KEY_BREAK; } + /* set a prefix if needed */ + if (Prefix) + { + InputData.Flags |= (Prefix == (CHAR)0xE0 ? KEY_E0 : KEY_E1); + Prefix = 0; + } + /* store key code */ - InputData.MakeCode = NewScanCodes[Index]; + InputData.MakeCode = NewScanCodes[Index] & 0x7F; /* dispatch scan codes */ KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Mon Mar 5 17:07:15 2012 @@ -12,26 +12,26 @@ #include "parser.h" static ULONG KeyboardScanCodes[256] = -{ - 0x0000, 0x0000, 0x0000, 0x0000, 0x001e, 0x0030, 0x002e, 0x0020, 0x0012, 0x0021, 0x0022, 0x0023, 0x0017, 0x0024, 0x0025, 0x0026, - 0x0032, 0x0031, 0x0018, 0x0019, 0x0010, 0x0013, 0x001f, 0x0014, 0x0016, 0x002f, 0x0011, 0x002d, 0x0015, 0x002c, 0x0002, 0x0003, - 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x001c, 0x0001, 0x000e, 0x000f, 0x0039, 0x000c, 0x000d, 0x001a, - 0x001b, 0x002b, 0x002b, 0x0027, 0x0028, 0x0029, 0x0033, 0x0034, 0x0035, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, - 0x0041, 0x0042, 0x0043, 0x0044, 0x0057, 0x0058, 0x0063, 0x0046, 0x0077, 0xE052, 0xE047, 0xE049, 0xE053, 0xE04F, 0xE051, 0xE04D, - 0xE04B, 0xE050, 0xE048, 0x0045, 0xE035, 0x0037, 0x004a, 0x004e, 0xE01C, 0x004f, 0x0050, 0x0051, 0x004b, 0x004c, 0x004d, 0x0047, - 0x0048, 0x0049, 0x0052, 0x0053, 0x0056, 0xE05D, 0xE05E, 0x0075, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, - 0x00bf, 0x00c0, 0x00c1, 0x00c2, 0x0086, 0x008a, 0x0082, 0x0084, 0x0080, 0x0081, 0x0083, 0x0089, 0x0085, 0x0087, 0x0088, 0x0071, - 0x0073, 0x0072, 0x0000, 0x0000, 0x0000, 0x0079, 0x0000, 0x0059, 0x005d, 0x007c, 0x005c, 0x005e, 0x005f, 0x0000, 0x0000, 0x0000, - 0x007a, 0x007b, 0x005a, 0x005b, 0x0055, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x001D, 0x002A, 0x0038, 0xE05B, 0xE01D, 0x0036, 0xE038, 0xE05C, 0x00a4, 0x00a6, 0x00a5, 0x00a3, 0x00a1, 0x0073, 0x0072, 0x0071, - 0x0096, 0x009e, 0x009f, 0x0080, 0x0088, 0x00b1, 0x00b2, 0x00b0, 0x008e, 0x0098, 0x00ad, 0x008c, 0x0000, 0x0000, 0x0000, 0x0000, +{ /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ +/* 0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x001e, 0x0030, 0x002e, 0x0020, 0x0012, 0x0021, 0x0022, 0x0023, 0x0017, 0x0024, 0x0025, 0x0026, +/* 1 */ 0x0032, 0x0031, 0x0018, 0x0019, 0x0010, 0x0013, 0x001f, 0x0014, 0x0016, 0x002f, 0x0011, 0x002d, 0x0015, 0x002c, 0x0002, 0x0003, +/* 2 */ 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x001c, 0x0001, 0x000e, 0x000f, 0x0039, 0x000c, 0x000d, 0x001a, +/* 3 */ 0x001b, 0x002b, 0x002b, 0x0027, 0x0028, 0x0029, 0x0033, 0x0034, 0x0035, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, +/* 4 */ 0x0041, 0x0042, 0x0043, 0x0044, 0x0057, 0x0058, 0x0063, 0x0046, 0x0077, 0xE052, 0xE047, 0xE049, 0xE053, 0xE04F, 0xE051, 0xE04D, +/* 5 */ 0xE04B, 0xE050, 0xE048, 0x0045, 0xE035, 0x0037, 0x004a, 0x004e, 0xE01C, 0x004f, 0x0050, 0x0051, 0x004b, 0x004c, 0x004d, 0x0047, +/* 6 */ 0x0048, 0x0049, 0x0052, 0x0053, 0x0056, 0xE05D, 0xE05E, 0x0075, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, +/* 7 */ 0x00bf, 0x00c0, 0x00c1, 0x00c2, 0x0086, 0x008a, 0x0082, 0x0084, 0x0080, 0x0081, 0x0083, 0x0089, 0x0085, 0x0087, 0x0088, 0x0071, +/* 8 */ 0x0073, 0x0072, 0x0000, 0x0000, 0x0000, 0x0079, 0x0000, 0x0059, 0x005d, 0x007c, 0x005c, 0x005e, 0x005f, 0x0000, 0x0000, 0x0000, +/* 9 */ 0x007a, 0x007b, 0x005a, 0x005b, 0x0055, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +/* A */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +/* B */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +/* C */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +/* D */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +/* E */ 0x001D, 0x002A, 0x0038, 0xE05B, 0xE01D, 0x0036, 0xE038, 0xE05C, 0x00a4, 0x00a6, 0x00a5, 0x00a3, 0x00a1, 0x0073, 0x0072, 0x0071, +/* F */ 0x0096, 0x009e, 0x009f, 0x0080, 0x0088, 0x00b1, 0x00b2, 0x00b0, 0x008e, 0x0098, 0x00ad, 0x008c, 0x0000, 0x0000, 0x0000, 0x0000, }; -//#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) +#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) HIDPARSER_STATUS HidParser_GetCollectionUsagePage( @@ -737,7 +737,6 @@ return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN; } -#if 0 if ((ScanCode & 0xE000) == 0xE000) { // @@ -745,7 +744,6 @@ // ScanCode = NTOHS(ScanCode); } -#endif // // FIXME: translate modifier states

1 0

[cgutman] 56036: [NTOS] - Fix a broken assertion
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 16:48:26 2012 New Revision: 56036 URL: http://svn.reactos.org/svn/reactos?rev=56036&view=rev Log: [NTOS] - Fix a broken assertion Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Mon Mar 5 16:48:26 2012 @@ -134,7 +134,7 @@ else { /* This is a section VAD. Store the MAREA here for now */ - ASSERT(Vad->u4.Banked = (PVOID)0xDEADBABE); + ASSERT(Vad->u4.Banked == (PVOID)0xDEADBABE); Vad->u4.Banked = (PVOID)MemoryArea; } }

1 0

[sir_richard] 56035: Two Part Patch which fixes ARM3 Section Support (not yet enabled). This had been enabled in the past for testing and resulted in bizare crashes during testing. The amount of fi...
by sir_richard＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sir_richard Date: Mon Mar 5 16:41:46 2012 New Revision: 56035 URL: http://svn.reactos.org/svn/reactos?rev=56035&view=rev Log: Two Part Patch which fixes ARM3 Section Support (not yet enabled). This had been enabled in the past for testing and resulted in bizare crashes during testing. The amount of fixing required should reveal why: Part 1: Page Fault Path Fixes [NTOS]: As an optimization, someone seems to have had changed the MiResolveDemandZeroFault prototype not to require a PTE, and to instead take a protection mask directly. While clever, this broke support for ARM3 sections, because the code was now assuming that the protection of the PTE for the input address should be used -- while in NT Sections we instead use what are called ProtoType PTEs. This was very annoying to debug, but since the cause has been fixed, I've reverted back to the old convention in which the PTE is passed-in, and this can be a different PTE than the PTE for the address, as it should be. [NTOS]: Due to the reverting of the original path, another optimization, in which MiResolveDemandZeroFault was being called directly instead of going through MiDispatchFault and writing an invalid demand-zero PDE has also been removed. PDE faults are now going through the correct, expected path. [NTOS]: MiResolveDemandZeroFault was always creating Kernel PTEs. It should create User PTEs when necessary. [NTOS]: MiDeletePte was assuming any prototype PTE is a forked PTE. Forked PTEs only happen when the addresses in the PTE don't match, so check for that too. Part 2: ARM3 Section Object Fixes [NTOS]: Fix issue when trying to make both ROS_SECTION_OBJECTs and NT's SECTION co-exist. We relied on the *caller* knowing what kind of section this is, and that can't be a good idea. Now, when the caller requests an ARM3 section vs a ROS section, we use a marker to detect what kind of section this is for later APIs. [NTOS]: For section VADs, we were storing the ReactOS MEMORY_AREA in the ControlArea... however, the mappings of one individual section object share a single control area, even though they have multiple MEMORY_AREAs (one for each mapping). As such, we overwrote the MEMORY_AREA continously, and at free-time, double or triple-freed the same memory area. [NTOS]: Moved the MEMORY_AREA to the "Banked" field of the long VAD, instead of the ControlArea. Allocate MMVAD_LONGs for ARM3 sections for now, to support this. Also, after deleting the MEMORY_AREA while parsing VADs, we now use a special marker to detect double-frees, and we also use a special marker to make sure we have a Long VAD as expected. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=560… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -298,7 +298,7 @@ NULL, &SectionSize, PAGE_READWRITE, - SEC_COMMIT, + SEC_COMMIT,// | 0x1, NULL); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -1544,6 +1544,15 @@ // // New ARM3<->RosMM PAGE Architecture // +BOOLEAN +FORCEINLINE +MiIsRosSectionObject(IN PVOID Section) +{ + PROS_SECTION_OBJECT RosSection = Section; + if ((RosSection->Type == 'SC') && (RosSection->Size == 'TN')) return TRUE; + return FALSE; +} + #ifdef _WIN64 // HACK ON TOP OF HACK ALERT!!! #define MI_GET_ROS_DATA(x) \ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -247,12 +247,11 @@ NTSTATUS NTAPI MiResolveDemandZeroFault(IN PVOID Address, - IN ULONG Protection, + IN PMMPTE PointerPte, IN PEPROCESS Process, IN KIRQL OldIrql) { PFN_NUMBER PageFrameNumber = 0; - PMMPTE PointerPte = MiAddressToPte(Address); MMPTE TempPte; BOOLEAN NeedZero = FALSE, HaveLock = FALSE; ULONG Color; @@ -342,11 +341,23 @@ /* Zero the page if need be */ if (NeedZero) MiZeroPfn(PageFrameNumber); - /* Build the PTE */ - MI_MAKE_HARDWARE_PTE(&TempPte, - PointerPte, - Protection, - PageFrameNumber); + /* Fault on user PDE, or fault on user PTE? */ + if (PointerPte <= MiHighestUserPte) + { + /* User fault, build a user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameNumber); + } + else + { + /* This is a user-mode PDE, create a kernel PTE for it */ + MI_MAKE_HARDWARE_PTE(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameNumber); + } /* Set it dirty if it's a writable page */ if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); @@ -494,7 +505,7 @@ /* Resolve the demand zero fault */ Status = MiResolveDemandZeroFault(Address, - (ULONG)PointerProtoPte->u.Soft.Protection, + PointerProtoPte, Process, OldIrql); ASSERT(NT_SUCCESS(Status)); @@ -639,7 +650,7 @@ // we want. Go handle it! // Status = MiResolveDemandZeroFault(Address, - (ULONG)PointerPte->u.Soft.Protection, + PointerPte, Process, MM_NOIRQL); ASSERT(KeAreAllApcsDisabled() == TRUE); @@ -884,36 +895,40 @@ #endif #if (_MI_PAGING_LEVELS == 4) +// Note to Timo: You should call MiCheckVirtualAddress and also check if it's zero pte +// also this is missing the page count increment /* Check if the PXE is valid */ if (PointerPxe->u.Hard.Valid == 0) { /* Right now, we only handle scenarios where the PXE is totally empty */ ASSERT(PointerPxe->u.Long == 0); - +#if 0 /* Resolve a demand zero fault */ Status = MiResolveDemandZeroFault(PointerPpe, MM_READWRITE, CurrentProcess, MM_NOIRQL); - +#endif /* We should come back with a valid PXE */ ASSERT(PointerPxe->u.Hard.Valid == 1); } #endif #if (_MI_PAGING_LEVELS >= 3) +// Note to Timo: You should call MiCheckVirtualAddress and also check if it's zero pte +// also this is missing the page count increment /* Check if the PPE is valid */ if (PointerPpe->u.Hard.Valid == 0) { /* Right now, we only handle scenarios where the PPE is totally empty */ ASSERT(PointerPpe->u.Long == 0); - +#if 0 /* Resolve a demand zero fault */ Status = MiResolveDemandZeroFault(PointerPde, MM_READWRITE, CurrentProcess, MM_NOIRQL); - +#endif /* We should come back with a valid PPE */ ASSERT(PointerPpe->u.Hard.Valid == 1); } @@ -929,11 +944,33 @@ #if MI_TRACE_PFNS UserPdeFault = TRUE; #endif - /* Resolve a demand zero fault */ - Status = MiResolveDemandZeroFault(PointerPte, - MM_READWRITE, - CurrentProcess, - MM_NOIRQL); + MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + if (ProtectionCode == MM_NOACCESS) + { +#if (_MI_PAGING_LEVELS == 2) + /* Could be a page table for paged pool */ + MiCheckPdeForPagedPool(Address); +#endif + /* Has the code above changed anything -- is this now a valid PTE? */ + Status = (PointerPte->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; + + /* Either this was a bogus VA or we've fixed up a paged pool PDE */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return Status; + } + + /* Write a demand-zero PDE */ + MI_WRITE_INVALID_PTE(PointerPde, DemandZeroPde); + + /* Dispatch the fault */ + Status = MiDispatchFault(TRUE, + PointerPte, + PointerPde, + NULL, + FALSE, + PsGetCurrentProcess(), + TrapInformation, + NULL); #if MI_TRACE_PFNS UserPdeFault = FALSE; #endif @@ -951,7 +988,7 @@ { /* Resolve the fault */ MiResolveDemandZeroFault(Address, - (ULONG)PointerPte->u.Soft.Protection, + PointerPte, CurrentProcess, MM_NOIRQL); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -694,7 +694,7 @@ IN ULONG_PTR ZeroBits, IN ULONG AllocationType) { - PMMVAD Vad; + PMMVAD_LONG Vad; PETHREAD Thread = PsGetCurrentThread(); ULONG_PTR StartAddress, EndingAddress; PSUBSECTION Subsection; @@ -799,9 +799,11 @@ EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); /* A VAD can now be allocated. Do so and zero it out */ - Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'ldaV'); + /* FIXME: we are allocating a LONG VAD for ReactOS compatibility only */ + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); ASSERT(Vad); - RtlZeroMemory(Vad, sizeof(MMVAD)); + RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); + Vad->u4.Banked = (PVOID)0xDEADBABE; /* Write all the data required in the VAD for handling a fault */ Vad->StartingVpn = StartAddress >> PAGE_SHIFT; @@ -833,7 +835,7 @@ MiLockProcessWorkingSet(Process, Thread); /* Insert the VAD */ - MiInsertVad(Vad, Process); + MiInsertVad((PMMVAD)Vad, Process); /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); @@ -844,6 +846,7 @@ /* Finally, let the caller know where, and for what size, the view was mapped */ *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; *BaseAddress = (PVOID)StartAddress; + DPRINT1("Start and region: 0x%p, 0x%p\n", *BaseAddress, *ViewSize); return STATUS_SUCCESS; } @@ -961,10 +964,10 @@ ASSERT(SectionObject != NULL); /* Check if it's an ARM3, or ReactOS section */ - if ((ULONG_PTR)SectionObject & 1) + if (MiIsRosSectionObject(SectionObject) == FALSE) { /* Return the file pointer stored in the control area */ - Section = (PVOID)((ULONG_PTR)SectionObject & ~1); + Section = SectionObject; return Section->Segment->ControlArea->FilePointer; } @@ -1012,10 +1015,10 @@ PFILE_OBJECT FileObject; /* Make sure it's an image section */ - if ((ULONG_PTR)Section & 1) + if (MiIsRosSectionObject(Section) == FALSE) { /* Check ARM3 Section flag */ - if (((PSECTION)((ULONG_PTR)Section & ~1))->u.Flags.Image == 0) + if (((PSECTION)Section)->u.Flags.Image == 0) { /* It's not, fail */ DPRINT1("Not an image section\n"); @@ -1323,6 +1326,9 @@ NTSTATUS Status; PAGED_CODE(); + /* Force PAGE_READWRITE for everything, for now */ + Protect = PAGE_READWRITE; + /* Get the segment and control area */ Section = (PSECTION)SectionObject; ControlArea = Section->Segment->ControlArea; @@ -1334,7 +1340,6 @@ ASSERT((AllocationType & MEM_RESERVE) == 0); ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); - #if 0 /* FIXME: Check if the mapping protection is compatible with the create */ if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect)) @@ -1416,6 +1421,7 @@ if (!Process->VmDeleted) { /* Do the actual mapping */ + DPRINT1("Mapping ARM3 data section\n"); Status = MiMapViewOfDataSection(ControlArea, Process, BaseAddress, @@ -1498,11 +1504,11 @@ PVOID AddressSpace; PMEMORY_AREA MemoryArea1, MemoryArea2; PROS_SECTION_OBJECT Section1, Section2; - + /* Lock address space */ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); - + /* Locate the memory area for the process by address */ MemoryArea1 = MmLocateMemoryAreaByAddress(AddressSpace, File1MappedAsAnImage); if (!MemoryArea1) @@ -1511,7 +1517,7 @@ MmUnlockAddressSpace(AddressSpace); return STATUS_INVALID_ADDRESS; } - + /* Check if it's a section view (RosMm section) or ARM3 section */ if (MemoryArea1->Type != MEMORY_AREA_SECTION_VIEW) { @@ -1519,15 +1525,15 @@ MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } - + /* Get the section pointer to the SECTION_OBJECT */ Section1 = MemoryArea1->Data.SectionData.Section; if (Section1->FileObject == NULL) { MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - + return STATUS_CONFLICTING_ADDRESSES; + } + /* Locate the memory area for the process by address */ MemoryArea2 = MmLocateMemoryAreaByAddress(AddressSpace, File2MappedAsFile); if (!MemoryArea2) @@ -1536,7 +1542,7 @@ MmUnlockAddressSpace(AddressSpace); return STATUS_INVALID_ADDRESS; } - + /* Check if it's a section view (RosMm section) or ARM3 section */ if (MemoryArea2->Type != MEMORY_AREA_SECTION_VIEW) { @@ -1544,23 +1550,23 @@ MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } - + /* Get the section pointer to the SECTION_OBJECT */ Section2 = MemoryArea2->Data.SectionData.Section; if (Section2->FileObject == NULL) { MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - + return STATUS_CONFLICTING_ADDRESSES; + } + /* The shared cache map seems to be the same if both of these are equal */ if (Section1->FileObject->SectionObjectPointer->SharedCacheMap == Section2->FileObject->SectionObjectPointer->SharedCacheMap) { MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; - } - + return STATUS_SUCCESS; + } + /* Unlock address space */ MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_SAME_DEVICE; Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -97,13 +97,13 @@ IN PMMADDRESS_NODE Parent, IN TABLE_SEARCH_RESULT Result) { - PMMVAD Vad; + PMMVAD_LONG Vad; /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ - Vad = (PMMVAD)NewNode; + Vad = (PMMVAD_LONG)NewNode; if (Vad->u.VadFlags.Spare == 0) { NTSTATUS Status; @@ -129,14 +129,13 @@ if (Vad->ControlArea == NULL) { /* We store the reactos MEMORY_AREA here */ - DPRINT("Storing %p in %p\n", MemoryArea, Vad); Vad->FirstPrototypePte = (PMMPTE)MemoryArea; } else { /* This is a section VAD. Store the MAREA here for now */ - DPRINT("Storing %p in %p\n", MemoryArea, Vad); - Vad->ControlArea->WaitingForDeletion = (PVOID)MemoryArea; + ASSERT(Vad->u4.Banked = (PVOID)0xDEADBABE); + Vad->u4.Banked = (PVOID)MemoryArea; } } } @@ -167,7 +166,7 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table) { - PMMVAD Vad; + PMMVAD_LONG Vad; /* Call the AVL code */ RtlpDeleteAvlTreeNode(Table, Node); @@ -184,7 +183,7 @@ } /* Free the node from ReactOS view as well */ - Vad = (PMMVAD)Node; + Vad = (PMMVAD_LONG)Node; if (Vad->u.VadFlags.Spare == 0) { PMEMORY_AREA MemoryArea; @@ -199,12 +198,15 @@ else { /* This is a section VAD. We store the ReactOS MEMORY_AREA here */ - MemoryArea = (PMEMORY_AREA)Vad->ControlArea->WaitingForDeletion; + MemoryArea = (PMEMORY_AREA)Vad->u4.Banked; } /* Make sure one actually still exists */ if (MemoryArea) { + /* Make sure we have not already freed it */ + ASSERT(MemoryArea != (PVOID)0xDEADBAB1); + /* Get the process */ Process = CONTAINING_RECORD(Table, EPROCESS, VadRoot); @@ -214,6 +216,18 @@ /* Free it */ MmFreeMemoryArea(&Process->Vm, MemoryArea, NULL, NULL); + + /* Check if this is VM VAD */ + if (Vad->ControlArea == NULL) + { + /* Delete the pointer to it */ + Vad->FirstPrototypePte = (PVOID)0xDEADBAB1; + } + else + { + /* Delete the pointer to it */ + Vad->u4.Banked = (PVOID)0xDEADBAB1; + } } } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -258,7 +258,7 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); /* Either a fork, or this is the shared user data page */ - if (PointerPte <= MiHighestUserPte) + if ((PointerPte <= MiHighestUserPte) && (PrototypePte != Pfn1->PteAddress)) { /* If it's not the shared user page, then crash, since there's no fork() yet */ if ((PAGE_ALIGN(VirtualAddress) != (PVOID)USER_SHARED_DATA) || Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -222,11 +222,16 @@ NTSTATUS NTAPI -MiResolveDemandZeroFault(IN PVOID Address, - IN ULONG Protection, - IN PEPROCESS Process, - IN KIRQL OldIrql); -VOID +MiDispatchFault(IN BOOLEAN StoreInstruction, + IN PVOID Address, + IN PMMPTE PointerPte, + IN PMMPTE PointerProtoPte, + IN BOOLEAN Recursive, + IN PEPROCESS Process, + IN PVOID TrapInformation, + IN PVOID Vad); + +NTSTATUS NTAPI MiFillSystemPageDirectory(IN PVOID Base, IN SIZE_T NumberOfBytes); @@ -280,14 +285,23 @@ Pt = (PULONG)MiAddressToPte(Address); if (PointerPde->u.Hard.Valid == 0) { + NTSTATUS Status; if (Create == FALSE) { return NULL; } - MiResolveDemandZeroFault(Pt, - MM_READWRITE, - Process, - MM_NOIRQL); + ASSERT(PointerPde->u.Long == 0); + + MI_WRITE_INVALID_PTE(PointerPde, DemandZeroPde); + Status = MiDispatchFault(TRUE, + Pt, + PointerPde, + NULL, + FALSE, + PsGetCurrentProcess(), + NULL, + NULL); + ASSERT(KeAreAllApcsDisabled() == TRUE); ASSERT(PointerPde->u.Hard.Valid == 1); } return (PULONG)MiAddressToPte(Address); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Mar 5 16:41:46 2012 @@ -2917,6 +2917,8 @@ * Initialize it */ RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); + Section->Type = 'SC'; + Section->Size = 'TN'; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; Section->MaximumSize = MaximumSize; @@ -2989,6 +2991,8 @@ * Initialize it */ RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); + Section->Type = 'SC'; + Section->Size = 'TN'; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; @@ -3845,6 +3849,8 @@ * Initialize it */ RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); + Section->Type = 'SC'; + Section->Size = 'TN'; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; @@ -4530,9 +4536,10 @@ NTSTATUS Status = STATUS_SUCCESS; BOOLEAN NotAtBase = FALSE; - if ((ULONG_PTR)SectionObject & 1) - { - return MmMapViewOfArm3Section((PVOID)((ULONG_PTR)SectionObject & ~1), + if (MiIsRosSectionObject(SectionObject) == FALSE) + { + DPRINT1("Mapping ARM3 section into %s\n", Process->ImageFileName); + return MmMapViewOfArm3Section(SectionObject, Process, BaseAddress, ZeroBits, @@ -4866,9 +4873,10 @@ NTSTATUS Status; PAGED_CODE(); - if ((ULONG_PTR)SectionObject & 1) + if (MiIsRosSectionObject(SectionObject) == FALSE) { - return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1), + DPRINT1("ARM3 System Mapping\n"); + return MiMapViewInSystemSpace(SectionObject, &MmSession, MappedBase, ViewSize); @@ -5004,7 +5012,7 @@ /* Check if an ARM3 section is being created instead */ if (AllocationAttributes & 1) { - DPRINT1("arm 3 path\n"); + DPRINT1("Creating ARM3 section\n"); return MmCreateArm3Section(Section, DesiredAccess, ObjectAttributes,

1 0

[sginsberg] 56034: [NTOS] - Fix handling of command strings in KdpTrap.
by sginsberg＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sginsberg Date: Mon Mar 5 14:52:03 2012 New Revision: 56034 URL: http://svn.reactos.org/svn/reactos?rev=56034&view=rev Log: [NTOS] - Fix handling of command strings in KdpTrap. Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Mon Mar 5 14:52:03 2012 @@ -231,6 +231,7 @@ TrapFrame, ExceptionFrame); Handled = TRUE; + break; /* Anything else, do nothing */ default:

1 0

[cgutman] 56033: [USBSTOR] - Deny removal to fix a race with the legacy disk class driver
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 14:42:05 2012 New Revision: 56033 URL: http://svn.reactos.org/svn/reactos?rev=56033&view=rev Log: [USBSTOR] - Deny removal to fix a race with the legacy disk class driver Modified: trunk/reactos/drivers/usb/usbstor/fdo.c trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Mon Mar 5 14:42:05 2012 @@ -374,11 +374,15 @@ case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE: { +#if 0 // // we can if nothing is pending // if (DeviceExtension->IrpPendingCount != 0 || DeviceExtension->ActiveSrb != NULL) +#else + if (TRUE) +#endif { /* We have pending requests */ DPRINT1("Failing removal/stop request due to pending requests present\n"); Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Mon Mar 5 14:42:05 2012 @@ -905,10 +905,14 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // if we're not claimed it's ok // if (DeviceExtension->Claimed) +#else + if (TRUE) +#endif { Status = STATUS_UNSUCCESSFUL; DPRINT1("[USBSTOR] Request %x fails because device is still claimed\n", IoStack->MinorFunction);

1 0

[tkreuzer] 56032: [WIN32K] - Don't check for presence of driver functions that are not mandatory - Pass graphics device, devmode and log address to PDEVOBJ_CreatePDEV to make it work
by tkreuzer＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: tkreuzer Date: Mon Mar 5 13:30:37 2012 New Revision: 56032 URL: http://svn.reactos.org/svn/reactos?rev=56032&view=rev Log: [WIN32K] - Don't check for presence of driver functions that are not mandatory - Pass graphics device, devmode and log address to PDEVOBJ_CreatePDEV to make it work Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Mon Mar 5 13:30:37 2012 @@ -264,8 +264,7 @@ /* Check if the neccessary functions are there */ if ((!pldev->pfn.EnablePDEV) || - (!pldev->pfn.CompletePDEV) || - (!pldev->pfn.UnloadFontFile)) + (!pldev->pfn.CompletePDEV)) { DPRINT1("Missing function for gdi driver\n"); return FALSE; @@ -276,7 +275,6 @@ if ((!pldev->pfn.AssertMode) || (!pldev->pfn.EnableSurface) || (!pldev->pfn.DisableSurface) || - (!pldev->pfn.DisableDriver) || (!pldev->pfn.DisablePDEV) || (!pldev->pfn.GetModes)) { Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Mar 5 13:30:37 2012 @@ -7,8 +7,7 @@ */ #include <win32k.h> -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(EngPDev); PPDEVOBJ gppdevPrimary = NULL; @@ -104,8 +103,7 @@ PWSTR pwszLogAddress) { PFN_DrvEnablePDEV pfnEnablePDEV; - - DPRINT("PDEVOBJ_bEnablePDEV()\n"); + TRACE("PDEVOBJ_bEnablePDEV()\n"); /* Get the DrvEnablePDEV function */ pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; @@ -136,8 +134,7 @@ /* Setup Palette */ ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); - DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); - + TRACE("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); return TRUE; } @@ -153,16 +150,18 @@ PPDEVOBJ NTAPI PDEVOBJ_CreatePDEV( - PLDEVOBJ pldev) + PLDEVOBJ pldev, + PGRAPHICS_DEVICE pGraphicsDevice, + PDEVMODEW pdevmode, + PWSTR pwszLogAddress) { PPDEVOBJ ppdev; - LDEVTYPE ldevtype; /* Allocate a new PDEVOBJ */ ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV); if (!ppdev) { - DPRINT1("failed to allocate a PDEV\n"); + ERR("failed to allocate a PDEV\n"); return FALSE; } @@ -177,37 +176,61 @@ /* Copy the function table from the LDEVOBJ */ ppdev->pfn = ppdev->pldev->pfn; + /* Set the graphics device */ + ppdev->pGraphicsDevice = pGraphicsDevice; + /* Allocate the device lock semaphore */ ppdev->hsemDevLock = EngCreateSemaphore(); if (!ppdev->hsemDevLock) { - DPRINT1("Failed to create semaphore\n"); + ERR("Failed to create semaphore\n"); ExFreePoolWithTag(ppdev, GDITAG_PDEV); return FALSE; } /* Call the drivers DrvEnablePDEV function */ - if (!PDEVOBJ_bEnablePDEV(ppdev, NULL, NULL)) - { - DPRINT1("Failed to enable PDEV\n"); + if (!PDEVOBJ_bEnablePDEV(ppdev, pdevmode, NULL)) + { + ERR("Failed to enable PDEV\n"); EngDeleteSemaphore(ppdev->hsemDevLock); ExFreePoolWithTag(ppdev, GDITAG_PDEV); return FALSE; } - /* Set flags based on the LDEV type */ - ldevtype = pldev->ldevtype; - if (ldevtype == LDEV_DEVICE_MIRROR) ppdev->flFlags |= PDEV_CLONE_DEVICE; - else if (ldevtype == LDEV_DEVICE_DISPLAY) ppdev->flFlags |= PDEV_DISPLAY; - else if (ldevtype == LDEV_DEVICE_PRINTER) ppdev->flFlags |= PDEV_PRINTER; - else if (ldevtype == LDEV_DEVICE_META) ppdev->flFlags |= PDEV_META_DEVICE; - else if (ldevtype == LDEV_FONT) ppdev->flFlags |= PDEV_FONTDRIVER; + /* Check what type of driver this is */ + if (pldev->ldevtype == LDEV_DEVICE_DISPLAY) + { + /* This is a display device */ + ppdev->flFlags |= PDEV_DISPLAY; + + /* Check if the driver supports a hardware pointer */ + if (ppdev->pfn.SetPointerShape && ppdev->pfn.MovePointer) + { + ppdev->flFlags |= PDEV_HARDWARE_POINTER; + //ppdev->pfnDrvSetPointerShape = ppdev->pfn.SetPointerShape; + ppdev->pfnMovePointer = ppdev->pfn.MovePointer; + } + else + { + ppdev->flFlags |= PDEV_SOFTWARE_POINTER; + //ppdev->pfnDrvSetPointerShape = EngSetPointerShape; + ppdev->pfnMovePointer = EngMovePointer; + } + + } + else if (pldev->ldevtype == LDEV_DEVICE_MIRROR) + ppdev->flFlags |= PDEV_CLONE_DEVICE; + else if (pldev->ldevtype == LDEV_DEVICE_PRINTER) + ppdev->flFlags |= PDEV_PRINTER; + else if (pldev->ldevtype == LDEV_DEVICE_META) + ppdev->flFlags |= PDEV_META_DEVICE; + else if (pldev->ldevtype == LDEV_FONT) + ppdev->flFlags |= PDEV_FONTDRIVER; /* Check if the driver supports fonts */ if (ppdev->devinfo.cFonts != 0) ppdev->flFlags |= PDEV_GOTFONTS; - if (ppdev->pfn.MovePointer) ppdev->flFlags |= PDEV_HARDWARE_POINTER; - + /* Check for a gamma ramp table */ if (ppdev->pvGammaRamp) ppdev->flFlags |= PDEV_GAMMARAMP_TABLE; /* Call the drivers DrvCompletePDEV function */ @@ -238,7 +261,7 @@ ppdev->pSurface = SURFACE_ShareLockSurface(hsurf); } - DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); + TRACE("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; } @@ -290,7 +313,7 @@ PGRAPHICS_DEVICE pGraphicsDevice; PLDEVOBJ pldev; PPDEVOBJ ppdev; - DPRINT("EngCreateDisplayPDEV(%wZ, %p)\n", pustrDeviceName, pdm); + TRACE("EngCreateDisplayPDEV(%wZ, %p)\n", pustrDeviceName, pdm); /* Try to find the GRAPHICS_DEVICE */ if (pustrDeviceName) @@ -298,8 +321,8 @@ pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0); if (!pGraphicsDevice) { - DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", - pustrDeviceName ? pustrDeviceName->Buffer : 0); + ERR("No GRAPHICS_DEVICE found for %ls!\n", + pustrDeviceName ? pustrDeviceName->Buffer : 0); return NULL; } } @@ -313,34 +336,27 @@ { /* ... use the device's default one */ pdm = pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; - DPRINT("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); + TRACE("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); } /* Try to get a diplay driver */ pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); if (!pldev) { - DPRINT1("Could not load display driver '%ls', '%s'\n", - pGraphicsDevice->pDiplayDrivers, - pdm->dmDeviceName); + ERR("Could not load display driver '%ls', '%s'\n", + pGraphicsDevice->pDiplayDrivers, pdm->dmDeviceName); return NULL; } /* Create a new PDEVOBJ */ - ppdev = PDEVOBJ_CreatePDEV(pldev); + ppdev = PDEVOBJ_CreatePDEV(pldev, pGraphicsDevice, pdm, NULL); if (!ppdev) { - DPRINT1("failed to allocate a PDEV\n"); + ERR("failed to create a PDEV\n"); EngUnloadImage(pldev); return FALSE; } - /* Set MovePointer function */ - ppdev->pfnMovePointer = ppdev->pfn.MovePointer; - if (!ppdev->pfnMovePointer) - ppdev->pfnMovePointer = EngMovePointer; - - ppdev->pGraphicsDevice = pGraphicsDevice; // Should we change the ative mode of pGraphicsDevice ? ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; @@ -417,21 +433,21 @@ PPDEVOBJ ppdevTmp; PSURFACE pSurface; BOOL retval = FALSE; + TRACE("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); + /* And everything else */ EngAcquireSemaphore(ghsemPDEV); - DPRINT1("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); - // Lookup the GraphicsDevice + select DEVMODE // pdm = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); /* 1. Temporarily disable the current PDEV */ if (!ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE)) { - DPRINT1("DrvAssertMode failed\n"); + ERR("DrvAssertMode failed\n"); goto leave; } @@ -440,7 +456,7 @@ ppdevTmp = EngCreateDisplayPDEV(&ustrDevice, pdm); if (!ppdevTmp) { - DPRINT1("Failed to create a new PDEV\n"); + ERR("Failed to create a new PDEV\n"); goto leave; } @@ -448,7 +464,7 @@ pSurface = PDEVOBJ_pSurface(ppdevTmp); if (!pSurface) { - DPRINT1("DrvEnableSurface failed\n"); + ERR("DrvEnableSurface failed\n"); goto leave; } @@ -476,8 +492,7 @@ EngReleaseSemaphore(ppdev->hsemDevLock); EngReleaseSemaphore(ghsemPDEV); - DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); - + TRACE("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); return retval; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Mon Mar 5 13:30:37 2012 @@ -278,7 +278,7 @@ } /* Create a new PDEVOBJ */ - ppdev = PDEVOBJ_CreatePDEV(pldev); + ppdev = PDEVOBJ_CreatePDEV(pldev, NULL, NULL, NULL); if (!ppdev) { DPRINT1("failed to allocate a PDEV\n"); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Mon Mar 5 13:30:37 2012 @@ -183,7 +183,10 @@ PPDEVOBJ NTAPI PDEVOBJ_CreatePDEV( - struct _LDEVOBJ *pldev); + struct _LDEVOBJ *pldev, + PGRAPHICS_DEVICE pGraphicsDevice, + PDEVMODEW pdevmode, + PWSTR pwszLogAddress); BOOL NTAPI

1 0

[sginsberg] 56031: [PSDK] - Update DBGKD_MAJOR_TYPES. Dedicated to Alex ; )
by sginsberg＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sginsberg Date: Mon Mar 5 13:02:21 2012 New Revision: 56031 URL: http://svn.reactos.org/svn/reactos?rev=56031&view=rev Log: [PSDK] - Update DBGKD_MAJOR_TYPES. Dedicated to Alex ;) Modified: trunk/reactos/include/psdk/wdbgexts.h Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Mon Mar 5 13:02:21 2012 @@ -38,6 +38,7 @@ DBGKD_MAJOR_TNT, DBGKD_MAJOR_SINGULARITY, DBGKD_MAJOR_HYPERVISOR, + DBGKD_MAJOR_MIDORI, DBGKD_MAJOR_COUNT } DBGKD_MAJOR_TYPES;

1 0

[tkreuzer] 56030: [GDI32] Temporary disable gdi batch handling for fonts in SelectObject
by tkreuzer＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: tkreuzer Date: Mon Mar 5 13:01:51 2012 New Revision: 56030 URL: http://svn.reactos.org/svn/reactos?rev=56030&view=rev Log: [GDI32] Temporary disable gdi batch handling for fonts in SelectObject Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/dc.c Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/dll/win… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Mar 5 13:01:51 2012 @@ -1589,7 +1589,7 @@ pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS; pDc_Attr->ulDirty_ |= DIRTY_CHARSET; pDc_Attr->hlfntNew = hGdiObj; - +#if 0 if (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)) { PGDIBSOBJECT pgO; @@ -1601,7 +1601,7 @@ return hOldObj; } } - +#endif // default for select object font return NtGdiSelectFont(hDC, hGdiObj);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs