Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 50111: [NTOS] - Fix copypasta, thanks Victor!
by fireball＠svn.reactos.org 23 Dec '10

23 Dec '10

Author: fireball Date: Thu Dec 23 09:14:42 2010 New Revision: 50111 URL: http://svn.reactos.org/svn/reactos?rev=50111&view=rev Log: [NTOS] - Fix copypasta, thanks Victor! Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c 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] Thu Dec 23 09:14:42 2010 @@ -2458,7 +2458,7 @@ ASSERT(BaseVpn > Vad->EndingVpn); /* Stop if there is no right child */ - if (!Vad->LeftChild) break; + if (!Vad->RightChild) break; /* Search on the right next */ Vad = Vad->RightChild;

1 0

[arty] 50110: Do the required flush when the last reference to a cache stripe is released. The installer now completes given enough ram in NEWCC=1, and writes an understandable FS. There's at least...
by arty＠svn.reactos.org 23 Dec '10

23 Dec '10

Author: arty Date: Thu Dec 23 08:42:51 2010 New Revision: 50110 URL: http://svn.reactos.org/svn/reactos?rev=50110&view=rev Log: Do the required flush when the last reference to a cache stripe is released. The installer now completes given enough ram in NEWCC=1, and writes an understandable FS. There's at least one more problem preventing the resulting installation from booting however. Fix a bug in rmap where we were checking the next (unfortunately named current) rmap for a segment membership. Fix a mistake in cache trim. #ifdef detection of DirectMapping in section in NEWCC mode in page out. Modified: trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -189,12 +189,12 @@ CcpDereferenceCache(Bcb - CcCacheSections, FALSE); } else - CcpUnpinData(Bcb); + CcpUnpinData(Bcb, TRUE); } else { ListEntry = ListEntry->Flink; - CcpUnpinData(Bcb); + CcpUnpinData(Bcb, TRUE); } DPRINT("End loop\n"); Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -53,7 +53,7 @@ // Reference a cache stripe so it won't go away CcpLock(); if (CcCacheSections[BcbHead].BaseAddress) { - CcpReferenceCache(i); + CcpReferenceCache(BcbHead); CcpUnlock(); } else { CcpUnlock(); @@ -68,7 +68,7 @@ *NrFreed += Freed; CcpLock(); - CcpDereferenceCache(BcbHead, FALSE); + CcpUnpinData(&CcCacheSections[BcbHead], TRUE); CcpUnlock(); } @@ -474,10 +474,10 @@ CcpLock(); ListEntry = ListEntry->Flink; // Return from pin state - CcpUnpinData(PinnedBcb); - } - - CcpUnpinData(Bcb); + CcpUnpinData(PinnedBcb, TRUE); + } + + CcpUnpinData(Bcb, TRUE); } CcpUnlock(); Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -65,9 +65,9 @@ NTAPI CcInitView(VOID); -VOID +BOOLEAN NTAPI -CcpUnpinData(PNOCC_BCB Bcb); +CcpUnpinData(PNOCC_BCB Bcb, BOOLEAN ActuallyRelease); BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -707,9 +707,9 @@ return Result; } -VOID -NTAPI -CcpUnpinData(IN PNOCC_BCB RealBcb) +BOOLEAN +NTAPI +CcpUnpinData(IN PNOCC_BCB RealBcb, BOOLEAN ReleaseBit) { if (RealBcb->RefCount <= 2) { @@ -718,9 +718,11 @@ { DPRINT("Triggering exclusive waiter\n"); KeSetEvent(&RealBcb->ExclusiveWait, IO_NO_INCREMENT, FALSE); - return; + return TRUE; } } + if (RealBcb->RefCount == 2 && !ReleaseBit) + return FALSE; if (RealBcb->RefCount > 1) { DPRINT("Removing one reference #%x\n", RealBcb - CcCacheSections); @@ -730,6 +732,7 @@ if (RealBcb->RefCount == 1) { DPRINT("Clearing allocation bit #%x\n", RealBcb - CcCacheSections); + RtlClearBit(CcCacheBitmap, RealBcb - CcCacheSections); #ifdef PIN_WRITE_ONLY @@ -745,6 +748,8 @@ &OldProtect); #endif } + + return TRUE; } VOID @@ -753,13 +758,21 @@ { PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; ULONG Selected = RealBcb - CcCacheSections; + BOOLEAN Released; ASSERT(RealBcb >= CcCacheSections && RealBcb - CcCacheSections < CACHE_NUM_SECTIONS); DPRINT("CcUnpinData Bcb #%x (RefCount %d)\n", Selected, RealBcb->RefCount); CcpLock(); - CcpUnpinData(RealBcb); + Released = CcpUnpinData(RealBcb, FALSE); CcpUnlock(); + + if (!Released) { + MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); + CcpLock(); + CcpUnpinData(RealBcb, TRUE); + CcpUnlock(); + } } VOID Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=501… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -365,7 +365,7 @@ previous_entry = current_entry; current_entry = current_entry->Next; #ifdef NEWCC - if (!RMAP_IS_SEGMENT(current_entry->Address)) + if (!RMAP_IS_SEGMENT(previous_entry->Address)) #endif { if (DeleteMapping) 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] Thu Dec 23 08:42:51 2010 @@ -2039,7 +2039,9 @@ ULONG FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; +#ifndef NEWCC PBCB Bcb = NULL; +#endif BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -2061,6 +2063,7 @@ FileObject = Context.Section->FileObject; DirectMapped = FALSE; +#ifndef NEWCC if (FileObject != NULL && !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { @@ -2077,6 +2080,7 @@ DirectMapped = TRUE; } } +#endif /*

