Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[rharabien] 56072: [WIN32K] - When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash.
by rharabien＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: rharabien Date: Wed Mar 7 00:24:14 2012 New Revision: 56072 URL: http://svn.reactos.org/svn/reactos?rev=56072&view=rev Log: [WIN32K] - When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash. Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Wed Mar 7 00:24:14 2012 @@ -51,19 +51,11 @@ /* Validate output */ OutputRect = *DestRect; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } + RECTL_vMakeWellOrdered(&OutputRect); /* Validate input */ InputRect = *SourceRect; + RECTL_vMakeWellOrdered(&InputRect); if ( (InputRect.top < 0) || (InputRect.bottom < 0) || (InputRect.left < 0) || (InputRect.right < 0) || InputRect.right > psoSource->sizlBitmap.cx || @@ -124,6 +116,8 @@ OutputRect.right += Translate.x; OutputRect.top += Translate.y; OutputRect.bottom += Translate.y; + + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; @@ -141,10 +135,14 @@ ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + /* take into acount clipping results when calculating new input rect (scaled to input rect size) */ + Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + + /* Aplha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj); } @@ -166,10 +164,14 @@ ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + /* take into acount clipping results when calculating new input rect (scaled to input rect size) */ + Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + + /* Alpha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret; }

1 0

[cgutman] 56071: [NTOSKRNL] - Hack IopDeleteDriver to workaround the boot driver unloading bugs I mailed ros-dev about - Should fix KVM testbot
by cgutman＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: cgutman Date: Wed Mar 7 00:14:13 2012 New Revision: 56071 URL: http://svn.reactos.org/svn/reactos?rev=56071&view=rev Log: [NTOSKRNL] - Hack IopDeleteDriver to workaround the boot driver unloading bugs I mailed ros-dev about - Should fix KVM testbot Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Mar 7 00:14:13 2012 @@ -73,12 +73,16 @@ DriverExtension = NextDriverExtension; } +#if 0 /* Check if the driver image is still loaded */ if (DriverObject->DriverSection) { /* Unload it */ MmUnloadSystemImage(DriverObject->DriverSection); } +#else + DPRINT1("HACK: Not unloading the driver image due to critical bugs!\n"); +#endif /* Check if it has a name */ if (DriverObject->DriverName.Buffer)

1 0

[cgutman] 56070: [NTOSKRNL] - Don't zero a page again that is already zeroed
by cgutman＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: cgutman Date: Wed Mar 7 00:01:51 2012 New Revision: 56070 URL: http://svn.reactos.org/svn/reactos?rev=56070&view=rev Log: [NTOSKRNL] - Don't zero a page again that is already zeroed Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c 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] Wed Mar 7 00:01:51 2012 @@ -327,6 +327,7 @@ { /* System wants a zero page, obtain one */ PageFrameNumber = MiRemoveZeroPage(Color); + NeedZero = FALSE; } /* Initialize it */

1 0

[cgutman] 56069: [NTOSKRNL] - Fix the unload path - This does expose some bugs: 2 cont-able assertions in ARM3 after unplugging a USB storage device (during usbstor unload), HID unload doesn't seem...
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 22:50:13 2012 New Revision: 56069 URL: http://svn.reactos.org/svn/reactos?rev=56069&view=rev Log: [NTOSKRNL] - Fix the unload path - This does expose some bugs: 2 cont-able assertions in ARM3 after unplugging a USB storage device (during usbstor unload), HID unload doesn't seem to work correctly (somebody still has references to the devices), other issues may pop up too Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Mar 6 22:50:13 2012 @@ -377,8 +377,6 @@ /* Check if deletion is pending */ if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) { - if (!(ThisExtension->ExtensionFlags & DOE_UNLOAD_PENDING)) return; - if (DeviceObject->AttachedDevice) { DPRINT("Device object is in the middle of a device stack\n"); @@ -415,7 +413,7 @@ */ if (DeviceObject->ReferenceCount) { - DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); + DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); return; } @@ -432,6 +430,17 @@ } /* Check the next device */ + DeviceObject = DeviceObject->NextDevice; + } + + /* Loop all the device objects */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* Set the unload pending flag */ + IoGetDevObjExtension(DeviceObject)->ExtensionFlags |= DOE_UNLOAD_PENDING; + + /* Go to the next device */ DeviceObject = DeviceObject->NextDevice; }

