December 2021 - Wine-Commits

Torge Matthies : win32u: Validate the info parameter in NtUserEnumDisplayDevices.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 286b99a4a2f630d73a6d47c265f77198bfe51c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286b99a4a2f630d73a6d47c2… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 10 02:07:00 2021 +0100 win32u: Validate the info parameter in NtUserEnumDisplayDevices. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/tests/win32u.c | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b3d2b6c7d11..e06a63bd4cd 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1571,6 +1571,8 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, TRACE( "%s %u %p %#x\n", debugstr_us( device ), index, info, flags ); + if (!info || !info->cb) return STATUS_UNSUCCESSFUL; + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; if (!device || !device->Length) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 10ffd36d134..13c732b7748 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -45,15 +45,23 @@ static void test_NtUserEnumDisplayDevices(void) SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); - todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, - GetLastError() ); + ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, - GetLastError() ); + "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, NULL, 0 ); + ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, NULL, 0 ); + ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); } static void test_NtUserCloseWindowStation(void)

1 0

Nikolay Sivov : include: Add document target ids.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: d3f57fab59614c78ebf63901767990ca98c5ad3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f57fab59614c78ebf63901… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 10 09:08:04 2021 +0300 include: Add document target ids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/documenttarget.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/documenttarget.idl b/include/documenttarget.idl index 17c7cefe5b5..a1cbbd939f4 100644 --- a/include/documenttarget.idl +++ b/include/documenttarget.idl @@ -111,3 +111,7 @@ coclass PrintDocumentPackageTargetFactory } } /* library */ + +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_MSXPS, 0x9cae40a8, 0xded1, 0x41c9, 0xa9, 0xfd, 0xd7, 0x35, 0xef, 0x33, 0xae, 0xda);") +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_OPENXPS, 0x0056bb72, 0x8c9c, 0x4612, 0xbd, 0x0f, 0x93, 0x01, 0x2a, 0x87, 0x09, 0x9d);") +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_OPENXPS_WITH_3D, 0x63dbd720, 0x8b14, 0x4577, 0xb0, 0x74, 0x7b, 0xb1, 0x1b, 0x59, 0x6d, 0x28);")

1 0

