ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Store currently executed IRP call on server side. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-05-03 15:40:18 +02:00 committed by Alexandre Julliard
parent b1e1111d7b
commit 781dd9a145
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/device.c
View File

@ -89,6 +89,7 @@ struct device_manager
struct object obj; /* object header */ struct object obj; /* object header */
struct list devices; /* list of devices */ struct list devices; /* list of devices */
struct list requests; /* list of pending irps across all devices */ struct list requests; /* list of pending irps across all devices */
struct irp_call *current_call; /* call currently executed on client side */
struct wine_rb_tree kernel_objects; /* map of objects that have client side pointer associated */ struct wine_rb_tree kernel_objects; /* map of objects that have client side pointer associated */
}; };
@ -710,6 +711,12 @@ static void device_manager_destroy( struct object *obj )
struct kernel_object *kernel_object; struct kernel_object *kernel_object;
struct list *ptr; struct list *ptr;
if (manager->current_call)
{
release_object( manager->current_call );
manager->current_call = NULL;
}
while (manager->kernel_objects.root) while (manager->kernel_objects.root)
{ {
kernel_object = WINE_RB_ENTRY_VALUE( manager->kernel_objects.root, struct kernel_object, rb_entry ); kernel_object = WINE_RB_ENTRY_VALUE( manager->kernel_objects.root, struct kernel_object, rb_entry );
@ -740,6 +747,7 @@ static struct device_manager *create_device_manager(void)
if ((manager = alloc_object( &device_manager_ops ))) if ((manager = alloc_object( &device_manager_ops )))
{ {
manager->current_call = NULL;
list_init( &manager->devices ); list_init( &manager->devices );
list_init( &manager->requests ); list_init( &manager->requests );
wine_rb_init( &manager->kernel_objects, compare_kernel_object ); wine_rb_init( &manager->kernel_objects, compare_kernel_object );
@ -870,6 +878,12 @@ DECL_HANDLER(get_next_device_request)
clear_error(); clear_error();
} }
if (manager->current_call)
{
release_object( manager->current_call );
manager->current_call = NULL;
}
if ((ptr = list_head( &manager->requests ))) if ((ptr = list_head( &manager->requests )))
{ {
irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry );
@ -889,7 +903,8 @@ DECL_HANDLER(get_next_device_request)
iosb->in_size = 0; iosb->in_size = 0;
list_remove( &irp->mgr_entry ); list_remove( &irp->mgr_entry );
list_init( &irp->mgr_entry ); list_init( &irp->mgr_entry );
if (!irp->file) release_object( irp ); /* no longer on manager queue */ if (irp->file) grab_object( irp ); /* we already own the object if it's only on manager queue */
manager->current_call = irp;
} }
} }
else set_error( STATUS_PENDING ); else set_error( STATUS_PENDING );