August 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 1.9.17.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: a83d5d3b83042d2305de0595c0d03e4e7bf1e29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83d5d3b83042d2305de0595c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 22:17:09 2016 +0900 Release 1.9.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 857 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +- 4 files changed, 450 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a83d5d3b83042d2305de0…

1 0

Tag wine-1.9.17 : Alexandre Julliard : Release 1.9.17
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: refs/tags/wine-1.9.17 Tag: 2aa81c7ad0bc6078c0ab753b546aa5d1d890f9e6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2aa81c7ad0bc6078c0ab753b546a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 22:17:09 2016 +0900 Release 1.9.17

1 0

Sebastian Lackner : services: Allocate a separate status_changed_event for each service.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 039471ec376b9c45d65811b222a18027bfc773fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=039471ec376b9c45d65811b22… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 08:01:03 2016 +0200 services: Allocate a separate status_changed_event for each service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 20 ++++++++++---------- programs/services/services.c | 42 ++++++++++++++++++++---------------------- programs/services/services.h | 2 +- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 4c6301c..688e4a0 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -758,21 +758,21 @@ DWORD __cdecl svcctl_SetServiceStatus( return err; service_lock(service->service_entry); + /* FIXME: be a bit more discriminant about what parts of the status we set * and check that fields are valid */ service->service_entry->status = *lpServiceStatus; - if ((process = service->service_entry->process)) + SetEvent(service->service_entry->status_changed_event); + + if ((process = service->service_entry->process) && + lpServiceStatus->dwCurrentState == SERVICE_STOPPED) { - if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - { - service->service_entry->process = NULL; - if (!--process->use_count) - terminate_after_timeout(process, service_kill_timeout); - release_process(process); - } - else - SetEvent(process->status_changed_event); + service->service_entry->process = NULL; + if (!--process->use_count) + terminate_after_timeout(process, service_kill_timeout); + release_process(process); } + service_unlock(service->service_entry); return ERROR_SUCCESS; diff --git a/programs/services/services.c b/programs/services/services.c index 6164c45..cf5cb90 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -82,9 +82,6 @@ static DWORD process_create(const WCHAR *name, struct process_entry **entry) (*entry)->overlapped_event = CreateEventW(NULL, TRUE, FALSE, NULL); if (!(*entry)->overlapped_event) goto error; - (*entry)->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!(*entry)->status_changed_event) - goto error; (*entry)->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL); if ((*entry)->control_pipe == INVALID_HANDLE_VALUE) @@ -98,8 +95,6 @@ error: CloseHandle((*entry)->control_mutex); if ((*entry)->overlapped_event) CloseHandle((*entry)->overlapped_event); - if ((*entry)->status_changed_event) - CloseHandle((*entry)->status_changed_event); HeapFree(GetProcessHeap(), 0, *entry); return err; } @@ -110,7 +105,6 @@ static void free_process_entry(struct process_entry *entry) CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); CloseHandle(entry->overlapped_event); - CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry); } @@ -125,6 +119,13 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) HeapFree(GetProcessHeap(), 0, *entry); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + (*entry)->status_changed_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!(*entry)->status_changed_event) + { + HeapFree(GetProcessHeap(), 0, (*entry)->name); + HeapFree(GetProcessHeap(), 0, *entry); + return GetLastError(); + } (*entry)->ref_count = 1; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; @@ -135,6 +136,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) void free_service_entry(struct service_entry *entry) { + CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry->name); HeapFree(GetProcessHeap(), 0, entry->config.lpBinaryPathName); HeapFree(GetProcessHeap(), 0, entry->config.lpDependencies); @@ -790,6 +792,9 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p } service_entry->status.dwCurrentState = SERVICE_START_PENDING; + service_entry->status.dwControlsAccepted = 0; + ResetEvent(service_entry->status_changed_event); + scmdatabase_add_process(service_entry->db, process); service_entry->process = grab_process(process); process->use_count++; @@ -814,24 +819,20 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p return ERROR_SUCCESS; } -static DWORD process_wait_for_startup(struct process_entry *process) +static DWORD service_wait_for_startup(struct service_entry *service, struct process_entry *process) { - HANDLE handles[2] = { process->status_changed_event, process->process }; - DWORD ret; + HANDLE handles[2] = { service->status_changed_event, process->process }; + DWORD result; - ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - return (ret == WAIT_OBJECT_0) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; -} - -static DWORD service_is_running(struct service_entry *service) -{ - DWORD state; + result = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); + if (result != WAIT_OBJECT_0) + return ERROR_SERVICE_REQUEST_TIMEOUT; service_lock(service); - state = service->status.dwCurrentState; + result = service->status.dwCurrentState; service_unlock(service); - return (state == SERVICE_START_PENDING || state == SERVICE_RUNNING) ? + return (result == SERVICE_START_PENDING || result == SERVICE_RUNNING) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; } @@ -911,10 +912,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = process_send_start_message(process, service->name, service_argv, service_argc); if (err == ERROR_SUCCESS) - err = process_wait_for_startup(process); - - if (err == ERROR_SUCCESS) - err = service_is_running(service); + err = service_wait_for_startup(service, process); if (err == ERROR_SUCCESS) ReleaseMutex(process->control_mutex); diff --git a/programs/services/services.h b/programs/services/services.h index 417efcd..b03a157 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -43,7 +43,6 @@ struct process_entry HANDLE control_mutex; HANDLE control_pipe; HANDLE overlapped_event; - HANDLE status_changed_event; }; struct service_entry @@ -53,6 +52,7 @@ struct service_entry LONG ref_count; /* number of references - if goes to zero and the service is deleted the structure will be freed */ LPWSTR name; SERVICE_STATUS status; + HANDLE status_changed_event; QUERY_SERVICE_CONFIGW config; DWORD preshutdown_timeout; LPWSTR description;