Torge Matthies : win32u: Return an NTSTATUS from NtUserEnumDisplayDevices.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 28b77c9b72f3250ae5adf2ffb05f0ac1ba504174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28b77c9b72f3250ae5adf2ff… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 10 02:06:59 2021 +0100 win32u: Return an NTSTATUS from NtUserEnumDisplayDevices. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- dlls/win32u/sysparams.c | 8 ++++---- dlls/win32u/tests/win32u.c | 9 ++++----- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 4 ++-- include/ntuser.h | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a21b5035048..9d553d7dfff 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1216,7 +1216,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i { UNICODE_STRING str; RtlInitUnicodeString( &str, device ); - return NtUserEnumDisplayDevices( &str, index, info, flags ); + return NT_SUCCESS(NtUserEnumDisplayDevices( &str, index, info, flags )); } /********************************************************************** diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 94c7a58fc0e..b3d2b6c7d11 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1562,8 +1562,8 @@ static struct adapter *find_adapter( UNICODE_STRING *name ) /*********************************************************************** * NtUserEnumDisplayDevices (win32u.@) */ -BOOL WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, - DISPLAY_DEVICEW *info, DWORD flags ) +NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, + DISPLAY_DEVICEW *info, DWORD flags ) { struct display_device *found = NULL; struct adapter *adapter; @@ -1571,7 +1571,7 @@ BOOL WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, TRACE( "%s %u %p %#x\n", debugstr_us( device ), index, info, flags ); - if (!lock_display_devices()) return FALSE; + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; if (!device || !device->Length) { @@ -1613,7 +1613,7 @@ BOOL WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, lstrcpyW( info->DeviceKey, found->device_key ); } unlock_display_devices(); - return !!found; + return found ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } #define _X_FIELD(prefix, bits) \ diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index f225a7893d2..10ffd36d134 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -32,13 +32,12 @@ static void test_NtUserEnumDisplayDevices(void) SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); - todo_wine ok( !ret && GetLastError() == 0xdeadbeef, - "NtUserEnumDisplayDevices returned %x %u\n", ret, - GetLastError() ); + ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); - todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); @@ -52,7 +51,7 @@ static void test_NtUserEnumDisplayDevices(void) SetLastError( 0xdeadbeef ); ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); - todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d3abda5b47e..9bce2b7207b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -197,7 +197,7 @@ struct unix_funcs LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); INT (WINAPI *pNtUserCountClipboardFormats)(void); - BOOL (WINAPI *pNtUserEnumDisplayDevices)( UNICODE_STRING *device, DWORD index, + NTSTATUS (WINAPI *pNtUserEnumDisplayDevices)( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ); BOOL (WINAPI *pNtUserEnumDisplayMonitors)( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); BOOL (WINAPI *pNtUserEnumDisplaySettings)( UNICODE_STRING *device, DWORD mode, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 863c95caf1e..fe56f5e0e3c 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -726,8 +726,8 @@ INT WINAPI NtUserCountClipboardFormats(void) return unix_funcs->pNtUserCountClipboardFormats(); } -BOOL WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, - DISPLAY_DEVICEW *info, DWORD flags ) +NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, + DISPLAY_DEVICEW *info, DWORD flags ) { if (!unix_funcs) return FALSE; return unix_funcs->pNtUserEnumDisplayDevices( device, index, info, flags ); diff --git a/include/ntuser.h b/include/ntuser.h index 25505e701b8..ca430e7b6b1 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -117,8 +117,8 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *d ULONG heap_size ); HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); -BOOL WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, - DISPLAY_DEVICEW *info, DWORD flags ); +NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, + DISPLAY_DEVICEW *info, DWORD flags ); BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, DEVMODEW *dev_mode, DWORD flags );

1 0