1 0

[cgutman] 56068: [NTOSKRNL] - Cleanup device removal/unloading - Should not have any behavior changes yet
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 22:36:27 2012 New Revision: 56068 URL: http://svn.reactos.org/svn/reactos?rev=56068&view=rev Log: [NTOSKRNL] - Cleanup device removal/unloading - Should not have any behavior changes yet Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Mar 6 22:36:27 2012 @@ -359,78 +359,37 @@ IopUnloadDevice(IN PDEVICE_OBJECT DeviceObject) { PDRIVER_OBJECT DriverObject = DeviceObject->DriverObject; - PDEVICE_OBJECT AttachedDeviceObject, LowestDeviceObject; - PEXTENDED_DEVOBJ_EXTENSION ThisExtension, DeviceExtension; - PDEVICE_NODE DeviceNode; - BOOLEAN SafeToUnload = TRUE; + PEXTENDED_DEVOBJ_EXTENSION ThisExtension = IoGetDevObjExtension(DeviceObject); + PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); + + /* Return if we've already called unload (maybe we're in it?) */ + if (DriverObject->Flags & DRVO_UNLOAD_INVOKED) return; /* We can't unload unless there's an unload handler */ if (!DriverObject->DriverUnload) { - DPRINT("No DriverUnload function! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); - return; - } - - /* Check if removal is pending */ - ThisExtension = IoGetDevObjExtension(DeviceObject); - if (ThisExtension->ExtensionFlags & DOE_REMOVE_PENDING) - { - /* Get the PDO, extension, and node */ - LowestDeviceObject = IopGetLowestDevice(DeviceObject); - DeviceExtension = IoGetDevObjExtension(LowestDeviceObject); - DeviceNode = DeviceExtension->DeviceNode; - - /* The PDO needs a device node */ - ASSERT(DeviceNode != NULL); - - /* Loop all attached objects */ - AttachedDeviceObject = LowestDeviceObject; - while (AttachedDeviceObject) - { - /* Make sure they're dereferenced */ - if (AttachedDeviceObject->ReferenceCount) return; - AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; - } - - /* Loop all attached objects */ - AttachedDeviceObject = LowestDeviceObject; - while (AttachedDeviceObject) - { - /* Get the device extension */ - DeviceExtension = IoGetDevObjExtension(AttachedDeviceObject); - - /* Remove the pending flag and set processed */ - DeviceExtension->ExtensionFlags &= ~DOE_REMOVE_PENDING; - DeviceExtension->ExtensionFlags |= DOE_REMOVE_PROCESSED; - AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; - } - - /* - * FIXME: TODO HPOUSSIN - * We need to parse/lock the device node, and if we have any pending - * surprise removals, query all relationships and send IRP_MN_REMOVE_ - * _DEVICE to the devices related... - */ + if (DeviceNode && !(DeviceNode->Flags & DNF_LEGACY_DRIVER)) + DPRINT1("No DriverUnload function on PnP driver! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + return; } /* Check if deletion is pending */ if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) { - /* Make sure unload is pending */ - if (!(ThisExtension->ExtensionFlags & DOE_UNLOAD_PENDING) || - (DriverObject->Flags & DRVO_UNLOAD_INVOKED)) - { - /* We can't unload anymore */ - SafeToUnload = FALSE; - } - - /* - * Check if we have an attached device and fail if we're attached - * or still have a reference count. - */ - AttachedDeviceObject = DeviceObject->AttachedDevice; - if ((AttachedDeviceObject) || (DeviceObject->ReferenceCount)) return; + if (!(ThisExtension->ExtensionFlags & DOE_UNLOAD_PENDING)) return; + + if (DeviceObject->AttachedDevice) + { + DPRINT("Device object is in the middle of a device stack\n"); + return; + } + + if (DeviceObject->ReferenceCount) + { + DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); + return; + } /* Check if we have a Security Descriptor */ if (DeviceObject->SecurityDescriptor) @@ -444,9 +403,6 @@ /* Dereference the keep-alive */ ObDereferenceObject(DeviceObject); - - /* If we're not unloading, stop here */ - if (!SafeToUnload) return; } /* Loop all the device objects */ @@ -457,12 +413,21 @@ * Make sure we're not attached, having a reference count * or already deleting */ - if ((DeviceObject->ReferenceCount) || - (DeviceObject->AttachedDevice) || - (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & - (DOE_DELETE_PENDING | DOE_REMOVE_PENDING))) - { - /* We're not safe to unload, quit */ + if (DeviceObject->ReferenceCount) + { + DPRINT("Device object still has %d references\n", DeviceObject->ReferenceCount); + return; + } + + if (DeviceObject->AttachedDevice) + { + DPRINT("Device object is in the middle of a device stack\n"); + return; + } + + if (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & (DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) + { + DPRINT("Device object has a pending destructive operation\n"); return; } @@ -501,12 +466,9 @@ * Check if we can unload it and it's safe to unload (or if we're forcing * an unload, which is OK too). */ + ASSERT(!ForceUnload); if (!(DeviceObject->ReferenceCount) && - ((ForceUnload) || (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & - (DOE_UNLOAD_PENDING | - DOE_DELETE_PENDING | - DOE_REMOVE_PENDING | - DOE_REMOVE_PROCESSED)))) + (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & DOE_DELETE_PENDING)) { /* Unload it */ IopUnloadDevice(DeviceObject); @@ -1111,8 +1073,7 @@ TargetDevice->AttachedDevice = NULL; /* Check if it's ok to delete this device */ - if ((IoGetDevObjExtension(TargetDevice)->ExtensionFlags & - (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) && + if ((IoGetDevObjExtension(TargetDevice)->ExtensionFlags & DOE_DELETE_PENDING) && !(TargetDevice->ReferenceCount)) { /* It is, do it */