1 0

[fireball] 50109: [NTOS] - Fix a typo in region size calculation of special memory areas, which unbreaks OllyDbg & co. Thanks Michael Martin for the hint. See issue #5692 for more details.
by fireball＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: fireball Date: Wed Dec 22 22:18:32 2010 New Revision: 50109 URL: http://svn.reactos.org/svn/reactos?rev=50109&view=rev Log: [NTOS] - Fix a typo in region size calculation of special memory areas, which unbreaks OllyDbg & co. Thanks Michael Martin for the hint. See issue #5692 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c 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] Wed Dec 22 22:18:32 2010 @@ -2379,7 +2379,7 @@ MemoryInfo.AllocationBase = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1; MemoryInfo.State = MEM_RESERVE; MemoryInfo.Protect = PAGE_NOACCESS; - MemoryInfo.RegionSize = (ULONG_PTR)MemoryInfo.AllocationBase - (ULONG_PTR)Address; + MemoryInfo.RegionSize = (ULONG_PTR)MM_HIGHEST_USER_ADDRESS + 1 - (ULONG_PTR)Address; } /* Return the data, NtQueryInformation already probed it*/

1 0

[fireball] 50108: [NTOS] - Fix memory region size calculation in MemoryBasicInformation in certain cases. Spotted by Michael Martin.
by fireball＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: fireball Date: Wed Dec 22 21:59:27 2010 New Revision: 50108 URL: http://svn.reactos.org/svn/reactos?rev=50108&view=rev Log: [NTOS] - Fix memory region size calculation in MemoryBasicInformation in certain cases. Spotted by Michael Martin. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c 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] Wed Dec 22 21:59:27 2010 @@ -2446,6 +2446,9 @@ /* Check if this VAD is too high */ if (BaseVpn < Vad->StartingVpn) { + /* Stop if there is no left child */ + if (!Vad->LeftChild) break; + /* Search on the left next */ Vad = Vad->LeftChild; } @@ -2453,6 +2456,11 @@ { /* Then this VAD is too low, keep searching on the right */ ASSERT(BaseVpn > Vad->EndingVpn); + + /* Stop if there is no right child */ + if (!Vad->LeftChild) break; + + /* Search on the right next */ Vad = Vad->RightChild; } }

1 0

[fireball] 50107: [NTOS] - Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox ...
by fireball＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: fireball Date: Wed Dec 22 21:27:31 2010 New Revision: 50107 URL: http://svn.reactos.org/svn/reactos?rev=50107&view=rev Log: [NTOS] - Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox issue. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Dec 22 21:27:31 2010 @@ -140,10 +140,10 @@ /* Initialize TrapFrame segment registers with sane values */ mov eax, 0x23 mov ecx, fs - mov [esp - FrameSize + KTRAP_FRAME_DS], eax - mov [esp - FrameSize + KTRAP_FRAME_ES], eax - mov [esp - FrameSize + KTRAP_FRAME_FS], ecx - mov dword ptr [esp - FrameSize + KTRAP_FRAME_GS], 0 + mov [esp + KTRAP_FRAME_DS], eax + mov [esp + KTRAP_FRAME_ES], eax + mov [esp + KTRAP_FRAME_FS], ecx + mov dword ptr [esp + KTRAP_FRAME_GS], 0 else

1 0