Rémi Bernon : dinput: Simplify the internal thread and don't require loader lock.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: b67cda8975f9551ce6f48a18ffd3a1fcc7a278b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67cda8975f9551ce6f48a18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 10 09:44:44 2021 +0100 dinput: Simplify the internal thread and don't require loader lock. When thread shuts down, instead of holding and releasing a module ref. This keeps the thread alive until the module is unloaded, instead of keeping track of live IDirectInput instances. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 115 +++++++++++++++---------------------------- dlls/dinput/dinput_private.h | 3 -- 2 files changed, 39 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 55d566afa4a..cab8886f9db 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -78,9 +78,18 @@ HINSTANCE DINPUT_instance; static HWND di_em_win; -static BOOL check_hook_thread(void); +static HANDLE dinput_thread; +static DWORD dinput_thread_id; + static CRITICAL_SECTION dinput_hook_crit; -static struct list direct_input_list = LIST_INIT( direct_input_list ); +static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +{ + 0, 0, &dinput_hook_crit, + { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } +}; +static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); @@ -453,18 +462,7 @@ static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwV list_init( &This->device_players ); - /* Add self to the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_add_head( &direct_input_list, &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - This->initialized = TRUE; - - if (!check_hook_thread()) - { - uninitialize_directinput_instance( This ); - return DIERR_GENERIC; - } } return DI_OK; @@ -475,17 +473,11 @@ static void uninitialize_directinput_instance(IDirectInputImpl *This) if (This->initialized) { struct DevicePlayer *device_player, *device_player2; - /* Remove self from the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_remove( &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &This->device_players, struct DevicePlayer, entry ) free( device_player ); - check_hook_thread(); - This->initialized = FALSE; } } @@ -1262,13 +1254,13 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam return CallNextHookEx( 0, code, wparam, lparam ); } -static DWORD WINAPI hook_thread_proc(void *param) +static DWORD WINAPI dinput_thread_proc( void *params ) { + HANDLE events[128], start_event = params; static HHOOK kbd_hook, mouse_hook; struct dinput_device *impl, *next; SIZE_T events_count = 0; HANDLE finished_event; - HANDLE events[128]; HRESULT hr; DWORD ret; MSG msg; @@ -1277,7 +1269,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(param); + SetEvent( start_event ); while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { @@ -1354,61 +1346,36 @@ static DWORD WINAPI hook_thread_proc(void *param) done: DestroyWindow( di_em_win ); di_em_win = NULL; - - FreeLibraryAndExitThread(DINPUT_instance, 0); + return 0; } -static DWORD hook_thread_id; -static HANDLE hook_thread_event; - -static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +static BOOL WINAPI dinput_thread_start_once( INIT_ONCE *once, void *param, void **context ) { - 0, 0, &dinput_hook_crit, - { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } -}; -static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + HANDLE start_event; -static BOOL check_hook_thread(void) -{ - static HANDLE hook_thread; - HMODULE module; - HANDLE wait_handle = NULL; + start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + if (!start_event) ERR( "failed to create start event, error %u\n", GetLastError() ); - EnterCriticalSection(&dinput_hook_crit); + dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, &dinput_thread_id ); + if (!dinput_thread) ERR( "failed to create internal thread, error %u\n", GetLastError() ); - TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); - if (!list_empty(&direct_input_list) && !hook_thread) - { - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); - hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - } - else if (list_empty(&direct_input_list) && hook_thread) - { - DWORD tid = hook_thread_id; + WaitForSingleObject( start_event, INFINITE ); + CloseHandle( start_event ); - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - - hook_thread_id = 0; - PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - wait_handle = hook_thread; - hook_thread = NULL; - } + return TRUE; +} - LeaveCriticalSection(&dinput_hook_crit); +static void dinput_thread_start(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &init_once, dinput_thread_start_once, NULL, NULL ); +} - if (wait_handle) - { - WaitForSingleObject(wait_handle, INFINITE); - CloseHandle(wait_handle); - } - return hook_thread_id != 0; +static void dinput_thread_stop(void) +{ + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); + WaitForSingleObject( dinput_thread, INFINITE ); + CloseHandle( dinput_thread ); } void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) @@ -1418,6 +1385,8 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HANDLE hook_change_finished_event = NULL; + dinput_thread_start(); + EnterCriticalSection(&dinput_hook_crit); if (impl->dwCoopLevel & DISCL_FOREGROUND) @@ -1437,13 +1406,6 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) callwndproc_hook = NULL; } - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - if (impl->use_raw_input) { if (acquired) @@ -1470,7 +1432,7 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) } hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); @@ -1505,6 +1467,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + dinput_thread_stop(); unregister_di_em_win_class(); DeleteCriticalSection(&dinput_hook_crit); break; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index c25fe6320ca..4b36a69c0e1 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -40,10 +40,7 @@ struct IDirectInputImpl IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; LONG ref; - BOOL initialized; - struct list entry; /* entry into list of all IDirectInputs */ - DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list device_players; /* device instance guid to player name */

1 0