1 0

[cgutman] 56067: [MOUCLASS][KBDCLASS] - Fix a file object reference leak on legacy enumerated keyboard and mouse port drivers
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 22:20:02 2012 New Revision: 56067 URL: http://svn.reactos.org/svn/reactos?rev=56067&view=rev Log: [MOUCLASS][KBDCLASS] - Fix a file object reference leak on legacy enumerated keyboard and mouse port drivers Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Tue Mar 6 22:20:02 2012 @@ -1008,6 +1008,8 @@ /* FIXME: Log the error */ WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } + + ObDereferenceObject(FileObject); } cleanup: Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Tue Mar 6 22:20:02 2012 @@ -984,6 +984,8 @@ /* FIXME: Log the error */ WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } + + ObDereferenceObject(FileObject); } cleanup:

1 0

[cgutman] 56066: [NTOSKRNL] - Fix yet another major device object reference leak (1 per power IRP)
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 22:06:44 2012 New Revision: 56066 URL: http://svn.reactos.org/svn/reactos?rev=56066&view=rev Log: [NTOSKRNL] - Fix yet another major device object reference leak (1 per power IRP) Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Tue Mar 6 22:06:44 2012 @@ -59,6 +59,7 @@ ExFreePool(Context); IoFreeIrp(Irp); + ObDereferenceObject(DeviceObject); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -547,6 +548,7 @@ NULL); if (!Irp) { + ObDereferenceObject(TopDeviceObject); ExFreePool(RequestPowerItem); return STATUS_INSUFFICIENT_RESOURCES; }

