[ros-diffs] [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...
sginsberg at svn.reactos.org
sginsberg at svn.reactos.org
Mon Mar 5 20:43:48 UTC 2012
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/cmbatt.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/cmbpnp.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/cmbwmi.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/compmisc.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/comppnp.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/config.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/device.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/mountmgr.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/notify.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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/symlink.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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.c?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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?rev=56060&r1=56059&r2=56060&view=diff
==============================================================================
--- 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
More information about the Ros-diffs
mailing list