[ros-diffs] [janderwald] 39731: - Fix release build - Complete irps which were forgotten

Author: janderwald
Date: Tue Feb 24 02:24:58 2009
New Revision: 39731

URL: http://svn.reactos.org/svn/reactos?rev=39731&view=rev
Log:
- Fix release build
- Complete irps which were forgotten

Modified:
    trunk/reactos/drivers/ksfilter/ks/irp.c
    trunk/reactos/drivers/ksfilter/ks/misc.c
    trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c
    trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c
    trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c
    trunk/reactos/drivers/wdm/audio/sysaudio/control.c
    trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c
    trunk/reactos/drivers/wdm/audio/sysaudio/main.c
    trunk/reactos/drivers/wdm/audio/sysaudio/pin.c

Modified: trunk/reactos/drivers/ksfilter/ks/irp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Feb 24 02:24:58 2009
@@ -1146,6 +1146,9 @@
     IN PIRP Irp)
 {
     UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
+    Irp->IoStatus.Information = 0;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
+}
+

Modified: trunk/reactos/drivers/ksfilter/ks/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Feb 24 02:24:58 2009
@@ -38,6 +38,7 @@
         case IRP_MN_QUERY_DEVICE_RELATIONS:
             Irp->IoStatus.Information = 0;
             Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
             return STATUS_INSUFFICIENT_RESOURCES;
         case IRP_MN_REMOVE_DEVICE:
             // FIXME
@@ -48,10 +49,12 @@
         case IRP_MN_SURPRISE_REMOVAL:
             Irp->IoStatus.Information = 0;
             Irp->IoStatus.Status = STATUS_SUCCESS;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
             return STATUS_SUCCESS;
         default:
             Irp->IoStatus.Information = 0;
             Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
             //Status = IoCallDriver(NULL /* PnpBaseObject */, Irp);
     }
 
@@ -79,6 +82,10 @@
     IN  PIRP Irp)
 {
     UNIMPLEMENTED;
+
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
     return STATUS_UNSUCCESSFUL;
 }
 

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue
Feb 24 02:24:58 2009
@@ -144,7 +144,7 @@
 {
     PIO_STACK_LOCATION IoStack;
     ISubdevice *SubDevice = NULL;
-    SUBDEVICE_DESCRIPTOR * Descriptor;
+    SUBDEVICE_DESCRIPTOR * Descriptor = NULL;
 	NTSTATUS Status;
 #if defined(DBG)
     IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface;

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Tue Feb 24 02:24:58
2009
@@ -131,6 +131,7 @@
 
             /* Do not complete? */
             Irp->IoStatus.Status = STATUS_SUCCESS;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
             return STATUS_SUCCESS;
 
         case IRP_MN_QUERY_INTERFACE:
@@ -138,15 +139,24 @@
             /* FIXME
              * call next lower device object */
             Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
-            return Irp->IoStatus.Status;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            return STATUS_UNSUCCESSFUL;
 
         case IRP_MN_QUERY_DEVICE_RELATIONS:
             Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
-            return Irp->IoStatus.Status;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            return STATUS_UNSUCCESSFUL;
+        case IRP_MN_FILTER_RESOURCE_REQUIREMENTS:
+            Irp->IoStatus.Status = STATUS_SUCCESS;
+            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            return STATUS_SUCCESS;
     }
 
     DPRINT1("unhandled function %u\n", IoStack->MinorFunction);
-    return STATUS_SUCCESS;
+
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 /*
@@ -254,19 +264,6 @@
     return STATUS_UNSUCCESSFUL;
 }
 
-static
-NTSTATUS
-NTAPI
-IrpCompletionRoutine(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp,
-    IN PVOID Context)
-{
-    KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE);
-    return STATUS_SUCCESS;
-}
-
-
 /*
  * @implemented
  */
@@ -285,9 +282,6 @@
 return STATUS_SUCCESS;
     /* initialize the notification event */
     KeInitializeEvent(&Event, NotificationEvent, FALSE);
-
-    /* setup a completion routine */
-    IoSetCompletionRoutine(Irp, IrpCompletionRoutine, (PVOID)&Event, TRUE, FALSE,
FALSE);
 
     /* copy the current stack location */
     IoCopyCurrentIrpStackLocationToNext(Irp);

Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Tue Feb 24 02:24:58
2009
@@ -165,12 +165,7 @@
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
 {
-    NTSTATUS Status = STATUS_SUCCESS;
-    PWDMAUD_DEVICE_EXTENSION DeviceExtension;
-
     DPRINT1("WdmAudClose\n");
-
-    DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
 
 #if KS_IMPLEMENTED
     Status = KsDereferenceSoftwareBusObject(DeviceExtension->DeviceHeader);
@@ -182,11 +177,11 @@
     }
 #endif
 