Rémi Bernon : winmm: Reimplement joyGetPos with joyGetPosEx.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 0b49f91573cba47148545d620ef677bf9c0d82c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b49f91573cba47148545d62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:06 2021 +0100 winmm: Reimplement joyGetPos with joyGetPosEx. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 604b0d7c0ba..666b0e6c871 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -263,20 +263,26 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) /************************************************************************** * joyGetPos [WINMM.@] */ -MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo) +MMRESULT WINAPI joyGetPos( UINT id, JOYINFO *info ) { - TRACE("(%d, %p);\n", wID, lpInfo); + JOYINFOEX infoex = + { + .dwSize = sizeof(JOYINFOEX), + .dwFlags = JOY_RETURNX | JOY_RETURNY | JOY_RETURNZ | JOY_RETURNBUTTONS, + }; + MMRESULT res; - if (!lpInfo) return MMSYSERR_INVALPARAM; - if (wID >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; - if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; + TRACE( "id %u, info %p.\n", id, info ); - lpInfo->wXpos = 0; - lpInfo->wYpos = 0; - lpInfo->wZpos = 0; - lpInfo->wButtons = 0; + if (!info) return MMSYSERR_INVALPARAM; + if ((res = joyGetPosEx( id, &infoex ))) return res; - return SendDriverMessage( joysticks[wID].hDriver, JDD_GETPOS, (LPARAM)lpInfo, 0 ); + info->wXpos = infoex.dwXpos; + info->wYpos = infoex.dwYpos; + info->wZpos = infoex.dwZpos; + info->wButtons = infoex.dwButtons; + + return JOYERR_NOERROR; } /**************************************************************************

1 0

Rémi Bernon : winmm: Cleanup traces and parameters names.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 10c21c2e27dfbcfc4a9e62679b0b90295e049550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c21c2e27dfbcfc4a9e6267… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:07 2021 +0100 winmm: Cleanup traces and parameters names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 210 ++++++++++++++++++++++++-------------------------- 1 file changed, 102 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10c21c2e27dfbcfc4a9e…

1 0

Rémi Bernon : winmm: Guard accesses to joystick array with a critical section.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 591dcfda0112476083e2567530c6d3d1fed29ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591dcfda0112476083e25675… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:08 2021 +0100 winmm: Guard accesses to joystick array with a critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 842b521a586..20a69e8119d 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -40,6 +40,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); +static CRITICAL_SECTION joystick_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &joystick_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": joystick_cs") } +}; +static CRITICAL_SECTION joystick_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + #define JOY_PERIOD_MIN (10) /* min Capture time period */ #define JOY_PERIOD_MAX (1000) /* max Capture time period */ @@ -91,6 +100,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD LONG pos; int i; + EnterCriticalSection( &joystick_cs ); + for (i = 0; i < ARRAY_SIZE(joysticks); i++) { if (joysticks[i].capture != hwnd) continue; @@ -125,6 +136,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD joysticks[i].info.wButtons = info.wButtons; } } + + LeaveCriticalSection( &joystick_cs ); } /************************************************************************** @@ -285,7 +298,10 @@ MMRESULT WINAPI joyGetThreshold( UINT id, UINT *threshold ) if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; + EnterCriticalSection( &joystick_cs ); *threshold = joysticks[id].threshold; + LeaveCriticalSection( &joystick_cs ); + return JOYERR_NOERROR; } @@ -299,6 +315,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; + EnterCriticalSection( &joystick_cs ); + if (!joysticks[id].capture) TRACE("Joystick is not captured, ignoring request.\n"); else @@ -308,6 +326,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) joysticks[id].timer = 0; } + LeaveCriticalSection( &joystick_cs ); + return JOYERR_NOERROR; } @@ -316,6 +336,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) */ MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed ) { + MMRESULT res = JOYERR_NOERROR; + TRACE( "hwnd %p, id %u, period %u, changed %u.\n", hwnd, id, period, changed ); if (id >= ARRAY_SIZE(joysticks) || hwnd == 0) return JOYERR_PARMS; @@ -323,16 +345,22 @@ MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed ) else if (period > JOY_PERIOD_MAX) period = JOY_PERIOD_MAX; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; - if (joysticks[id].capture || !IsWindow( hwnd )) - return JOYERR_NOCANDO; /* FIXME: what should be returned ? */ - if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR) return JOYERR_UNPLUGGED; - if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0) - return JOYERR_NOCANDO; + EnterCriticalSection( &joystick_cs ); - joysticks[id].capture = hwnd; - joysticks[id].changed = changed; + if (joysticks[id].capture || !IsWindow( hwnd )) + res = JOYERR_NOCANDO; /* FIXME: what should be returned ? */ + else if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR) + res = JOYERR_UNPLUGGED; + else if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0) + res = JOYERR_NOCANDO; + else + { + joysticks[id].capture = hwnd; + joysticks[id].changed = changed; + } - return JOYERR_NOERROR; + LeaveCriticalSection( &joystick_cs ); + return res; } /************************************************************************** @@ -344,7 +372,9 @@ MMRESULT WINAPI joySetThreshold( UINT id, UINT threshold ) if (id >= ARRAY_SIZE(joysticks) || threshold > 65535) return MMSYSERR_INVALPARAM; + EnterCriticalSection( &joystick_cs ); joysticks[id].threshold = threshold; + LeaveCriticalSection( &joystick_cs ); return JOYERR_NOERROR; }

1 0

Nikolay Sivov : winegstreamer: Set MF_MT_AUDIO_BLOCK_ALIGNMENT attribute for raw types.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: bd28c369d052bd33a602e4f7e699d815b9f0e15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd28c369d052bd33a602e4f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 10 11:02:03 2021 +0300 winegstreamer: Set MF_MT_AUDIO_BLOCK_ALIGNMENT attribute for raw types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 58200dc409a..5404728ba83 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -564,6 +564,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, format->u.audio.channels * audio_formats[i].depth / 8); return type; }

