January 2023 - Wine-Commits

Zebediah Figura : include: Fix the definition of DIFXAPILOGCALLBACK_* functions.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 855bb76b734b5324c3e84f8d7ee04f3350af9670 URL: https://gitlab.winehq.org/wine/wine/-/commit/855bb76b734b5324c3e84f8d7ee04f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 12:41:07 2023 -0600 include: Fix the definition of DIFXAPILOGCALLBACK_* functions. These have cdecl convention, not stdcall. --- include/difxapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/difxapi.h b/include/difxapi.h index 21d43c90de6..ad57b0f5bce 100644 --- a/include/difxapi.h +++ b/include/difxapi.h @@ -49,8 +49,8 @@ typedef enum _DIFXAPI_LOG DIFXAPI_ERROR, } DIFXAPI_LOG; -typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); -typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); +typedef void (__cdecl *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG, DWORD, const char *, void *); +typedef void (__cdecl *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG, DWORD, const WCHAR *, void *); typedef VOID (CALLBACK *DIFXLOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); typedef VOID (CALLBACK *DIFXLOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID);

1 0

Zebediah Figura : winepulse: Include mult.c in pulse.c.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: b8e912f795d1f7dd4938663fe5f902a09dd977dd URL: https://gitlab.winehq.org/wine/wine/-/commit/b8e912f795d1f7dd4938663fe5f902… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:08:27 2023 -0600 winepulse: Include mult.c in pulse.c. Originally meant to address the fact that mult_alaw_sample() and mult_ulaw_sample() were exported without being hidden, but this file is only used from pulse.c, and is relatively quite simple, so just make them static and use the preprocessor instead of linking. --- dlls/winepulse.drv/Makefile.in | 1 - dlls/winepulse.drv/{mult.c => mult.h} | 9 ++------- dlls/winepulse.drv/pulse.c | 5 ++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index d938aac052e..7a78f4e854e 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -6,5 +6,4 @@ UNIX_CFLAGS = $(PULSE_CFLAGS) C_SRCS = \ mmdevdrv.c \ - mult.c \ pulse.c diff --git a/dlls/winepulse.drv/mult.c b/dlls/winepulse.drv/mult.h similarity index 99% rename from dlls/winepulse.drv/mult.c rename to dlls/winepulse.drv/mult.h index 26b5e83c9ca..58f516a0d4d 100644 --- a/dlls/winepulse.drv/mult.c +++ b/dlls/winepulse.drv/mult.h @@ -20,11 +20,6 @@ #include <windef.h> -#if 0 -#pragma makedep unix -#endif - - /********************************************************************** * A-law and u-law sample manipulation functions * Multiply with the given volume (vol must be between 0...1 inclusive) @@ -32,7 +27,7 @@ * These were taken from PulseAudio's sources but adjusted to directly * fit our usage (since we use floats directly) so they should be exact. */ -UINT8 mult_alaw_sample(UINT8 sample, float vol) +static UINT8 mult_alaw_sample(UINT8 sample, float vol) { static const float decode_to_13bits_float[1 << 8] = { @@ -708,7 +703,7 @@ UINT8 mult_alaw_sample(UINT8 sample, float vol) return encode[(int)(vol * decode_to_13bits_float[sample]) + ARRAY_SIZE(encode) / 2]; } -UINT8 mult_ulaw_sample(UINT8 sample, float vol) +static UINT8 mult_ulaw_sample(UINT8 sample, float vol) { static const float decode_to_14bits_float[1 << 8] = { diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 41d988e692b..9446feb452c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -44,6 +44,8 @@ #include "../mmdevapi/unixlib.h" +#include "mult.h" + WINE_DEFAULT_DEBUG_CHANNEL(pulse); enum phys_device_bus_type { @@ -117,9 +119,6 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; -UINT8 mult_alaw_sample(UINT8, float); -UINT8 mult_ulaw_sample(UINT8, float); - static void pulse_lock(void) { pthread_mutex_lock(&pulse_mutex);