-    Irp->IoStatus.Status = Status;
+    Irp->IoStatus.Status = STATUS_SUCCESS;
     Irp->IoStatus.Information = 0;
     IoCompleteRequest(Irp, IO_NO_INCREMENT);
 
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS

Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Feb 24 02:24:58
2009
@@ -137,18 +137,18 @@
 
     /* copy device count array */
     if (ClientInfo->NumDevices)
-	{
+    {
         RtlMoveMemory(Index, ClientInfo->Devices, ClientInfo->NumDevices *
sizeof(ULONG));
         RtlMoveMemory(Handle, ClientInfo->Handels, ClientInfo->NumDevices *
sizeof(HANDLE));
-	}
+    }
 
     Index[ClientInfo->NumDevices] = DeviceNumber;
     Handle[ClientInfo->NumDevices] = NULL;
-	ExFreePool(ClientInfo->Handels);
+    ExFreePool(ClientInfo->Handels);
     ExFreePool(ClientInfo->Devices);
     ClientInfo->NumDevices++;
     ClientInfo->Devices = Index;
-	ClientInfo->Handels = Handle;
+    ClientInfo->Handels = Handle;
 
     return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0);
 }
@@ -662,6 +662,5 @@
     DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer,
Property->Id, Property->Flags);
     DbgBreakPoint();
     RtlFreeUnicodeString(&GuidString);
-
-    return Status;
+    return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0);
 }

Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Tue Feb 24 02:24:58
2009
@@ -24,7 +24,7 @@
 {
     PIO_STACK_LOCATION IoStack;
 
-    DPRINT1("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n",
DeviceObject);
+    DPRINT("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n",
DeviceObject);
 
     IoStack = IoGetCurrentIrpStackLocation(Irp);
     if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY)
@@ -32,7 +32,13 @@
        return SysAudioHandleProperty(DeviceObject, Irp);
     }
 
-    return STATUS_SUCCESS;
+    DPRINT1("Dispatch_fnDeviceIoControl Unhandeled %x\n",
IoStack->Parameters.DeviceIoControl.IoControlCode);
+    DbgBreakPoint();
+
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -43,7 +49,10 @@
 {
     DPRINT1("Dispatch_fnRead called DeviceObject %p Irp %p\n", DeviceObject);
 
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -54,7 +63,10 @@
 {
     DPRINT1("Dispatch_fnWrite called DeviceObject %p Irp %p\n", DeviceObject);
 
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -122,8 +134,10 @@
 {
     DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n",
DeviceObject);
 
-
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -135,7 +149,10 @@
 
     DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n",
DeviceObject);
 
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 BOOLEAN

Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Tue Feb 24 02:24:58 2009
@@ -48,19 +48,9 @@
 
     IrpStack = IoGetCurrentIrpStackLocation(Irp);
 
-    DPRINT1("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction);
+    DPRINT("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction);
 
     DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension;
-
-
-    if (IrpStack->MinorFunction == IRP_MN_START_DEVICE)
-    {
-    DPRINT1("SysAudio_Pnp called for func IRP_MN_START_DEVICE\n");
-    Irp->IoStatus.Status = STATUS_SUCCESS;
-    Irp->IoStatus.Information = 0;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
-    return STATUS_SUCCESS;
-	}
 
     if (IrpStack->MinorFunction == IRP_MN_REMOVE_DEVICE)
     {

Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Tue Feb 24 02:24:58 2009
@@ -57,7 +57,10 @@
 {
     DPRINT1("Pin_fnRead called DeviceObject %p Irp %p\n", DeviceObject);
 
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -114,31 +117,38 @@
 {
     DPRINT1("Pin_fnFlush called DeviceObject %p Irp %p\n", DeviceObject);
 
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS
+NTAPI
+Pin_fnClose(
+    PDEVICE_OBJECT DeviceObject,
+    PIRP Irp)
+{
+    DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject);
+
+    Irp->IoStatus.Status = STATUS_SUCCESS;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
     return STATUS_SUCCESS;
 }
 
 NTSTATUS
 NTAPI
-Pin_fnClose(
-    PDEVICE_OBJECT DeviceObject,
-    PIRP Irp)
-{
-    DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject);
-
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
 Pin_fnQuerySecurity(
     PDEVICE_OBJECT DeviceObject,
     PIRP Irp)
 {
     DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n",
DeviceObject);
 
-
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
@@ -150,7 +160,10 @@
 
     DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n",
DeviceObject);
 
-    return STATUS_SUCCESS;
+    Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
+    Irp->IoStatus.Information = 0;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return STATUS_UNSUCCESSFUL;
 }
 
 BOOLEAN