branch update for HEAD-2003050101

[reactos.git] / ntoskrnl / io / cleanup.c

diff --git a/ntoskrnl/io/cleanup.c b/ntoskrnl/io/cleanup.c
index 4a22f38..32a9850 100644 (file)
--- a/ntoskrnl/io/cleanup.c
+++ b/ntoskrnl/io/cleanup.c
@@ -99,12 +99,21 @@ VOID IoDeviceControlCompletion(PDEVICE_OBJECT DeviceObject,
        
       case METHOD_IN_DIRECT:
        DPRINT ("Using METHOD_IN_DIRECT!\n");
+
+       /* copy output buffer back and free it */
+        if (Irp->AssociatedIrp.SystemBuffer)
+         {
+            if (IoStack->Parameters.DeviceIoControl.OutputBufferLength)
+              {
+                 RtlCopyMemory(Irp->UserBuffer,
+                               Irp->AssociatedIrp.SystemBuffer,
+                               IoStack->Parameters.DeviceIoControl.
+                               OutputBufferLength);
+              }
+           ExFreePool (Irp->AssociatedIrp.SystemBuffer);
+         }
        
-       /* free input buffer (control buffer) */
-       if (Irp->AssociatedIrp.SystemBuffer)
-         ExFreePool (Irp->AssociatedIrp.SystemBuffer);
-       
-       /* free output buffer (data transfer buffer) */
+       /* free input buffer (data transfer buffer) */
        if (Irp->MdlAddress)
          IoFreeMdl (Irp->MdlAddress);
        break;