marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Remove failed ioctls from the queue as soon as the result is set.

oldstable
Alexandre Julliard 2007-10-30 11:30:58 +01:00
parent a844a38fad
commit 8268ad551a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/device.c
View File

@ -226,11 +226,20 @@ static void set_ioctl_result( struct ioctl_call *ioctl, unsigned int status,
ioctl->device = NULL;
if (ioctl->async)
{
async_terminate( ioctl->async, ioctl->out_size ? STATUS_ALERTED : status );
if (ioctl->out_size) status = STATUS_ALERTED;
async_terminate( ioctl->async, status );
release_object( ioctl->async );
ioctl->async = NULL;
}
wake_up( &ioctl->obj, 0 );
if (status != STATUS_ALERTED)
{
/* remove it from the device queue */
/* (for STATUS_ALERTED this will be done in get_ioctl_result) */
list_remove( &ioctl->dev_entry );
release_object( ioctl ); /* no longer on the device queue */
}
}
@ -352,12 +361,12 @@ static struct device *create_device( struct directory *root, const struct unicod
static void delete_device( struct device *device )
{
struct ioctl_call *ioctl;
struct ioctl_call *ioctl, *next;
if (!device->manager) return; /* already deleted */
/* terminate all pending requests */
LIST_FOR_EACH_ENTRY( ioctl, &device->requests, struct ioctl_call, dev_entry )
LIST_FOR_EACH_ENTRY_SAFE( ioctl, next, &device->requests, struct ioctl_call, dev_entry )
{
list_remove( &ioctl->mgr_entry );
set_ioctl_result( ioctl, STATUS_FILE_DELETED, NULL, 0 );