1 0

Sebastian Lackner : winedevice: Track loaded drivers and update their status on load/unload.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: aab54da6695553f3c15bbc57325429a076ae7c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab54da6695553f3c15bbc573… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 08:02:09 2016 +0200 winedevice: Track loaded drivers and update their status on load/unload. Based on a patch by Aric Stewart. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 179 +++++++++++++++++++++++++++++++------------ 1 file changed, 130 insertions(+), 49 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 771a0c1..ac368c8 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -32,6 +32,8 @@ #include "winnls.h" #include "winsvc.h" #include "ddk/wdm.h" +#include "wine/rbtree.h" +#include "wine/svcctl.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -41,8 +43,49 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static SERVICE_STATUS_HANDLE service_handle; +static SC_HANDLE manager_handle; static HANDLE stop_event; +struct wine_driver +{ + struct wine_rb_entry entry; + + SERVICE_STATUS_HANDLE handle; + DRIVER_OBJECT *driver_obj; + WCHAR name[1]; +}; + +static struct wine_rb_tree wine_drivers; + +static void *wine_drivers_rb_alloc( size_t size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static void *wine_drivers_rb_realloc( void *ptr, size_t size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); +} + +static void wine_drivers_rb_free( void *ptr ) +{ + HeapFree( GetProcessHeap(), 0, ptr ); +} + +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + return strcmpW( (const WCHAR *)key, driver->name ); +} + +static const struct wine_rb_functions wine_drivers_rb_functions = +{ + wine_drivers_rb_alloc, + wine_drivers_rb_realloc, + wine_drivers_rb_free, + wine_drivers_rb_compare, +}; + /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { @@ -250,11 +293,30 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return status; } +/* helper function to update service status */ +static void set_service_status( SERVICE_STATUS_HANDLE handle, DWORD state, DWORD accepted ) +{ + SERVICE_STATUS status; + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = state; + status.dwControlsAccepted = accepted; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = (state == SERVICE_START_PENDING) ? 10000 : 0; + SetServiceStatus( handle, &status ); +} + /* call the driver unload function */ -static void unload_driver( DRIVER_OBJECT *driver_obj ) +static void unload_driver( struct wine_rb_entry *entry, void *context ) { + struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + DRIVER_OBJECT *driver_obj = driver->driver_obj; LDR_MODULE *ldr = driver_obj->DriverSection; + TRACE( "stopping driver %s\n", wine_dbgstr_w(driver->name) ); + set_service_status( driver->handle, SERVICE_STOP_PENDING, 0 ); + if (driver_obj->DriverUnload) { if (WINE_TRACE_ON(relay)) @@ -271,26 +333,60 @@ static void unload_driver( DRIVER_OBJECT *driver_obj ) FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); ObDereferenceObject( driver_obj ); + + set_service_status( driver->handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); } -static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_obj) +/* load a driver and notify services.exe about the status change */ +static NTSTATUS create_driver( const WCHAR *driver_name ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + struct wine_driver *driver; UNICODE_STRING drv_name; NTSTATUS status; + DWORD length; WCHAR *str; - str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ); + length = FIELD_OFFSET( struct wine_driver, name[strlenW(driver_name) + 1] ); + if (!(driver = HeapAlloc( GetProcessHeap(), 0, length ))) + return STATUS_NO_MEMORY; + + strcpyW( driver->name, driver_name ); + driver->driver_obj = NULL; + + if (!(driver->handle = (void *)OpenServiceW( manager_handle, driver_name, SERVICE_SET_STATUS ))) + { + HeapFree( GetProcessHeap(), 0, driver ); + return STATUS_UNSUCCESSFUL; + } + + if (wine_rb_put( &wine_drivers, driver_name, &driver->entry )) + { + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); + return STATUS_UNSUCCESSFUL; + } + + if (!(str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + TRACE( "starting driver %s\n", wine_dbgstr_w(driver_name) ); + set_service_status( driver->handle, SERVICE_START_PENDING, 0 ); + lstrcpyW( str, driverW); lstrcatW( str, driver_name ); RtlInitUnicodeString( &drv_name, str ); status = IoCreateDriver( &drv_name, init_driver ); - if (status == STATUS_SUCCESS) { status = ObReferenceObjectByName( &drv_name, OBJ_CASE_INSENSITIVE, NULL, - 0, NULL, KernelMode, NULL, (void **)driver_obj ); + 0, NULL, KernelMode, NULL, (void **)&driver->driver_obj ); if (status != STATUS_SUCCESS) { ERR("Failed to locate loaded driver (%s)\n", wine_dbgstr_w(driver_name)); @@ -298,77 +394,62 @@ static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_o } RtlFreeUnicodeString( &drv_name ); + + if (status == STATUS_SUCCESS) + { + set_service_status( driver->handle, SERVICE_RUNNING, + SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); + return STATUS_SUCCESS; + } + +error: + set_service_status( driver->handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( (void *)driver->handle ); + wine_rb_remove( &wine_drivers, driver_name ); + HeapFree( GetProcessHeap(), 0, driver ); return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { - SERVICE_STATUS status; const WCHAR *driver_name = context; - status.dwServiceType = SERVICE_WIN32; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - status.dwWin32ExitCode = 0; - status.dwServiceSpecificExitCode = 0; - status.dwCheckPoint = 0; - status.dwWaitHint = 0; - - switch(ctrl) + switch (ctrl) { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: WINE_TRACE( "shutting down %s\n", wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_STOP_PENDING; - status.dwControlsAccepted = 0; - SetServiceStatus( service_handle, &status ); + set_service_status( service_handle, SERVICE_STOP_PENDING, 0 ); SetEvent( stop_event ); return NO_ERROR; default: WINE_FIXME( "got service ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_RUNNING; - SetServiceStatus( service_handle, &status ); + set_service_status( service_handle, SERVICE_RUNNING, + SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return NO_ERROR; } } static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { - SERVICE_STATUS status; const WCHAR *driver_name = argv[0]; - DRIVER_OBJECT *driver_obj; - - WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); - stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - - service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (void *)driver_name ); - if (!service_handle) + if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) + return; + if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) + return; + if (!(manager_handle = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ))) + return; + if (!(service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (void *)driver_name ))) return; - status.dwServiceType = SERVICE_WIN32; - status.dwCurrentState = SERVICE_START_PENDING; - status.dwControlsAccepted = 0; - status.dwWin32ExitCode = 0; - status.dwServiceSpecificExitCode = 0; - status.dwCheckPoint = 0; - status.dwWaitHint = 10000; - SetServiceStatus( service_handle, &status ); - - if (create_driver( driver_name, &driver_obj ) == STATUS_SUCCESS) - { - status.dwCurrentState = SERVICE_RUNNING; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - SetServiceStatus( service_handle, &status ); - + if (create_driver( driver_name ) == STATUS_SUCCESS) wine_ntoskrnl_main_loop( stop_event ); - unload_driver( driver_obj ); - } - else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_STOPPED; - status.dwControlsAccepted = 0; - SetServiceStatus( service_handle, &status ); - WINE_TRACE( "service %s stopped\n", wine_dbgstr_w(driver_name) ); + wine_rb_destroy( &wine_drivers, unload_driver, NULL ); + set_service_status( service_handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( manager_handle ); + CloseHandle( stop_event ); } int wmain( int argc, WCHAR *argv[] )

