server: Remove unused device manager argument from set_irp_result call.
Sebastian Lackner
sebastian at fds-team.de
Wed Oct 28 17:18:49 CDT 2015
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
The call was implemented in ecf7ed66509b462b7a9cd6e23dbd1b2b43f515d6,
but the "manager" parameter was never really used. Are there plans to
use it in later patches? get_device_manager() on the client side should
also be a noop at this point because we got the handle from
get_next_device_request(), and definitely have a device manager.
dlls/ntoskrnl.exe/ntoskrnl.c | 2 --
server/device.c | 6 ------
server/protocol.def | 1 -
3 files changed, 9 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 96af772..31f0b15 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1271,13 +1271,11 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost )
handle = (HANDLE)irp->UserIosb;
if (handle)
{
- HANDLE manager = get_device_manager();
void *out_buff = irp->UserBuffer;
FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject;
SERVER_START_REQ( set_irp_result )
{
- req->manager = wine_server_obj_handle( manager );
req->handle = wine_server_obj_handle( handle );
req->status = irp->IoStatus.u.Status;
req->file_ptr = wine_server_client_ptr( file );
diff --git a/server/device.c b/server/device.c
index 9ef587c..fb91c02 100644
--- a/server/device.c
+++ b/server/device.c
@@ -807,11 +807,6 @@ DECL_HANDLER(get_next_device_request)
DECL_HANDLER(set_irp_result)
{
struct irp_call *irp;
- struct device_manager *manager;
-
- if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager,
- 0, &device_manager_ops )))
- return;
if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops )))
{
@@ -820,7 +815,6 @@ DECL_HANDLER(set_irp_result)
close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */
release_object( irp );
}
- release_object( manager );
}
diff --git a/server/protocol.def b/server/protocol.def
index c313006..ee481a8 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2345,7 +2345,6 @@ enum message_type
/* Store results of an async irp */
@REQ(set_irp_result)
- obj_handle_t manager; /* handle to the device manager */
obj_handle_t handle; /* handle to the irp */
unsigned int status; /* status of the irp */
client_ptr_t file_ptr; /* opaque pointer to the file object */
--
2.6.1
More information about the wine-patches
mailing list