1 0

[cgutman] 56065: [NTOSKRNL] - Fix a major device object reference leak (1 per PnP IRP)
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 21:58:29 2012 New Revision: 56065 URL: http://svn.reactos.org/svn/reactos?rev=56065&view=rev Log: [NTOSKRNL] - Fix a major device object reference leak (1 per PnP IRP) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Mar 6 21:58:29 2012 @@ -1281,7 +1281,10 @@ NULL); Status = IoStatusBlock.Status; } - + + /* Remove the reference */ + ObDereferenceObject(TopDeviceObject); + /* Return the information */ *Information = (PVOID)IoStatusBlock.Information; return Status;

1 0

[cgutman] 56064: [USBCCGP] - Add a DriverUnload handler as required by WDM spec
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 21:24:36 2012 New Revision: 56064 URL: http://svn.reactos.org/svn/reactos?rev=56064&view=rev Log: [USBCCGP] - Add a DriverUnload handler as required by WDM spec Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.c Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Tue Mar 6 21:24:36 2012 @@ -137,6 +137,13 @@ } } +VOID +NTAPI +USBCCGP_Unload(PDRIVER_OBJECT DriverObject) +{ + DPRINT("[USBCCGP] Unload\n"); +} + NTSTATUS NTAPI DriverEntry( @@ -153,6 +160,7 @@ DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_POWER] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBCCGP_Dispatch; + DriverObject->DriverUnload = USBCCGP_Unload; /* FIMXE query GenericCompositeUSBDeviceString */

1 0

[cgutman] 56063: [NTOSKRNL] - Fix several driver object reference leaks - Fix a kmtest regarding previously loaded drivers - Part 1 of getting PnP driver unload to work properly
by cgutman＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: cgutman Date: Tue Mar 6 21:07:25 2012 New Revision: 56063 URL: http://svn.reactos.org/svn/reactos?rev=56063&view=rev Log: [NTOSKRNL] - Fix several driver object reference leaks - Fix a kmtest regarding previously loaded drivers - Part 1 of getting PnP driver unload to work properly Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Mar 6 21:07:25 2012 @@ -558,6 +558,7 @@ Filters += (ServiceName.Length / sizeof(WCHAR)) + 1) { DPRINT("Filter Driver: %S (%wZ)\n", Filters, &DeviceNode->InstancePath); + ServiceName.Buffer = Filters; ServiceName.MaximumLength = ServiceName.Length = (USHORT)wcslen(Filters) * sizeof(WCHAR); @@ -579,8 +580,9 @@ } Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - continue; + + /* Remove extra reference */ + ObDereferenceObject(DriverObject); } return STATUS_SUCCESS; @@ -874,6 +876,9 @@ { Status = IopStartDevice(DeviceNode); } + + /* Remove extra reference from IopInitializeDriverModule */ + ObDereferenceObject(DriverObject); return Status; } @@ -1960,6 +1965,7 @@ else { DPRINT("DriverObject already exist in ObjectManager\n"); + Status = STATUS_IMAGE_ALREADY_LOADED; /* IopGetDriverObject references the DriverObject, so dereference it */ ObDereferenceObject(DriverObject); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Mar 6 21:07:25 2012 @@ -2592,19 +2592,9 @@ if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { - /* STATUS_IMAGE_ALREADY_LOADED means this driver - was loaded by the bootloader */ - if ((Status != STATUS_IMAGE_ALREADY_LOADED) || - (Status == STATUS_IMAGE_ALREADY_LOADED && !DriverObject)) - { - /* Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + /* Initialize the driver */ + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); - } - else - { - Status = STATUS_SUCCESS; - } } else { @@ -2618,6 +2608,9 @@ { /* Initialize the device, including all filters */ Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); + + /* Remove the extra reference */ + ObDereferenceObject(DriverObject); } else {

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
36
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 March 2012