1 0

Rémi Bernon : dinput: Avoid entering hook CS for rawinput messages.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: e5eeca384384b1edf20ce2ec9716c93b89f16ea6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5eeca384384b1edf20ce2ec9716c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 15:11:13 2023 +0100 dinput: Avoid entering hook CS for rawinput messages. --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a81afa82950..149dd402aa8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -234,6 +234,8 @@ static void input_thread_update_device_list( struct input_thread_state *state ) if (device->dwCoopLevel & DISCL_EXCLUSIVE) rawinput_mouse.dwFlags |= RIDEV_NOLEGACY | RIDEV_CAPTUREMOUSE; rawinput_mouse.dwFlags &= ~RIDEV_REMOVE; rawinput_mouse.hwndTarget = di_em_win; + dinput_device_internal_addref( (state->devices[count] = device) ); + if (++count >= INPUT_THREAD_MAX_DEVICES) break; } LIST_FOR_EACH_ENTRY( device, &acquired_mouse_list, struct dinput_device, entry ) { @@ -281,10 +283,10 @@ static void input_thread_update_device_list( struct input_thread_state *state ) static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - struct dinput_device *impl; - RAWINPUT ri; - UINT size = sizeof(ri); + struct input_thread_state *state = input_thread_state; int rim = GET_RAWINPUT_CODE_WPARAM( wparam ); + UINT i, size = sizeof(RAWINPUT); + RAWINPUT ri; TRACE( "%p %d %Ix %Ix\n", hwnd, msg, wparam, lparam ); @@ -295,17 +297,25 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR WARN( "Unable to read raw input data\n" ); else if (ri.header.dwType == RIM_TYPEMOUSE) { - EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( impl, &acquired_rawmouse_list, struct dinput_device, entry ) - dinput_mouse_rawinput_hook( &impl->IDirectInputDevice8W_iface, wparam, lparam, &ri ); - LeaveCriticalSection( &dinput_hook_crit ); + for (i = state->events_count; i < state->devices_count; ++i) + { + struct dinput_device *device = state->devices[i]; + if (!device->use_raw_input) continue; + if (device->instance.dwDevType & DIDEVTYPE_HID) continue; + switch (GET_DIDEVICE_TYPE( device->instance.dwDevType )) + { + case DIDEVTYPE_MOUSE: + case DI8DEVTYPE_MOUSE: + dinput_mouse_rawinput_hook( &device->IDirectInputDevice8W_iface, wparam, lparam, &ri ); + break; + default: break; + } + } } } if (msg == WM_USER + 0x10) { - struct input_thread_state *state = input_thread_state; - TRACE( "Processing hook change notification wparam %#Ix, lparam %#Ix.\n", wparam, lparam ); if (!wparam) state->running = FALSE; @@ -349,9 +359,8 @@ static DWORD WINAPI dinput_thread_proc( void *params ) DWORD ret; MSG msg; - input_thread_state = &state; di_em_win = CreateWindowW( L"DIEmWin", L"DIEmWin", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, DINPUT_instance, NULL ); - PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); + input_thread_state = &state; SetEvent( start_event ); while (state.running && (ret = MsgWaitForMultipleObjectsEx( state.events_count, state.events, INFINITE, QS_ALLINPUT, 0 )) <= state.events_count)

1 0

