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

winedevice: Wait until driver has started before returning. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2018-03-24 23:37:48 +00:00 committed by Alexandre Julliard
parent 041f59350c
commit 57268241f7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/winedevice/device.c
View File

@ -55,6 +55,7 @@ struct wine_driver
struct wine_rb_entry entry; struct wine_rb_entry entry;
SERVICE_STATUS_HANDLE handle; SERVICE_STATUS_HANDLE handle;
HANDLE started;
DRIVER_OBJECT *driver_obj; DRIVER_OBJECT *driver_obj;
WCHAR name[1]; WCHAR name[1];
}; };
@ -390,6 +391,8 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co
goto error; goto error;
} }
SetEvent(driver->started);
EnterCriticalSection( &drivers_cs ); EnterCriticalSection( &drivers_cs );
driver->driver_obj = driver_obj; driver->driver_obj = driver_obj;
set_service_status( driver->handle, SERVICE_RUNNING, set_service_status( driver->handle, SERVICE_RUNNING,
@ -441,10 +444,16 @@ static NTSTATUS create_driver( const WCHAR *driver_name )
environment.Version = 1; environment.Version = 1;
environment.CleanupGroup = cleanup_group; environment.CleanupGroup = cleanup_group;
driver->started = CreateEventW(NULL, TRUE, FALSE, NULL);
/* don't block the service control handler */ /* don't block the service control handler */
if (!TrySubmitThreadpoolCallback( async_create_driver, driver, &environment )) if (!TrySubmitThreadpoolCallback( async_create_driver, driver, &environment ))
async_create_driver( NULL, driver ); async_create_driver( NULL, driver );
/* Windows wait 30 Seconds */
if(WaitForSingleObject(driver->started, 30000) == WAIT_TIMEOUT)
return ERROR_SERVICE_REQUEST_TIMEOUT;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -453,6 +462,7 @@ static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context
if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) if (unload_driver( entry, TRUE ) != STATUS_SUCCESS)
{ {
struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry );
CloseHandle(driver->started);
ObDereferenceObject( driver->driver_obj ); ObDereferenceObject( driver->driver_obj );
CloseServiceHandle( (void *)driver->handle ); CloseServiceHandle( (void *)driver->handle );
HeapFree( GetProcessHeap(), 0, driver ); HeapFree( GetProcessHeap(), 0, driver );