[tkreuzer] 50106: [NTDLL] Fix harderror status on machine type mismatch and pass file name.
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 20:20:52 2010 New Revision: 50106 URL: http://svn.reactos.org/svn/reactos?rev=50106&view=rev Log: [NTDLL] Fix harderror status on machine type mismatch and pass file name. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Dec 22 20:20:52 2010 @@ -330,7 +330,6 @@ SYSTEM_BASIC_INFORMATION SystemInformation; NTSTATUS Status; PVOID BaseAddress = SystemArgument1; - ULONG ErrorResponse; DPRINT("LdrpInit()\n"); DPRINT("Peb %p\n", Peb); @@ -354,14 +353,6 @@ { DPRINT1("Image has bad header\n"); ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); - } - - if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE) - { - DPRINT1("Image is for a foreign architecture (0x%x).\n", - NTHeaders->FileHeader.Machine); - NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH, 0, 0, NULL, OptionOk, &ErrorResponse); - ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH); } /* normalize process parameters */ @@ -408,6 +399,47 @@ ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } + /* Check for correct machine type */ + if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE) + { + ULONG_PTR HardErrorParameters[1]; + UNICODE_STRING ImageNameU; + ANSI_STRING ImageNameA; + WCHAR *Ptr; + ULONG ErrorResponse; + + DPRINT1("Image %wZ is for a foreign architecture (0x%x).\n", + &Peb->ProcessParameters->ImagePathName, NTHeaders->FileHeader.Machine); + + /* Get the full image path name */ + ImageNameU = Peb->ProcessParameters->ImagePathName; + + /* Get the file name */ + Ptr = Peb->ProcessParameters->ImagePathName.Buffer + + (Peb->ProcessParameters->ImagePathName.Length / sizeof(WCHAR)) -1; + while ((Ptr >= Peb->ProcessParameters->ImagePathName.Buffer) && + (*Ptr != L'\\')) Ptr--; + ImageNameU.Buffer = Ptr + 1; + ImageNameU.Length = Peb->ProcessParameters->ImagePathName.Length - + (ImageNameU.Buffer - Peb->ProcessParameters->ImagePathName.Buffer) * sizeof(WCHAR); + ImageNameU.MaximumLength = ImageNameU.Length; + + /*`Convert to ANSI, harderror message needs that */ + RtlUnicodeStringToAnsiString(&ImageNameA, &ImageNameU, TRUE); + + /* Raise harderror */ + HardErrorParameters[0] = (ULONG_PTR)&ImageNameA; + NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE, + 1, + 1, + HardErrorParameters, + OptionOk, + &ErrorResponse); + + RtlFreeAnsiString(&ImageNameA); + ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE); + } + /* initialized vectored exception handling */ RtlpInitializeVectoredExceptionHandling();

1 0

[rmessiant] 50105: [I8042PRT] - Calculate packet type according to PS/2++ spec (CID 1810). - Fix technical detail in comment to match spec.
by rmessiant＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: rmessiant Date: Wed Dec 22 19:09:25 2010 New Revision: 50105 URL: http://svn.reactos.org/svn/reactos?rev=50105&view=rev Log: [I8042PRT] - Calculate packet type according to PS/2++ spec (CID 1810). - Fix technical detail in comment to match spec. Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/ps2… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] Wed Dec 22 19:09:25 2010 @@ -31,7 +31,7 @@ * a normal packet. * * Otherwise, the packet is different, like this: - * 1: E 1 b3 b2 x x x x + * 1: E 1 b3 b2 1 x x x * 2: x x b1 b0 x1 x0 1 0 * 3: x x x x x x x1 x0 * @@ -93,8 +93,8 @@ } /* Now get the packet type */ - PktType = ((DeviceExtension->MouseLogiBuffer[0] & 0x30) >> 4) & - ((DeviceExtension->MouseLogiBuffer[1] & 0x30) >> 6); + PktType = ((DeviceExtension->MouseLogiBuffer[0] & 0x30) >> 2) | + ((DeviceExtension->MouseLogiBuffer[1] & 0x30) >> 4); switch (PktType) {

1 0

