[Wine-patches] [eterhack 4/7] Use IoCompleteRequest instead of wine_complete_request.

Alexander Morozov =?iso-8859-1?q?amorozov_=CE=C1_etersoft=2Eru?=
Чт Мар 26 19:53:58 MSK 2009


---
 dlls/mountmgr.sys/device.c   |    4 +---
 dlls/mountmgr.sys/mountmgr.c |    4 +---
 dlls/parport.sys/parport.c   |    4 +---
 dlls/usbhub.sys/usbhub.c     |    5 ++---
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 466cebc..475e7a1 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -45,8 +45,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
 
-extern void CDECL wine_complete_request( IRP *irp, UCHAR priority_boost );
-
 #define MAX_DOS_DRIVES 26
 
 static const WCHAR drive_types[][8] =
@@ -812,7 +810,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp )
         break;
     }
     irp->IoStatus.u.Status = status;
-    wine_complete_request( irp, IO_NO_INCREMENT );
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
     return status;
 }
 
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index 0e0ac29..7da6695 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -33,8 +33,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
 
-extern void CDECL wine_complete_request( IRP *irp, UCHAR priority_boost );
-
 #define MIN_ID_LEN     4
 
 struct mount_point
@@ -428,7 +426,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
         break;
     }
     irp->IoStatus.u.Status = status;
-    wine_complete_request( irp, IO_NO_INCREMENT );
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
     return status;
 }
 
diff --git a/dlls/parport.sys/parport.c b/dlls/parport.sys/parport.c
index 3573cdc..73fb306 100644
--- a/dlls/parport.sys/parport.c
+++ b/dlls/parport.sys/parport.c
@@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(parport);
 
 
 #ifdef HAVE_LIBIEEE1284
-extern void CDECL wine_complete_request( IRP *irp, UCHAR priority_boost );
-
 struct ParPortExtension
 {
     struct parport *pp;
@@ -126,7 +124,7 @@ static NTSTATUS WINAPI parport_ioctl( DEVICE_OBJECT *device, IRP *irp )
             status = STATUS_NOT_IMPLEMENTED;
     }
     irp->IoStatus.u.Status = status;
-    wine_complete_request( irp, IO_NO_INCREMENT );
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
     return status;
 }
 
diff --git a/dlls/usbhub.sys/usbhub.c b/dlls/usbhub.sys/usbhub.c
index 8194b85..5d3fd27 100644
--- a/dlls/usbhub.sys/usbhub.c
+++ b/dlls/usbhub.sys/usbhub.c
@@ -48,7 +48,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(usbhub);
 
 extern NTSTATUS CDECL __wine_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *dev );
-extern void CDECL wine_complete_request( IRP *irp, UCHAR priority_boost );
 extern DRIVER_OBJECT * CDECL __wine_get_driver_object( const WCHAR *service );
 extern NTSTATUS CDECL __wine_start_device( DRIVER_OBJECT *driver );
 
@@ -253,7 +252,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
 
     irp->IoStatus.u.Status = status;
     irp->IoStatus.Information = 0;
-    wine_complete_request( irp, IO_NO_INCREMENT );
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
 
     return status;
 }
@@ -331,7 +330,7 @@ static NTSTATUS WINAPI usbhub_dispatch_pnp( DEVICE_OBJECT *device, IRP *irp )
 
     irp->IoStatus.u.Status = status;
     irp->IoStatus.Information = info;
-    wine_complete_request( irp, IO_NO_INCREMENT );
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
 
     return STATUS_SUCCESS;
 }
-- 
1.6.1.3.GIT



Подробная информация о списке рассылки Wine-patches