1 0

Torge Matthies : win32u/tests: Add tests for NtUserEnumDisplayDevices return value.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 8930d6a00ee82f2d5d9d01fb966a03237e68a0d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8930d6a00ee82f2d5d9d01fb… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 10 02:06:58 2021 +0100 win32u/tests: Add tests for NtUserEnumDisplayDevices return value. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/tests/win32u.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index a7c2e5ef029..f225a7893d2 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -16,12 +16,47 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "ntuser.h" +static void test_NtUserEnumDisplayDevices(void) +{ + NTSTATUS ret; + DISPLAY_DEVICEW info = { sizeof(DISPLAY_DEVICEW) }; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + info.cb = 0; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); +} + static void test_NtUserCloseWindowStation(void) { BOOL ret; @@ -67,6 +102,7 @@ START_TEST(win32u) /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + test_NtUserEnumDisplayDevices(); /* Must run before test_NtUserCloseWindowStation. */ test_NtUserCloseWindowStation(); test_window_props(); }

1 0

Cressida Silver : WWN 409
by Jeremy Newman Dec. 10, 2021

Dec. 10, 2021

Module: website Branch: master Commit: 89a37d411db260d6830589bef4aea19bc54c1ed0 URL: https://source.winehq.org/git/website.git/?a=commit;h=89a37d411db260d683058… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Dec 10 14:46:09 2021 -0600 WWN 409 --- news/en/2021121001.xml | 10 ++++++++++ wwn/en/wn20211210_409.xml | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/news/en/2021121001.xml b/news/en/2021121001.xml new file mode 100644 index 00000000..2b08ab1c --- /dev/null +++ b/news/en/2021121001.xml @@ -0,0 +1,10 @@ +<news> + <date>December 10, 2021</date> + <title>World Wine News Issue 409</title> + <body> + <a href="{$root}/wwn/409">WWN Issue 409</a> was released today. + <ul> + <li><a href="{$root}/wwn/409#Wine%206.23">Wine 6.23</a></li> + </ul> + </body> +</news> diff --git a/wwn/en/wn20211210_409.xml b/wwn/en/wn20211210_409.xml new file mode 100755 index 00000000..c24f3d68 --- /dev/null +++ b/wwn/en/wn20211210_409.xml @@ -0,0 +1,23 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="NNN" date="12/10/2021"/> + <intro> + <p> + This is the 409th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + </p> + </intro> + + <section title="Wine 6.23" subject="" archive="" posts=""> + <p> + Wine 6.23 was released last Friday, and it contains more work on <a href="https://www.winehq.org/wwn/408">PE conversion.</a> For more details, see <a href="https://www.winehq.org/announce/6.23">here</a> for the full release notes. + </p> + <p> + With the code freeze now in place, no new features will be added to Wine this year. Only fixes for <a href="https://source.winehq.org/regressions">regressions</a> are allowed. Over the next month or so, Wine 7.0 release candidates will arrive weekly until Wine 7.0 stable is released in January. + </p> + + <p> + Happy Holidays to you and yours! + </p> + </section> +</kc>

1 0