1 0

Bruno Jesus : dinput: Implement DIPROP_PRODUCTNAME in GetProperty.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 44303b6625983534342fb44b06d558ba7d4934fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=44303b6625983534342fb44b0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 16:40:22 2016 -0300 dinput: Implement DIPROP_PRODUCTNAME in GetProperty. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 6 +++++- dlls/dinput/tests/joystick.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 46ea316..52ff925 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -583,6 +583,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR) DIPROP_PRODUCTNAME: case (DWORD_PTR) DIPROP_INSTANCENAME: { DIPROPSTRING *ps = (DIPROPSTRING*) pdiph; DIDEVICEINSTANCEW didev; @@ -590,7 +591,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF didev.dwSize = sizeof(didev); IDirectInputDevice_GetDeviceInfo(iface, &didev); - lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH); + if (LOWORD(rguid) == (DWORD_PTR) DIPROP_PRODUCTNAME) + lstrcpynW(ps->wsz, didev.tszProductName, MAX_PATH); + else + lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH); return DI_OK; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 00d3b60..77bb729 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -253,6 +253,14 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_INSTANCENAME returned is wrong. Expected: %s Got: %s\n", wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_PRODUCTNAME, &dps.diph); + ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_PRODUCTNAME failed: %08x\n", hr); + + /* Test if product name is the same as present in DIDEVICEINSTANCE */ + MultiByteToWideChar(CP_ACP, 0, lpddi->tszProductName, -1, nameBuffer, MAX_PATH); + ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_PRODUCTNAME returned is wrong. Expected: %s Got: %s\n", + wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + /* Test for GUIDPATH properties */ memset(&dpg, 0, sizeof(dpg)); dpg.diph.dwSize = sizeof(DIPROPGUIDANDPATH);

