Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 56062: [WIN32K] Implement NtGdiGetFontData / PFE_ulQueryTrueTypeTable
by tkreuzer＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: tkreuzer Date: Tue Mar 6 15:03:28 2012 New Revision: 56062 URL: http://svn.reactos.org/svn/reactos?rev=56062&view=rev Log: [WIN32K] Implement NtGdiGetFontData / PFE_ulQueryTrueTypeTable Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h 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] Tue Mar 6 15:03:28 2012 @@ -49,22 +49,6 @@ ASSERT(gbAttachedCSRSS); KeUnstackDetachProcess(pApcState); gbAttachedCSRSS = FALSE; -} - -VOID -NTAPI -RFONT_vInitDeviceMetrics( - PRFONT prfnt) -{ - PPDEVOBJ ppdev = (PPDEVOBJ)prfnt->hdevProducer; - - ppdev->pldev->pfn.QueryFontData(prfnt->dhpdev, - &prfnt->fobj, - QFD_MAXEXTENTS, - -1, - NULL, - &prfnt->fddm, - sizeof(FD_DEVICEMETRICS)); } static @@ -113,6 +97,40 @@ //ppfe->aiFamilyName[]; } + +ULONG +NTAPI +PFE_ulQueryTrueTypeTable( + PPFE ppfe, + ULONG ulTableTag, + PTRDIFF dpStart, + ULONG cjBuffer, + PVOID pvBuffer) +{ + PPDEVOBJ ppdev = (PDEVOBJ*)ppfe->pPFF->hdev; + KAPC_STATE ApcState; + ULONG ulResult; + + /* Attach to CSRSS */ + AttachCSRSS(&ApcState); + + /* Call the driver to copy the requested data */ + ulResult = ppdev->pfn.QueryTrueTypeTable(ppfe->pPFF->hff, + ppfe->iFont, + ulTableTag, + dpStart, + cjBuffer, + pvBuffer, + NULL, + NULL); + + /* Detach from CSRSS */ + DetachCSRSS(&ApcState); + + /* Return the result */ + return ulResult; +} + static VOID Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c [iso-8859-1] Tue Mar 6 15:03:28 2012 @@ -18,11 +18,75 @@ IN HDC hdc, IN DWORD dwTable, IN DWORD dwOffset, - OUT OPTIONAL PVOID pvBuf, - IN ULONG cjBuf) -{ - ASSERT(FALSE); - return 0; + OUT OPTIONAL PVOID pvBuffer, + IN ULONG cjBuffer) +{ + PDC pdc; + PRFONT prfnt; + PVOID pvTempBuffer; + ULONG ulResult; + + /* Check if the caller provides a buffer */ + if (cjBuffer) + { + /* Must have a buffer */ + if (!pvBuffer) return GDI_ERROR; + + /* Allocate a temp buffer */ + pvTempBuffer = ExAllocatePoolWithTag(PagedPool, cjBuffer, GDITAG_TEMP); + if (!pvTempBuffer) + { + return GDI_ERROR; + } + } + else + { + /* Don't provide a buffer */ + pvTempBuffer = NULL; + } + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + ulResult = GDI_ERROR; + goto leave; + } + + /* Get the RFONT from the DC */ + prfnt = DC_prfnt(pdc); + + /* Query the table data */ + ulResult = PFE_ulQueryTrueTypeTable(prfnt->ppfe, + dwTable, + dwOffset, + cjBuffer, + pvTempBuffer); + + /* Copy the data back, if requested */ + if (cjBuffer && (ulResult != GDI_ERROR)) + { + _SEH2_TRY + { + /* Probe and copy the data */ + ProbeForWrite(pvBuffer, cjBuffer, 1); + RtlCopyMemory(pvBuffer, pvTempBuffer, cjBuffer); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ulResult = GDI_ERROR; + } + _SEH2_END; + } + + /* Unlock the DC */ + DC_UnlockDc(pdc); + +leave: + /* Free the temp buffer */ + if (pvTempBuffer) ExFreePoolWithTag(pvTempBuffer, GDITAG_TEMP); + + return ulResult; } W32KAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Tue Mar 6 15:03:28 2012 @@ -392,6 +392,12 @@ NTAPI LFONT_ppfe(PLFONT plfnt); +PRFONT +NTAPI +LFONT_prfntFindLinkedRFONT( + _In_ PLFONT plfnt, + _In_ PMATRIX pmxWorldToDevice); + VOID NTAPI UpcaseString( @@ -403,6 +409,15 @@ NTAPI CalculateNameHash( PWSTR pwszName); + +ULONG +NTAPI +PFE_ulQueryTrueTypeTable( + PPFE ppfe, + ULONG ulTableTag, + PTRDIFF dpStart, + ULONG cjBuffer, + PVOID pvBuffer); BOOL NTAPI

