[Wine-patches] [2/8] wineusbhub: Use wine_complete_request.

[Alexander Morozov]

----------- следующая часть -----------
From 0e2bbb12fd6386d244de60803038f841d5a305d4 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Fri, 5 Dec 2008 13:00:50 +0300
Subject: [PATCH] wineusbhub: Use wine_complete_request.

---
 dlls/wineusbhub/wineusbhub.c |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/dlls/wineusbhub/wineusbhub.c b/dlls/wineusbhub/wineusbhub.c
index eb94445..45a4046 100644
--- a/dlls/wineusbhub/wineusbhub.c
+++ b/dlls/wineusbhub/wineusbhub.c
@@ -40,7 +40,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(wineusbhub);
 
 #if defined(HAVE_LIBUSB) && defined(HAVE_USB_H)
-extern void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost );
+extern void wine_complete_request( IRP *irp, UCHAR priority_boost );
 
 DRIVER_OBJECT hubdrv;
 DEVICE_OBJECT *usbdev = NULL;      /* USB PDO */
@@ -59,18 +59,6 @@ static void add_data( char **dst, int *dst_size, void *src, int src_size )
     *dst_size -= copy;
 }
 
-void WINAPI __wine_IofCompleteRequest( IRP *irp, UCHAR priority_boost )
-{
-    #ifdef __i386__
-    __asm__( "movl %1,%%edx\n\t"
-             "movl %0,%%ecx\n\t"
-             "call " __ASM_NAME("IofCompleteRequest")
-             : : "g" (irp), "g" (priority_boost) );
-    #else
-    IofCompleteRequest( irp, priority_boost );
-    #endif
-}
-
 NTSTATUS WINAPI __wine_usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
 {
     IO_STACK_LOCATION *irpsp;
@@ -231,7 +219,7 @@ NTSTATUS WINAPI __wine_usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
     }
     irp->IoStatus.u.Status = status;
     irp->IoStatus.Information = 0;
-    __wine_IofCompleteRequest( irp, IO_NO_INCREMENT );
+    wine_complete_request( irp, IO_NO_INCREMENT );
 
     return status;
 }
@@ -242,7 +230,7 @@ NTSTATUS WINAPI __wine_usbhub_dispatch_pnp( DEVICE_OBJECT *device, IRP *irp )
 
     irp->IoStatus.u.Status = STATUS_SUCCESS;
     irp->IoStatus.Information = 0;
-    __wine_IofCompleteRequest( irp, IO_NO_INCREMENT );
+    wine_complete_request( irp, IO_NO_INCREMENT );
 
     return STATUS_SUCCESS;
 }
-- 
1.6.0.2.GIT