1 0

Bruno Jesus : dinput: Cope with NULL flags in LinuxInputEffectImpl_GetEffectStatus.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: e8273ae497ff3c3e28674281127be17ddaacaffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8273ae497ff3c3e286742811… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 22:50:13 2016 -0300 dinput: Cope with NULL flags in LinuxInputEffectImpl_GetEffectStatus. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 3 +++ dlls/dinput/tests/joystick.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ad7d3ad..dc12aa6 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -131,6 +131,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectStatus( { TRACE("(this=%p,%p)\n", iface, pdwFlags); + if (!pdwFlags) + return E_POINTER; + /* linux sends the effect status through an event. * that event is trapped by our parent joystick driver * and there is no clean way to pass it back to us. */ diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 77bb729..af36e6d 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -473,6 +473,9 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) * - effects are preserved (Download + Start doesn't complain * about incomplete effect) */ + hr = IDirectInputEffect_GetEffectStatus(effect, NULL); + ok(hr==E_POINTER,"IDirectInputEffect_GetEffectStatus() must fail with E_POINTER, got: %08x\n", hr); + effect_status = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n");

1 0

Keno Fischer : kernel32: Fix RegisterWaitForSingleObject for console handles.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: ccc1d346a6cd4f2d12b6ce1c2f6bdcd92f8a0bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc1d346a6cd4f2d12b6ce1c2… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Tue Aug 16 14:35:27 2016 -0400 kernel32: Fix RegisterWaitForSingleObject for console handles. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 37 +++++++++++++++-------------- dlls/kernel32/tests/console.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index c10fd01..b8222db 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -148,6 +148,23 @@ DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE *handles, return WaitForMultipleObjectsEx( count, handles, wait_all, timeout, FALSE ); } +static HANDLE normalize_handle_if_console(HANDLE handle) +{ + if ((handle == (HANDLE)STD_INPUT_HANDLE) || + (handle == (HANDLE)STD_OUTPUT_HANDLE) || + (handle == (HANDLE)STD_ERROR_HANDLE)) + handle = GetStdHandle( HandleToULong(handle) ); + + /* yes, even screen buffer console handles are waitable, and are + * handled as a handle to the console itself !! + */ + if (is_console_handle(handle)) + { + if (VerifyConsoleIoHandle(handle)) + handle = GetConsoleInputWaitHandle(); + } + return handle; +} /*********************************************************************** * WaitForMultipleObjectsEx (KERNEL32.@) @@ -167,23 +184,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, return WAIT_FAILED; } for (i = 0; i < count; i++) - { - if ((handles[i] == (HANDLE)STD_INPUT_HANDLE) || - (handles[i] == (HANDLE)STD_OUTPUT_HANDLE) || - (handles[i] == (HANDLE)STD_ERROR_HANDLE)) - hloc[i] = GetStdHandle( HandleToULong(handles[i]) ); - else - hloc[i] = handles[i]; - - /* yes, even screen buffer console handles are waitable, and are - * handled as a handle to the console itself !! - */ - if (is_console_handle(hloc[i])) - { - if (VerifyConsoleIoHandle(hloc[i])) - hloc[i] = GetConsoleInputWaitHandle(); - } - } + hloc[i] = normalize_handle_if_console(handles[i]); status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) ); @@ -209,6 +210,7 @@ BOOL WINAPI RegisterWaitForSingleObject(PHANDLE phNewWaitObject, HANDLE hObject, TRACE("%p %p %p %p %d %d\n", phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); + hObject = normalize_handle_if_console(hObject); status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); if (status != STATUS_SUCCESS) { @@ -231,6 +233,7 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject, TRACE("%p %p %p %d %d\n", hObject,Callback,Context,dwMilliseconds,dwFlags); + hObject = normalize_handle_if_console(hObject); status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); if (status != STATUS_SUCCESS) { diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 24f15d4..c88db6a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -908,6 +908,58 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void CALLBACK signaled_function(void *p, BOOLEAN timeout) +{ + HANDLE event = p; + SetEvent(event); + ok(!timeout, "wait shouldn't have timed out\n"); +} + +static void testWaitForConsoleInput(HANDLE input_handle) +{ + HANDLE wait_handle; + HANDLE complete_event; + INPUT_RECORD record; + DWORD events_written; + DWORD wait_ret; + BOOL ret; + + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + /* Test success case */ + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret == TRUE, "Expected RegisterWaitForSingleObject to return TRUE, got %d\n", ret); + /* give worker thread a chance to start up */ + Sleep(100); + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input_handle, &record, 1, &events_written); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + wait_ret = WaitForSingleObject(complete_event, INFINITE); + ok(wait_ret == WAIT_OBJECT_0, "Expected the handle to be signaled\n"); + ret = UnregisterWait(wait_handle); + /* If the callback is still running, this fails with ERROR_IO_PENDING, but + that's ok and expected. */ + ok(ret != 0 || GetLastError() == ERROR_IO_PENDING, + "UnregisterWait failed with error %d\n", GetLastError()); + + /* Test timeout case */ + FlushConsoleInputBuffer(input_handle); + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + wait_ret = WaitForSingleObject(complete_event, 100); + ok(wait_ret == WAIT_TIMEOUT, "Expected the wait to time out\n"); + ret = UnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* Clean up */ + ok(CloseHandle(complete_event), "Failed to close event handle, last error %d\n", GetLastError()); +} + static void test_GetSetConsoleInputExeName(void) { BOOL ret; @@ -3093,6 +3145,8 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ testScreenBuffer(hConOut); + /* Test waiting for a console handle */ + testWaitForConsoleInput(hConIn); /* clear duplicated console font table */ CloseHandle(hConIn);

1 0

Alexandre Julliard : user32/tests: Disable custom GDI clipboard formats tests on 64-bit.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: e3a8c3a8694f7bb5cbb57e58d231ca7fa452d71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a8c3a8694f7bb5cbb57e58d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 16:06:03 2016 +0900 user32/tests: Disable custom GDI clipboard formats tests on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 60 ++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4fac7c6..f51c162 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -28,6 +28,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); static int thread_from_line; static char *argv0; @@ -792,12 +793,16 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_PALETTE, palette ); ok( h == palette, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); - ok( h == bitmap2, "got %p\n", h ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); - ok( h == pen, "got %p\n", h ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + /* setting custom GDI formats crashes on 64-bit Windows */ + if (!is_win64) + { + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( h == bitmap2, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( h == pen, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + } data = GetClipboardData( CF_TEXT ); ok( data == htext, "wrong data %p\n", data ); @@ -853,10 +858,13 @@ static void test_handles( HWND hwnd ) ok( data == bitmap, "expected bitmap %p\n", data ); data = GetClipboardData( CF_PALETTE ); ok( data == palette, "expected palette %p\n", data ); - data = GetClipboardData( CF_GDIOBJFIRST + 1 ); - ok( data == bitmap2, "expected bitmap2 %p\n", data ); - data = GetClipboardData( CF_GDIOBJFIRST + 2 ); - ok( data == pen, "expected pen %p\n", data ); + if (!is_win64) + { + data = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( data == bitmap2, "expected bitmap2 %p\n", data ); + data = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( data == pen, "expected pen %p\n", data ); + } data = GetClipboardData( CF_DIB ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_DIBV5 ); @@ -915,14 +923,17 @@ static DWORD WINAPI test_handles_thread2( void *arg ) ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); ok( h == palette, "different palette %p / %p\n", h, palette ); trace( "palette %p\n", h ); - h = GetClipboardData( CF_GDIOBJFIRST + 1 ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( h == bitmap2, "different bitmap %p / %p\n", h, bitmap2 ); - trace( "bitmap2 %p\n", h ); - h = GetClipboardData( CF_GDIOBJFIRST + 2 ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); - ok( h == pen, "different pen %p / %p\n", h, pen ); - trace( "pen %p\n", h ); + if (!is_win64) + { + h = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + ok( h == bitmap2, "different bitmap %p / %p\n", h, bitmap2 ); + trace( "bitmap2 %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + ok( h == pen, "different pen %p / %p\n", h, pen ); + trace( "pen %p\n", h ); + } h = GetClipboardData( CF_DIB ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = GetClipboardData( CF_DIBV5 ); @@ -942,7 +953,7 @@ static void test_handles_process( const char *str ) r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); - ok( is_fixed( h ), "expected fixed mem %p\n", h ); + todo_wine_if( !h ) ok( is_fixed( h ), "expected fixed mem %p\n", h ); ptr = GlobalLock( h ); if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); GlobalUnlock( h ); @@ -1001,10 +1012,13 @@ static void test_data_handles(void) ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); h = SetClipboardData( CF_PALETTE, palette ); ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + if (!is_win64) + { + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Sebastian Lackner : ntdll: Convert an ERR to a WARN when wait is triggered while destroying threadpool object.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: d085042ab95c62d98276893db16ce16508fc518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d085042ab95c62d98276893db… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 01:03:31 2016 +0200 ntdll: Convert an ERR to a WARN when wait is triggered while destroying threadpool object. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 799245c..5d5b49d 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1432,7 +1432,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) tp_object_submit( wait, TRUE ); } else - ERR("wait object %p triggered while object was destroyed\n", wait); + WARN("wait object %p triggered while object was destroyed\n", wait); } /* Release temporary references to wait objects. */

1 0

Hugh McMaster : reg: Fix dword conversion on 64-bit operating systems.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 8a8a753cfac54f20bf3cd768dbb0fcbfc2eb6abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8a753cfac54f20bf3cd768d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 18 09:59:53 2016 +0000 reg: Fix dword conversion on 64-bit operating systems. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6fcf129..6522fe6 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -249,9 +249,9 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_DWORD_BIG_ENDIAN: /* Yes, this is correct! */ { LPWSTR rest; - DWORD val; + unsigned long val; val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); - if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { + if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE) || val > ~0u) { output_message(STRING_MISSING_INTEGER); break; }

1 0