Rémi Bernon : dinput: Move rawinput registration to input_thread_update_device_list.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: bf8274edd210f4bebe3c29a3e06138254363d080 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf8274edd210f4bebe3c29a3e06138… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 13:52:06 2023 +0100 dinput: Move rawinput registration to input_thread_update_device_list. --- dlls/dinput/device_private.h | 2 -- dlls/dinput/dinput_main.c | 39 +++++++++++++-------------------------- dlls/dinput/mouse.c | 4 ---- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index fd48a602b97..f6030c5d088 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -94,9 +94,7 @@ struct dinput_device DWORD dwCoopLevel; HWND win; enum device_status status; - BOOL use_raw_input; /* use raw input instead of low-level messages */ - RAWINPUTDEVICE raw_device; /* raw device to (un)register */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ int queue_len; /* valid size of the queue */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0bbe299cc6c..f609faffc5d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -35,6 +35,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "devguid.h" +#include "hidusage.h" #include "initguid.h" #include "dinputd.h" @@ -55,6 +56,7 @@ struct input_thread_state HHOOK mouse_ll_hook; HHOOK keyboard_ll_hook; HHOOK callwndproc_hook; + RAWINPUTDEVICE rawinput_devices[2]; struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; HANDLE events[INPUT_THREAD_MAX_DEVICES]; }; @@ -252,6 +254,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static void input_thread_update_device_list( struct input_thread_state *state ) { + RAWINPUTDEVICE rawinput_mouse = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_MOUSE, .dwFlags = RIDEV_REMOVE}; UINT count = 0, keyboard_count = 0, mouse_count = 0, foreground_count = 0; struct dinput_device *device; @@ -269,6 +272,10 @@ static void input_thread_update_device_list( struct input_thread_state *state ) LIST_FOR_EACH_ENTRY( device, &acquired_rawmouse_list, struct dinput_device, entry ) { if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + if (device->dwCoopLevel & DISCL_BACKGROUND) rawinput_mouse.dwFlags |= RIDEV_INPUTSINK; + if (device->dwCoopLevel & DISCL_EXCLUSIVE) rawinput_mouse.dwFlags |= RIDEV_NOLEGACY | RIDEV_CAPTUREMOUSE; + rawinput_mouse.dwFlags &= ~RIDEV_REMOVE; + rawinput_mouse.hwndTarget = di_em_win; } LIST_FOR_EACH_ENTRY( device, &acquired_mouse_list, struct dinput_device, entry ) { @@ -306,6 +313,12 @@ static void input_thread_update_device_list( struct input_thread_state *state ) UnhookWindowsHookEx( state->mouse_ll_hook ); state->mouse_ll_hook = NULL; } + + if (!rawinput_mouse.hwndTarget != !state->rawinput_devices[0].hwndTarget && + !RegisterRawInputDevices( &rawinput_mouse, 1, sizeof(RAWINPUTDEVICE) )) + WARN( "Failed to (un)register rawinput mouse device.\n" ); + + state->rawinput_devices[0] = rawinput_mouse; } static DWORD WINAPI dinput_thread_proc( void *params ) @@ -408,36 +421,10 @@ void input_thread_remove_user(void) void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) { - struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HANDLE hook_change_finished_event = NULL; EnterCriticalSection(&dinput_hook_crit); - if (impl->use_raw_input) - { - if (acquired) - { - impl->raw_device.dwFlags = 0; - if (impl->dwCoopLevel & DISCL_BACKGROUND) - impl->raw_device.dwFlags |= RIDEV_INPUTSINK; - if (impl->dwCoopLevel & DISCL_EXCLUSIVE) - impl->raw_device.dwFlags |= RIDEV_NOLEGACY; - if ((impl->dwCoopLevel & DISCL_EXCLUSIVE) && impl->raw_device.usUsage == 2) - impl->raw_device.dwFlags |= RIDEV_CAPTUREMOUSE; - if ((impl->dwCoopLevel & DISCL_EXCLUSIVE) && impl->raw_device.usUsage == 6) - impl->raw_device.dwFlags |= RIDEV_NOHOTKEYS; - impl->raw_device.hwndTarget = di_em_win; - } - else - { - impl->raw_device.dwFlags = RIDEV_REMOVE; - impl->raw_device.hwndTarget = NULL; - } - - if (!RegisterRawInputDevices( &impl->raw_device, 1, sizeof(RAWINPUTDEVICE) )) - WARN( "Unable to (un)register raw device %x:%x\n", impl->raw_device.usUsagePage, impl->raw_device.usUsage ); - } - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 1, (LPARAM)hook_change_finished_event ); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6aab20a631c..502ee797716 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -148,11 +148,7 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp if (hkey) RegCloseKey(hkey); if (dinput->dwVersion >= 0x0800) - { impl->base.use_raw_input = TRUE; - impl->base.raw_device.usUsagePage = 1; /* HID generic device page */ - impl->base.raw_device.usUsage = 2; /* HID generic mouse */ - } *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0

