[Wine-patches] [eterhack] mountmgr.sys: Fix merge error (eterbug #5642).

[Alexander Morozov]

----------- следующая часть -----------
From 07d3da16b25bc132856f8ea6ccc3f4e41a40117e Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue, 8 Jun 2010 17:02:20 +0400
Subject: [eterhack] mountmgr.sys: Fix merge error (eterbug #5642).

---
 dlls/mountmgr.sys/device.c   |    3 ++-
 dlls/mountmgr.sys/mountmgr.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 578cee3..a4d7e2a 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -1099,8 +1099,9 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp )
     }
 
     LeaveCriticalSection( &device_section );
+    irp->IoStatus.u.Status = status;
     IoCompleteRequest( irp, IO_NO_INCREMENT );
-    return irp->IoStatus.u.Status;
+    return status;
 }
 
 /* driver entry point for the harddisk driver */
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index c36602d..c6dca13 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -426,8 +426,9 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
         status = STATUS_NOT_SUPPORTED;
         break;
     }
+    irp->IoStatus.u.Status = status;
     IoCompleteRequest( irp, IO_NO_INCREMENT );
-    return irp->IoStatus.u.Status;
+    return status;
 }
 
 static int automount_enabled(void)
-- 
1.6.5.8