[janderwald] 50104: [KS] - Add sanity checks - Acquire device entry lock before dealing with device entries - Fix acquiring bus device extension for parent bus device object - Store result in irp i...
by janderwald＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: janderwald Date: Wed Dec 22 18:53:08 2010 New Revision: 50104 URL: http://svn.reactos.org/svn/reactos?rev=50104&view=rev Log: [KS] - Add sanity checks - Acquire device entry lock before dealing with device entries - Fix acquiring bus device extension for parent bus device object - Store result in irp io status block - get install interface from assoicated system buffer - Fixes install of new audio devices with ros ks in windows - Tested with VBOX 3.2.10+WINXP+SP3 Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Dec 22 18:53:08 2010 @@ -1858,7 +1858,6 @@ if (!KsGateCaptureThreshold(Gate)) { /* filter control gate is closed */ - DPRINT1("Gate %p Closed %x\n", Gate, Gate->Count); return; } DPRINT1("processing\n"); Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Wed Dec 22 18:53:08 2010 @@ -972,6 +972,9 @@ HANDLE hKey, hDeviceKey, hInterfaceKey, hReferenceKey; NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; + + /* sanity check */ + ASSERT(InstallInterface); /* calculate length */ Length = wcslen(InstallInterface->ReferenceString); @@ -1059,13 +1062,18 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry; PSWENUM_INSTALL_INTERFACE InstallInterface; + KIRQL OldLevel; PBUS_INSTALL_ENUM_CONTEXT Context = (PBUS_INSTALL_ENUM_CONTEXT)Ctx; /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Context->Irp); /* get install request */ - InstallInterface = (PSWENUM_INSTALL_INTERFACE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + InstallInterface = (PSWENUM_INSTALL_INTERFACE)Context->Irp->AssociatedIrp.SystemBuffer; + + /* sanity check */ + ASSERT(InstallInterface); + ASSERT(Context->BusDeviceExtension); if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SWENUM_INSTALL_INTERFACE)) { @@ -1094,6 +1102,9 @@ /* done */ return; } + + /* acquire device entry lock */ + KeAcquireSpinLock(&Context->BusDeviceExtension->Lock, &OldLevel); /* now iterate all device entries */ Entry = Context->BusDeviceExtension->Common.Entry.Flink; @@ -1114,7 +1125,13 @@ break; } } - } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* release device entry lock */ + KeReleaseSpinLock(&Context->BusDeviceExtension->Lock, OldLevel); /* signal that bus driver relations has changed */ IoInvalidateDeviceRelations(Context->BusDeviceExtension->PhysicalDeviceObject, BusRelations); @@ -1364,7 +1381,7 @@ DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get bus device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext->BusDeviceExtension; + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; /* sanity checks */ ASSERT(BusDeviceExtension); @@ -1715,7 +1732,7 @@ PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + DPRINT1("KsInstallBusEnumInterface\n"); /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1737,7 +1754,7 @@ DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get bus device extension */ - BusDeviceExtension = DeviceExtension->Ext->BusDeviceExtension; + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; /* initialize context */ @@ -1748,9 +1765,11 @@ /* queue the work item */ ExQueueWorkItem(&Context.WorkItem, DelayedWorkQueue); - /* wait for completion */ KeWaitForSingleObject(&Context.Event, Executive, KernelMode, FALSE, NULL); + + /* store result */ + Irp->IoStatus.Status = Context.Status; /* done */ return Context.Status;

1 0

[tkreuzer] 50103: [WIN32K] Silence 3 DPRINTs
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 18:30:59 2010 New Revision: 50103 URL: http://svn.reactos.org/svn/reactos?rev=50103&view=rev Log: [WIN32K] Silence 3 DPRINTs Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Dec 22 18:30:59 2010 @@ -239,7 +239,7 @@ ptiMouse = PsGetCurrentThreadWin32Thread(); ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nMouse Thread 0x%x \n", ptiMouse); + DPRINT("Mouse Thread 0x%x \n", ptiMouse); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -539,7 +539,7 @@ ptiKeyboard = PsGetCurrentThreadWin32Thread(); ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nKeyboard Thread 0x%x \n", ptiKeyboard); + DPRINT("Keyboard Thread 0x%x \n", ptiKeyboard); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -902,7 +902,7 @@ ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; - DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); + DPRINT("Raw Input Thread 0x%x \n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -1342,7 +1342,7 @@ /* All messages have to contain the cursor point. */ Msg.pt = gpsi->ptCursor; - + KbdHookData.vkCode = vk_hook; KbdHookData.scanCode = ki->wScan; KbdHookData.flags = flags >> 8;

1 0

[greatlrd] 50102: [win32k] function DxEngGetHdevData Activate support for PDev->pldev it seam have been implement in reactos now
by greatlrd＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: greatlrd Date: Wed Dec 22 17:55:15 2010 New Revision: 50102 URL: http://svn.reactos.org/svn/reactos?rev=50102&view=rev Log: [win32k] function DxEngGetHdevData Activate support for PDev->pldev it seam have been implement in reactos now Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Wed Dec 22 17:55:15 2010 @@ -357,9 +357,8 @@ retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: - DPRINT1("DxEGShDevData_ldev not supported yet\n"); - // ATM we do not support the Loader Device driver structure. -// retVal = (DWORD) PDev->pldev; + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev \n"); + retVal = (DWORD_PTR) PDev->pldev; break; case DxEGShDevData_GDev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); @@ -441,8 +440,7 @@ * * @remarks. * We do not have type 2 implemented yet -* -*--*/ +**--*/ DWORD_PTR APIENTRY DxEngGetDCState(HDC hDC,

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