Rémi Bernon : dinput: Move di_em_win_wndproc function around.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: f3952a3e21aa73585fab40cc40ace54333117c76 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3952a3e21aa73585fab40cc40ace5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:00:45 2023 +0100 dinput: Move di_em_win_wndproc function around. --- dlls/dinput/dinput_main.c | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f609faffc5d..491db22861f 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -127,52 +127,6 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD LeaveCriticalSection( &impl->crit ); } -static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - struct dinput_device *impl; - RAWINPUT ri; - UINT size = sizeof(ri); - int rim = GET_RAWINPUT_CODE_WPARAM( wparam ); - - TRACE( "%p %d %Ix %Ix\n", hwnd, msg, wparam, lparam ); - - if (msg == WM_INPUT && (rim == RIM_INPUT || rim == RIM_INPUTSINK)) - { - size = GetRawInputData( (HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER) ); - if (size == (UINT)-1 || size < sizeof(RAWINPUTHEADER)) - WARN( "Unable to read raw input data\n" ); - else if (ri.header.dwType == RIM_TYPEMOUSE) - { - EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( impl, &acquired_rawmouse_list, struct dinput_device, entry ) - dinput_mouse_rawinput_hook( &impl->IDirectInputDevice8W_iface, wparam, lparam, &ri ); - LeaveCriticalSection( &dinput_hook_crit ); - } - } - - return DefWindowProcW( hwnd, msg, wparam, lparam ); -} - -static void register_di_em_win_class(void) -{ - WNDCLASSEXW class; - - memset(&class, 0, sizeof(class)); - class.cbSize = sizeof(class); - class.lpfnWndProc = di_em_win_wndproc; - class.hInstance = DINPUT_instance; - class.lpszClassName = L"DIEmWin"; - - if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) - WARN( "Unable to register message window class\n" ); -} - -static void unregister_di_em_win_class(void) -{ - if (!UnregisterClassW( L"DIEmWin", NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) - WARN( "Unable to unregister message window class\n" ); -} - static LRESULT CALLBACK input_thread_ll_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { struct dinput_device *impl; @@ -321,6 +275,52 @@ static void input_thread_update_device_list( struct input_thread_state *state ) state->rawinput_devices[0] = rawinput_mouse; } +static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct dinput_device *impl; + RAWINPUT ri; + UINT size = sizeof(ri); + int rim = GET_RAWINPUT_CODE_WPARAM( wparam ); + + TRACE( "%p %d %Ix %Ix\n", hwnd, msg, wparam, lparam ); + + if (msg == WM_INPUT && (rim == RIM_INPUT || rim == RIM_INPUTSINK)) + { + size = GetRawInputData( (HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER) ); + if (size == (UINT)-1 || size < sizeof(RAWINPUTHEADER)) + WARN( "Unable to read raw input data\n" ); + else if (ri.header.dwType == RIM_TYPEMOUSE) + { + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_rawmouse_list, struct dinput_device, entry ) + dinput_mouse_rawinput_hook( &impl->IDirectInputDevice8W_iface, wparam, lparam, &ri ); + LeaveCriticalSection( &dinput_hook_crit ); + } + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void register_di_em_win_class(void) +{ + WNDCLASSEXW class; + + memset(&class, 0, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = di_em_win_wndproc; + class.hInstance = DINPUT_instance; + class.lpszClassName = L"DIEmWin"; + + if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + WARN( "Unable to register message window class\n" ); +} + +static void unregister_di_em_win_class(void) +{ + if (!UnregisterClassW( L"DIEmWin", NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + WARN( "Unable to unregister message window class\n" ); +} + static DWORD WINAPI dinput_thread_proc( void *params ) { struct input_thread_state state = {0};

1 0

Rémi Bernon : dinput: Move window hook checks to input_thread_update_device_list.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: ca2a44bd76a0e20e3443b9ba3237a0b5a99ce020 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca2a44bd76a0e20e3443b9ba3237a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:55:55 2023 +0100 dinput: Move window hook checks to input_thread_update_device_list. --- dlls/dinput/dinput_main.c | 50 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f264c367305..0bbe299cc6c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -54,6 +54,7 @@ struct input_thread_state UINT devices_count; HHOOK mouse_ll_hook; HHOOK keyboard_ll_hook; + HHOOK callwndproc_hook; struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; HANDLE events[INPUT_THREAD_MAX_DEVICES]; }; @@ -251,24 +252,45 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static void input_thread_update_device_list( struct input_thread_state *state ) { - UINT count = 0, keyboard_count, mouse_count; + UINT count = 0, keyboard_count = 0, mouse_count = 0, foreground_count = 0; struct dinput_device *device; EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) { + if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; if (!device->read_event || !device->vtbl->read) continue; state->events[count] = device->read_event; dinput_device_internal_addref( (state->devices[count] = device) ); if (++count >= INPUT_THREAD_MAX_DEVICES) break; } state->events_count = count; - state->devices_count = count; - keyboard_count = list_count( &acquired_keyboard_list ); - mouse_count = list_count( &acquired_mouse_list ); + LIST_FOR_EACH_ENTRY( device, &acquired_rawmouse_list, struct dinput_device, entry ) + { + if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + } + LIST_FOR_EACH_ENTRY( device, &acquired_mouse_list, struct dinput_device, entry ) + { + if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + mouse_count++; + } + LIST_FOR_EACH_ENTRY( device, &acquired_keyboard_list, struct dinput_device, entry ) + { + if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + keyboard_count++; + } + state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit ); + if (foreground_count && !state->callwndproc_hook) + state->callwndproc_hook = SetWindowsHookExW( WH_CALLWNDPROC, callwndproc_proc, DINPUT_instance, GetCurrentThreadId() ); + else if (!foreground_count && state->callwndproc_hook) + { + UnhookWindowsHookEx( state->callwndproc_hook ); + state->callwndproc_hook = NULL; + } + if (keyboard_count && !state->keyboard_ll_hook) state->keyboard_ll_hook = SetWindowsHookExW( WH_KEYBOARD_LL, input_thread_ll_hook_proc, DINPUT_instance, 0 ); else if (!keyboard_count && state->keyboard_ll_hook) @@ -341,6 +363,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) done: while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); + if (state.callwndproc_hook) UnhookWindowsHookEx( state.callwndproc_hook ); if (state.keyboard_ll_hook) UnhookWindowsHookEx( state.keyboard_ll_hook ); if (state.mouse_ll_hook) UnhookWindowsHookEx( state.mouse_ll_hook ); DestroyWindow( di_em_win ); @@ -385,30 +408,11 @@ void input_thread_remove_user(void) void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) { - static HHOOK callwndproc_hook; - static ULONG foreground_cnt; struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HANDLE hook_change_finished_event = NULL; EnterCriticalSection(&dinput_hook_crit); - if (impl->dwCoopLevel & DISCL_FOREGROUND) - { - if (acquired) - foreground_cnt++; - else - foreground_cnt--; - } - - if (foreground_cnt && !callwndproc_hook) - callwndproc_hook = SetWindowsHookExW( WH_CALLWNDPROC, callwndproc_proc, - DINPUT_instance, GetCurrentThreadId() ); - else if (!foreground_cnt && callwndproc_hook) - { - UnhookWindowsHookEx( callwndproc_hook ); - callwndproc_hook = NULL; - } - if (impl->use_raw_input) { if (acquired)

1 0

Rémi Bernon : dinput: Use SendMessageW to notify and stop input thread.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 76a138c996da55c0f7c97d37b26fd4ae637f9f29 URL: https://gitlab.winehq.org/wine/wine/-/commit/76a138c996da55c0f7c97d37b26fd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:08:02 2023 +0100 dinput: Use SendMessageW to notify and stop input thread. --- dlls/dinput/device.c | 2 -- dlls/dinput/dinput_main.c | 74 ++++++++++++++++++++------------------------ dlls/dinput/dinput_private.h | 1 - 3 files changed, 34 insertions(+), 43 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 04788b22f9a..c7b29da9271 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -565,7 +565,6 @@ static HRESULT WINAPI dinput_device_Acquire( IDirectInputDevice8W *iface ) if (hr != DI_OK) return hr; dinput_hooks_acquire_device( iface ); - check_dinput_hooks( iface, TRUE ); return hr; } @@ -585,7 +584,6 @@ static HRESULT WINAPI dinput_device_Unacquire( IDirectInputDevice8W *iface ) if (hr != DI_OK) return hr; dinput_hooks_unacquire_device( iface ); - check_dinput_hooks( iface, FALSE ); return hr; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 491db22861f..a81afa82950 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); struct input_thread_state { + BOOL running; UINT events_count; UINT devices_count; HHOOK mouse_ll_hook; @@ -69,10 +70,9 @@ static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInput HINSTANCE DINPUT_instance; static HWND di_em_win; - static HANDLE dinput_thread; -static DWORD dinput_thread_id; static UINT input_thread_user_count; +static struct input_thread_state *input_thread_state; static CRITICAL_SECTION dinput_hook_crit; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = @@ -100,6 +100,8 @@ void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) else list_add_tail( &acquired_device_list, &impl->entry ); LeaveCriticalSection( &dinput_hook_crit ); + + SendMessageW( di_em_win, WM_USER + 0x10, 1, 0 ); } void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) @@ -109,6 +111,8 @@ void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) EnterCriticalSection( &dinput_hook_crit ); list_remove( &impl->entry ); LeaveCriticalSection( &dinput_hook_crit ); + + SendMessageW( di_em_win, WM_USER + 0x10, 1, 0 ); } static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD status ) @@ -298,6 +302,22 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR } } + if (msg == WM_USER + 0x10) + { + struct input_thread_state *state = input_thread_state; + + TRACE( "Processing hook change notification wparam %#Ix, lparam %#Ix.\n", wparam, lparam ); + + if (!wparam) state->running = FALSE; + else + { + while (state->devices_count--) dinput_device_internal_release( state->devices[state->devices_count] ); + input_thread_update_device_list( state ); + } + + return 0; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); } @@ -323,19 +343,18 @@ static void unregister_di_em_win_class(void) static DWORD WINAPI dinput_thread_proc( void *params ) { - struct input_thread_state state = {0}; + struct input_thread_state state = {.running = TRUE}; struct dinput_device *device; HANDLE start_event = params; DWORD ret; MSG msg; + input_thread_state = &state; di_em_win = CreateWindowW( L"DIEmWin", L"DIEmWin", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, DINPUT_instance, NULL ); - - /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); SetEvent( start_event ); - while ((ret = MsgWaitForMultipleObjectsEx( state.events_count, state.events, INFINITE, QS_ALLINPUT, 0 )) <= state.events_count) + while (state.running && (ret = MsgWaitForMultipleObjectsEx( state.events_count, state.events, INFINITE, QS_ALLINPUT, 0 )) <= state.events_count) { if (ret < state.events_count) { @@ -354,27 +373,17 @@ static DWORD WINAPI dinput_thread_proc( void *params ) while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) { - if (msg.message != WM_USER+0x10) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - continue; - } - - TRACE( "Processing hook change notification wparam %#Ix, lparam %#Ix.\n", msg.wParam, msg.lParam ); - - if (!msg.wParam) goto done; - - while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); - input_thread_update_device_list( &state ); - SetEvent( (HANDLE)msg.lParam ); + TranslateMessage(&msg); + DispatchMessageW(&msg); } } - ERR( "Unexpected termination, ret %#lx\n", ret ); - dinput_unacquire_window_devices( 0 ); + if (state.running) + { + ERR( "Unexpected termination, ret %#lx\n", ret ); + dinput_unacquire_window_devices( 0 ); + } -done: while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); if (state.callwndproc_hook) UnhookWindowsHookEx( state.callwndproc_hook ); if (state.keyboard_ll_hook) UnhookWindowsHookEx( state.keyboard_ll_hook ); @@ -395,7 +404,7 @@ void input_thread_add_user(void) if (!(start_event = CreateEventW( NULL, FALSE, FALSE, NULL ))) ERR( "Failed to create start event, error %lu\n", GetLastError() ); - else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, &dinput_thread_id ))) + else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, NULL ))) ERR( "Failed to create internal thread, error %lu\n", GetLastError() ); else WaitForSingleObject( start_event, INFINITE ); @@ -412,28 +421,13 @@ void input_thread_remove_user(void) { TRACE( "Stopping input thread.\n" ); - PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); + SendMessageW( di_em_win, WM_USER + 0x10, 0, 0 ); WaitForSingleObject( dinput_thread, INFINITE ); CloseHandle( dinput_thread ); } LeaveCriticalSection( &dinput_hook_crit ); } -void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) -{ - HANDLE hook_change_finished_event = NULL; - - EnterCriticalSection(&dinput_hook_crit); - - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 1, (LPARAM)hook_change_finished_event ); - - LeaveCriticalSection(&dinput_hook_crit); - - WaitForSingleObject(hook_change_finished_event, INFINITE); - CloseHandle(hook_change_finished_event); -} - void check_dinput_events(void) { /* Windows does not do that, but our current implementation of winex11 diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index f10d5120c89..6e7ffeb0841 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -73,7 +73,6 @@ extern int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA extern void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam, RAWINPUT *raw ); -extern void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) DECLSPEC_HIDDEN; extern void check_dinput_events(void) DECLSPEC_HIDDEN; extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : ws2_32/tests: Skip adapters that aren't up and running in test_bind().
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 7930cc4c96659cf86cf03aaae446bb35b81f5e70 URL: https://gitlab.winehq.org/wine/wine/-/commit/7930cc4c96659cf86cf03aaae446bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 19 10:21:15 2023 +0100 ws2_32/tests: Skip adapters that aren't up and running in test_bind(). --- dlls/ws2_32/tests/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 070876157fe..d29e1c768dc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12209,6 +12209,8 @@ static void test_bind(void) { const IP_ADAPTER_UNICAST_ADDRESS *unicast_addr; + if (adapter->OperStatus != IfOperStatusUp) continue; + for (unicast_addr = adapter->FirstUnicastAddress; unicast_addr != NULL; unicast_addr = unicast_addr->Next) { short family = unicast_addr->Address.lpSockaddr->sa_family;

1 0

Jinoh Kang : include: Add noreturn attribute to RtlRaiseStatus.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 36575a2e7a04d671d6f9cbe7d261bdbd433f6e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/36575a2e7a04d671d6f9cbe7d261bd… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 28 14:08:07 2023 +0900 include: Add noreturn attribute to RtlRaiseStatus. This informs the compiler that no code following a RtlRaiseStatus() call will execute, which increases the accuracy of compiler warnings and static analyses. --- dlls/ntdll/exception.c | 4 ++-- include/winternl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 556b424ac6e..5b3076387d6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -191,7 +191,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) * * Implementation of RtlRaiseStatus with a specific exception record. */ -void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) +void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) { EXCEPTION_RECORD ExceptionRec; @@ -208,7 +208,7 @@ void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) * * Raise an exception with ExceptionCode = status */ -void WINAPI RtlRaiseStatus( NTSTATUS status ) +void DECLSPEC_NORETURN WINAPI RtlRaiseStatus( NTSTATUS status ) { raise_status( status, NULL ); } diff --git a/include/winternl.h b/include/winternl.h index 4097a574e34..a7f82073ad5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4516,7 +4516,7 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION* NTSYSAPI BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); -NTSYSAPI void WINAPI RtlRaiseStatus(NTSTATUS); +NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlRaiseStatus(NTSTATUS); NTSYSAPI ULONG WINAPI RtlRandom(PULONG); NTSYSAPI PVOID WINAPI RtlReAllocateHeap(HANDLE,ULONG,PVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(RtlFreeHeap,3); NTSYSAPI NTSTATUS WINAPI RtlRegisterWait(PHANDLE,HANDLE,RTL_WAITORTIMERCALLBACKFUNC,PVOID,ULONG,ULONG);

1 0

Hans Leidekker : ws2_32/tests: Fix some test failures on Windows 11.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 1acb569a0f5ef526b79c16254560f12947005bca URL: https://gitlab.winehq.org/wine/wine/-/commit/1acb569a0f5ef526b79c16254560f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 19 10:20:37 2023 +0100 ws2_32/tests: Fix some test failures on Windows 11. --- dlls/ws2_32/tests/sock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1336889b9fd..070876157fe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3003,6 +3003,7 @@ static void test_WSASocket(void) int family, type, protocol; DWORD error; int ret_family, ret_type, ret_protocol; + int ret_family_alt; } tests[] = { @@ -3030,14 +3031,14 @@ static void test_WSASocket(void) {AF_INET, SOCK_DGRAM, IPPROTO_TCP, WSAEPROTONOSUPPORT}, /* 19 */ - {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP, AF_INET6 /* win11 */}, {AF_UNSPEC, SOCK_STREAM, 0xdead, WSAEPROTONOSUPPORT}, {AF_UNSPEC, 0xdead, IPPROTO_UDP, WSAESOCKTNOSUPPORT}, {AF_UNSPEC, SOCK_STREAM, 0, WSAEINVAL}, {AF_UNSPEC, SOCK_DGRAM, 0, WSAEINVAL}, {AF_UNSPEC, 0xdead, 0, WSAEINVAL}, - {AF_UNSPEC, 0, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, - {AF_UNSPEC, 0, IPPROTO_UDP, 0, AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_UNSPEC, 0, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP, AF_INET6 /* win11 */}, + {AF_UNSPEC, 0, IPPROTO_UDP, 0, AF_INET, SOCK_DGRAM, IPPROTO_UDP, AF_INET6 /* win11 */}, {AF_UNSPEC, 0, 0xdead, WSAEPROTONOSUPPORT}, {AF_UNSPEC, 0, 0, WSAEINVAL}, }; @@ -3061,7 +3062,9 @@ static void test_WSASocket(void) size = sizeof(info); err = getsockopt( sock, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&info, &size ); ok(!err, "Test %u: getsockopt failed, error %u\n", i, WSAGetLastError()); - ok(info.iAddressFamily == tests[i].ret_family, "Test %u: got wrong family %d\n", i, info.iAddressFamily); + ok(info.iAddressFamily == tests[i].ret_family || + (tests[i].ret_family_alt && info.iAddressFamily == tests[i].ret_family_alt), + "Test %u: got wrong family %d\n", i, info.iAddressFamily); ok(info.iSocketType == tests[i].ret_type, "Test %u: got wrong type %d\n", i, info.iSocketType); ok(info.iProtocol == tests[i].ret_protocol, "Test %u: got wrong protocol %d\n", i, info.iProtocol);

1 0