1 0

[tkreuzer] 56061: [WIN32K] Initialize the DC's CombinedClip when creating the DC. Fixes a crash caused by Explorer++
by tkreuzer＠svn.reactos.org 06 Mar '12

06 Mar '12

Author: tkreuzer Date: Tue Mar 6 10:33:28 2012 New Revision: 56061 URL: http://svn.reactos.org/svn/reactos?rev=56061&view=rev Log: [WIN32K] Initialize the DC's CombinedClip when creating the DC. Fixes a crash caused by Explorer++ Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Mar 6 10:33:28 2012 @@ -112,6 +112,8 @@ void DC_InitHack(PDC pdc) { + HRGN hVisRgn; + TextIntRealizeFont(pdc->pdcattr->hlfntNew,NULL); pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); @@ -121,6 +123,11 @@ /* Select regions */ pdc->rosdc.hClipRgn = NULL; pdc->rosdc.hGCClipRgn = NULL; + + hVisRgn = IntSysCreateRectRgn(0, 0, 1, 1); + ASSERT(hVisRgn); + GdiSelectVisRgn(pdc->BaseObject.hHmgr, hVisRgn); + GreDeleteObject(hVisRgn); } VOID

1 0

[sginsberg] 56060: - Stop using ObfXXX and IofXXX in C code. This is bad style. Always use the non-f versions in C code. - Fix the way we undefined IoCallDriver and IoCompleteRequest so existing an...
by sginsberg＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sginsberg Date: Mon Mar 5 20:43:47 2012 New Revision: 56060 URL: http://svn.reactos.org/svn/reactos?rev=56060&view=rev Log: - Stop using ObfXXX and IofXXX in C code. This is bad style. Always use the non-f versions in C code. - Fix the way we undefined IoCallDriver and IoCompleteRequest so existing and future code in irp.c will use the correct function when using the Io* versions. Part 1 of 2. Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/drivers/filters/mountmgr/notify.c trunk/reactos/drivers/filters/mountmgr/symlink.c trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/fsrtl/pnp.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -258,7 +258,7 @@ { /* Get rid of it */ ExUnregisterCallback(CmBattPowerCallBackRegistration); - ObfDereferenceObject(CmBattPowerCallBackObject); + ObDereferenceObject(CmBattPowerCallBackObject); } /* Free the registry buffer if it exists */ @@ -339,7 +339,7 @@ /* Release lock and complete request */ ExReleaseFastMutex(&DeviceExtension->FastMutex); Irp->IoStatus.Status = Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -361,7 +361,7 @@ { /* It's too late, fail */ Irp->IoStatus.Status = STATUS_DEVICE_REMOVED; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } @@ -514,7 +514,7 @@ { /* Complete the request */ Irp->IoStatus.Status = Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } else { @@ -1312,7 +1312,7 @@ } else { - ObfDereferenceObject(CmBattPowerCallBackObject); + ObDereferenceObject(CmBattPowerCallBackObject); if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("CmBattRegisterPowerCallBack: ExRegisterCallback failed.\n"); } Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -250,7 +250,7 @@ { /* Complete the request here */ Status = Irp->IoStatus.Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* Return status */ @@ -281,7 +281,7 @@ { /* Complete the request */ Irp->IoStatus.Status = STATUS_DEVICE_REMOVED; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } @@ -485,7 +485,7 @@ } /* Release the remove lock and complete the request */ - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; @@ -514,7 +514,7 @@ { /* Complete the request */ Status = Irp->IoStatus.Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* Release the remove lock and return status */ Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -161,7 +161,7 @@ { /* It's too late, fail */ Irp->IoStatus.Status = STATUS_DEVICE_REMOVED; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } @@ -192,7 +192,7 @@ /* Complete it here */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Not Completed.\n"); - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); break; case IrpForward: Modified: trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -43,7 +43,7 @@ if (Irp) { /* Call the class driver miniport */ - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { /* Wait for result */ Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -145,8 +145,8 @@ if (NT_SUCCESS(Status)) { /* Reference the DO and drop the FO */ - ObfReferenceObject(BatteryData->DeviceObject); - ObfDereferenceObject(FileObject); + ObReferenceObject(BatteryData->DeviceObject); + ObDereferenceObject(FileObject); /* Allocate the battery IRP */ Irp = IoAllocateIrp(BatteryData->DeviceObject->StackSize + 1, 0); @@ -187,7 +187,7 @@ if (CompBattDebug & 8) DbgPrint("CompBatt: Couldn't allocate new battery Irp\n"); Status = STATUS_INSUFFICIENT_RESOURCES; - ObfDereferenceObject(BatteryData->DeviceObject); + ObDereferenceObject(BatteryData->DeviceObject); } } else if (CompBattDebug & 8) @@ -227,7 +227,7 @@ if (BatteryData) { /* Dereference and free it */ - ObfDereferenceObject(BatteryData->DeviceObject); + ObDereferenceObject(BatteryData->DeviceObject); ExFreePool(BatteryData); /* Notify class driver */ Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -49,7 +49,7 @@ IoSetCompletionRoutine(Irp, PciSetEventCompletion, &Event, TRUE, TRUE, TRUE); /* Call the attached device */ - Status = IofCallDriver(DeviceExtension->AttachedDeviceObject, Irp); + Status = IoCallDriver(DeviceExtension->AttachedDeviceObject, Irp); if (Status == STATUS_PENDING) { /* Wait for it to complete the request, and get its status */ @@ -83,7 +83,7 @@ { /* For a normal IRP, just call the next driver in the stack */ IoSkipCurrentIrpStackLocation(Irp); - Status = IofCallDriver(DeviceExtension->AttachedDeviceObject, Irp); + Status = IoCallDriver(DeviceExtension->AttachedDeviceObject, Irp); } /* Return the status back to the caller */ @@ -245,7 +245,7 @@ if (IoStackLocation->MajorFunction == IRP_MJ_POWER) PoStartNextPowerIrp(Irp); /* And now this IRP can be completed */ - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* And the status returned back to the caller */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -2130,7 +2130,7 @@ { /* Reference it and add it to the array */ DeviceObject = PdoExtension->PhysicalDeviceObject; - ObfReferenceObject(DeviceObject); + ObReferenceObject(DeviceObject); *ObjectArray++ = DeviceObject; } Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -205,12 +205,12 @@ } /* Dereference the device object because we took a reference earlier */ - ObfDereferenceObject(AttachedDevice); + ObDereferenceObject(AttachedDevice); } else { /* Failure path, dereference the device object and set failure code */ - if (AttachedDevice) ObfDereferenceObject(AttachedDevice); + if (AttachedDevice) ObDereferenceObject(AttachedDevice); ExFreePoolWithTag(PciInterface, 0); Status = STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -353,12 +353,12 @@ /* FT volume can't be removable */ if (FileDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return FALSE; } - ObfDereferenceObject(FileObject); + ObDereferenceObject(FileObject); /* Get partition information */ KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -373,18 +373,18 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); return FALSE; } - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatusBlock.Status; } - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); if (!NT_SUCCESS(Status)) { return FALSE; @@ -1449,7 +1449,7 @@ if (FOReferenced) { - ObfDereferenceObject(FileObject); + ObDereferenceObject(FileObject); } return Status; @@ -1596,7 +1596,7 @@ Complete: Irp->IoStatus.Status = Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -240,7 +240,7 @@ /* The associate FO can't have a file name */ if (FileObject->FileName.Length) { - ObfDereferenceObject(FileObject); + ObDereferenceObject(FileObject); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -275,12 +275,12 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -322,12 +322,12 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -361,12 +361,12 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -392,8 +392,8 @@ Name = AllocatePool(sizeof(MOUNTDEV_NAME)); if (!Name) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -419,7 +419,7 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -437,8 +437,8 @@ Name = AllocatePool(Size); if (!Name) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -464,7 +464,7 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -524,15 +524,15 @@ if (!Irp) { FreePool(Id); - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -550,8 +550,8 @@ Id = AllocatePool(Size); if (!Id) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -577,7 +577,7 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -622,15 +622,15 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -640,8 +640,8 @@ *HasGuid = NT_SUCCESS(Status); } - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return Status; } @@ -1693,7 +1693,7 @@ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_CANCELLED; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* Modified: trunk/reactos/drivers/filters/mountmgr/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/n… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -75,15 +75,15 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } Cleanup: - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return; } @@ -301,7 +301,7 @@ DeviceInformation->TargetDeviceNotificationEntry = NULL; } - ObfDereferenceObject(FileObject); + ObDereferenceObject(FileObject); return; } @@ -341,7 +341,7 @@ *((PULONG)Irp->AssociatedIrp.SystemBuffer) = DeviceExtension->EpicNumber; Irp->IoStatus.Information = sizeof(DeviceExtension->EpicNumber); - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } } @@ -412,8 +412,8 @@ &IoStatusBlock); if (!Irp) { - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); } Stack = IoGetNextIrpStackLocation(Irp); @@ -428,15 +428,15 @@ Stack->FileObject = FileObject; /* And call driver */ - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatusBlock.Status; } - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); if (!NT_SUCCESS(Status)) { @@ -466,7 +466,7 @@ &DeviceNotification, NULL, NULL); - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); return; } @@ -609,8 +609,8 @@ if (InterlockedExchange((PLONG)&(WorkItem->Event), 0) != 0) { - ObfDereferenceObject(FileObject); - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); RemoveWorkItem(WorkItem); return; } @@ -634,16 +634,16 @@ TRUE, TRUE, TRUE); if (!NT_SUCCESS(Status)) { - ObfDereferenceObject(FileObject); - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); RemoveWorkItem(WorkItem); return; } /* Call the driver */ - IofCallDriver(DeviceObject, Irp); - ObfDereferenceObject(FileObject); - ObfDereferenceObject(DeviceObject); + IoCallDriver(DeviceObject, Irp); + ObDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); } /* @@ -673,13 +673,13 @@ /* And then, get attached device */ DeviceObject = IoGetAttachedDeviceReference(FileObject->DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(FileObject); /* Allocate a work item */ WorkItem = AllocatePool(sizeof(UNIQUE_ID_WORK_ITEM)); if (!WorkItem) { - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); return; } @@ -687,7 +687,7 @@ WorkItem->WorkItem = IoAllocateWorkItem(DeviceExtension->DeviceObject); if (!WorkItem->WorkItem) { - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); goto Cleanup; } @@ -696,7 +696,7 @@ /* Already provide the IRP */ WorkItem->Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); if (!WorkItem->Irp) { Modified: trunk/reactos/drivers/filters/mountmgr/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/s… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -218,7 +218,7 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -245,7 +245,7 @@ Stack->FileObject = FileObject; /* Really notify */ - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -257,8 +257,8 @@ FreePool(Name); } - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return; } @@ -322,7 +322,7 @@ Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -349,7 +349,7 @@ Stack->FileObject = FileObject; /* Really notify */ - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -361,8 +361,8 @@ FreePool(Name); } - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return; } @@ -740,7 +740,7 @@ IoStackLocation->FileObject = FileObject; /* And ask */ - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, @@ -782,7 +782,7 @@ IoStackLocation = IoGetNextIrpStackLocation(Irp); IoStackLocation->FileObject = FileObject; - Status = IofCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, @@ -817,8 +817,8 @@ FreePool(IoCtlSuggested); Dereference: - ObfDereferenceObject(DeviceObject); - ObfDereferenceObject(FileObject); + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); return Status; } Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -253,7 +253,7 @@ { /* Save our own PDO and reference it */ *ObjectEntry++ = PdoExtension->PhysicalDeviceObject; - ObfReferenceObject(PdoExtension->PhysicalDeviceObject); + ObReferenceObject(PdoExtension->PhysicalDeviceObject); /* Go to our next PDO */ PdoExtension = PdoExtension->Next; @@ -281,7 +281,7 @@ /* Fill it out and reference us */ PdoRelations->Count = 1; PdoRelations->Objects[0] = DeviceObject; - ObfReferenceObject(DeviceObject); + ObReferenceObject(DeviceObject); /* Return it */ *DeviceRelations = PdoRelations; Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -245,7 +245,7 @@ { /* Save our own PDO and reference it */ *ObjectEntry++ = PdoExtension->PhysicalDeviceObject; - ObfReferenceObject(PdoExtension->PhysicalDeviceObject); + ObReferenceObject(PdoExtension->PhysicalDeviceObject); /* Go to our next PDO */ PdoExtension = PdoExtension->Next; @@ -273,7 +273,7 @@ /* Fill it out and reference us */ PdoRelations->Count = 1; PdoRelations->Objects[0] = DeviceObject; - ObfReferenceObject(DeviceObject); + ObReferenceObject(DeviceObject); /* Return it */ *DeviceRelations = PdoRelations; Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -200,7 +200,7 @@ Completion: IoMarkIrpPending(Irp); Irp->IoStatus.Status = Status; - IofCompleteRequest(Irp, EVENT_INCREMENT); + IoCompleteRequest(Irp, EVENT_INCREMENT); } /* @@ -537,7 +537,7 @@ { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; - IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); _SEH2_LEAVE; } @@ -550,14 +550,14 @@ { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; - IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); } /* Or if it's about to be deleted, complete */ else if (NotifyChange->Flags & DELETE_IN_PROCESS) { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_DELETE_PENDING; - IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); } /* Complete if there is directory enumeration and no buffer available any more */ if ((NotifyChange->Flags & INVALIDATE_BUFFERS) && (NotifyChange->Flags & ENUMERATE_DIR)) @@ -565,7 +565,7 @@ NotifyChange->Flags &= ~INVALIDATE_BUFFERS; IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_ENUM_DIR; - IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); } /* If no data yet, or directory enumeration, handle */ else if (NotifyChange->DataLength == 0 || (NotifyChange->Flags & ENUMERATE_DIR)) Modified: trunk/reactos/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/pnp.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -111,7 +111,7 @@ Status = STATUS_SUCCESS; } - ObfDereferenceObject(DeviceObject); + ObDereferenceObject(DeviceObject); return Status; } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Mar 5 20:43:47 2012 @@ -13,10 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* Undefine some macros we implement here */ -#undef IoCallDriver -#undef IoCompleteRequest PIRP IopDeadIrp; @@ -1099,6 +1095,7 @@ /* * @implemented */ +#undef IoCallDriver NTSTATUS NTAPI IoCallDriver(IN PDEVICE_OBJECT DeviceObject, @@ -1108,9 +1105,12 @@ return IofCallDriver(DeviceObject, Irp); } -/* - * @implemented - */ +#define IoCallDriver IofCallDriver + +/* + * @implemented + */ +#undef IoCompleteRequest VOID NTAPI IoCompleteRequest(IN PIRP Irp, @@ -1119,6 +1119,8 @@ /* Call the fastcall */ IofCompleteRequest(Irp, PriorityBoost); } + +#define IoCompleteRequest IofCompleteRequest /* * @implemented

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