February 2022 - Wine-commits

Mohamad Al-Jaf : wusa: Support additional expressions.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 0720b4be854dcfd16201a3dcb7882d40e4f9b20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0720b4be854dcfd16201a3dc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Feb 28 13:55:34 2022 +0100 wusa: Support additional expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 2 +- programs/wusa/main.c | 52 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index c512d3e63db..9f220fca277 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,5 @@ MODULE = wusa.exe -IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 +IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 shell32 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wusa/main.c b/programs/wusa/main.c index de8387cd575..b3ab6ac523c 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -23,6 +23,7 @@ #include <fdi.h> #include <shlwapi.h> +#include "shlobj.h" #include "wine/debug.h" #include "wine/list.h" #include "wusa.h" @@ -479,27 +480,52 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; + int csidl = 0; - if (!wcsicmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { #ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) - { - GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); - } + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; +#endif + if (!csidl) csidl = CSIDL_SYSTEM; + } + else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; + else if (!wcsicmp(key, L"runtime.programfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; +#endif + if (!csidl) csidl = CSIDL_PROGRAM_FILES; + } + else if (!wcsicmp(key, L"runtime.commonfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; #endif - GetSystemDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; } - if (!wcsicmp(key, L"runtime.windows")) +#ifdef __x86_64__ + else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; + else if (!wcsicmp(key, L"runtime.commonfilesx86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; +#endif + else if (!wcsicmp(key, L"runtime.programdata")) csidl = CSIDL_COMMON_APPDATA; + else if (!wcsicmp(key, L"runtime.fonts")) csidl = CSIDL_FONTS; + + if (!csidl) { - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + FIXME("Unknown expression %s\n", debugstr_w(key)); + return NULL; + } + if (!SHGetSpecialFolderPathW(NULL, path, csidl, TRUE)) + { + ERR("Failed to get folder path for %s\n", debugstr_w(key)); + return NULL; } - FIXME("Unknown expression %s\n", debugstr_w(key)); - return NULL; + if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); + else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); + else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); + return strdupW(path); } static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression)

1 0

Zebediah Figura : httpapi/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 0c005d1658e5e9e8d8a8f2eb288fd488f21b3ec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c005d1658e5e9e8d8a8f2eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 28 12:55:39 2022 -0600 httpapi/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/Makefile.in | 1 - dlls/httpapi/tests/httpapi.c | 181 ++++++++++++++++++++--------------------- 2 files changed, 89 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c005d1658e5e9e8d8a8…

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.Custom.GameControllerFactoryManager runtimeclass definition.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: fbfefb15330edab483c49b0ae0ab34bf17fe2998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbfefb15330edab483c49b0a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 28 09:44:06 2022 +0100 include: Add Windows.Gaming.Input.Custom.GameControllerFactoryManager runtimeclass definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 68 +++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index 2338e3be166..a95ec9db482 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -29,9 +29,37 @@ import "windows.gaming.input.idl"; import "windows.storage.streams.idl"; namespace Windows.Gaming.Input.Custom { + typedef enum XusbDeviceSubtype XusbDeviceSubtype; + typedef enum XusbDeviceType XusbDeviceType; typedef struct GameControllerVersionInfo GameControllerVersionInfo; interface IGameControllerProvider; interface ICustomGameControllerFactory; + interface IGameControllerFactoryManagerStatics; + interface IGameControllerFactoryManagerStatics2; + runtimeclass GameControllerFactoryManager; + + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum XusbDeviceSubtype + { + Unknown = 0, + Gamepad = 1, + ArcadePad = 2, + ArcadeStick = 3, + FlightStick = 4, + Wheel = 5, + Guitar = 6, + GuitarAlternate = 7, + GuitarBass = 8, + DrumKit = 9, + DancePad = 10, + }; + + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum XusbDeviceType + { + Unknown = 0, + Gamepad = 1, + }; [contract(Windows.Foundation.UniversalApiContract, 3.0)] struct GameControllerVersionInfo @@ -66,4 +94,44 @@ namespace Windows.Gaming.Input.Custom { HRESULT OnGameControllerAdded([in] Windows.Gaming.Input.IGameController *value); HRESULT OnGameControllerRemoved([in] Windows.Gaming.Input.IGameController *value); } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.Custom.GameControllerFactoryManager), + uuid(36cb66e3-d0a1-4986-a24c-40b137deba9e) + ] + interface IGameControllerFactoryManagerStatics : IInspectable + { + HRESULT RegisterCustomFactoryForGipInterface([in] Windows.Gaming.Input.Custom.ICustomGameControllerFactory *factory, + [in] GUID interfaceId); + HRESULT RegisterCustomFactoryForHardwareId([in] Windows.Gaming.Input.Custom.ICustomGameControllerFactory *factory, + [in] UINT16 vendor_id, [in] UINT16 product_id); + HRESULT RegisterCustomFactoryForXusbType([in] Windows.Gaming.Input.Custom.ICustomGameControllerFactory *factory, + [in] Windows.Gaming.Input.Custom.XusbDeviceType type, + [in] Windows.Gaming.Input.Custom.XusbDeviceSubtype subtype); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.Custom.GameControllerFactoryManager), + uuid(eace5644-19df-4115-b32a-2793e2aea3bb) + ] + interface IGameControllerFactoryManagerStatics2 : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerFactoryManagerStatics + { + HRESULT TryGetFactoryControllerFromGameController([in] Windows.Gaming.Input.Custom.ICustomGameControllerFactory *factory, + [in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.IGameController **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + static(Windows.Gaming.Input.Custom.IGameControllerFactoryManagerStatics, Windows.Foundation.UniversalApiContract, 3.0), + static(Windows.Gaming.Input.Custom.IGameControllerFactoryManagerStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass GameControllerFactoryManager + { + } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.Custom.IGameControllerProvider declaration.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 23f282b3bba0c98e8b0d69e5d8e2488268f1965d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23f282b3bba0c98e8b0d69e5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 28 09:44:04 2022 +0100 include: Add Windows.Gaming.Input.Custom.IGameControllerProvider declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.gaming.input.custom.idl | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8a8fddddada..2bb8cd672a7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -779,6 +779,7 @@ SOURCES = \ windows.devices.haptics.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ windows.globalization.idl \ diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl new file mode 100644 index 00000000000..d24f07f02e1 --- /dev/null +++ b/include/windows.gaming.input.custom.idl @@ -0,0 +1,56 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.gaming.input.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Gaming.Input.Custom { + typedef struct GameControllerVersionInfo GameControllerVersionInfo; + interface IGameControllerProvider; + + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + struct GameControllerVersionInfo + { + UINT16 Major; + UINT16 Minor; + UINT16 Build; + UINT16 Revision; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(e6d73982-2996-4559-b16c-3e57d46e58d6) + ] + interface IGameControllerProvider : IInspectable + { + [propget] HRESULT FirmwareVersionInfo([out, retval] Windows.Gaming.Input.Custom.GameControllerVersionInfo *value); + [propget] HRESULT HardwareProductId([out, retval] UINT16 *value); + [propget] HRESULT HardwareVendorId([out, retval] UINT16 *value); + [propget] HRESULT HardwareVersionInfo([out, retval] Windows.Gaming.Input.Custom.GameControllerVersionInfo *value); + [propget] HRESULT IsConnected([out, retval] boolean *value); + } +}

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.Custom.ICustomGameControllerFactory declaration.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: f68270e889d9711128adbb86b6f6afddb1f9b67d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68270e889d9711128adbb86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 28 09:44:05 2022 +0100 include: Add Windows.Gaming.Input.Custom.ICustomGameControllerFactory declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index d24f07f02e1..2338e3be166 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -31,6 +31,7 @@ import "windows.storage.streams.idl"; namespace Windows.Gaming.Input.Custom { typedef struct GameControllerVersionInfo GameControllerVersionInfo; interface IGameControllerProvider; + interface ICustomGameControllerFactory; [contract(Windows.Foundation.UniversalApiContract, 3.0)] struct GameControllerVersionInfo @@ -53,4 +54,16 @@ namespace Windows.Gaming.Input.Custom { [propget] HRESULT HardwareVersionInfo([out, retval] Windows.Gaming.Input.Custom.GameControllerVersionInfo *value); [propget] HRESULT IsConnected([out, retval] boolean *value); } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f) + ] + interface ICustomGameControllerFactory : IInspectable + { + HRESULT CreateGameController([in] Windows.Gaming.Input.Custom.IGameControllerProvider *provider, + [out, retval] IInspectable **value); + HRESULT OnGameControllerAdded([in] Windows.Gaming.Input.IGameController *value); + HRESULT OnGameControllerRemoved([in] Windows.Gaming.Input.IGameController *value); + } }

1 0

Rémi Bernon : dinput/tests: Simplify windows.gaming.input tests with events.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 57c0f186038d1a5042572f9a40db75415ae46f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c0f186038d1a5042572f9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 28 09:44:03 2022 +0100 dinput/tests: Simplify windows.gaming.input tests with events. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 76 ++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 4dc635932ab..2f30cc19d9d 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -72,6 +72,28 @@ failed: return FALSE; } +static DWORD wait_for_events( DWORD count, HANDLE *events, DWORD timeout ) +{ + DWORD ret, end = GetTickCount() + timeout; + MSG msg; + + while ((ret = MsgWaitForMultipleObjects( count, events, FALSE, timeout, QS_ALLINPUT )) <= count) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + if (ret < count) return ret; + if (timeout == INFINITE) continue; + if (end <= GetTickCount()) timeout = 0; + else timeout = end - GetTickCount(); + } + + ok( ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %#lx\n", ret ); + return ret; +} + static BOOL test_input_lost( DWORD version ) { #include "psh_hid_macros.h" @@ -445,6 +467,7 @@ static void test_RegisterDeviceNotification(void) struct controller_handler { IEventHandler_RawGameController IEventHandler_RawGameController_iface; + HANDLE event; BOOL invoked; }; @@ -487,6 +510,7 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); + SetEvent( impl->event ); impl->invoked = TRUE; return S_OK; @@ -548,7 +572,6 @@ static void test_windows_gaming_input(void) IRawGameControllerStatics *statics; HANDLE hwnd, thread, stop_event; HDEVNOTIFY devnotify; - BOOL removed; HSTRING str; UINT32 size; HRESULT hr; @@ -571,6 +594,11 @@ static void test_windows_gaming_input(void) return; } + controller_added.event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!controller_added.event, "CreateEventW failed, error %lu\n", GetLastError() ); + controller_removed.event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!controller_removed.event, "CreateEventW failed, error %lu\n", GetLastError() ); + hr = IRawGameControllerStatics_add_RawGameControllerAdded( statics, &controller_added.IEventHandler_RawGameController_iface, &controller_added_token ); ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); @@ -596,43 +624,30 @@ static void test_windows_gaming_input(void) device_change_count = 0; device_change_expect = 2; - device_change_hwnd = hwnd; - device_change_all = FALSE; stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); ok( !!stop_event, "CreateEventW failed, error %lu\n", GetLastError() ); thread = CreateThread( NULL, 0, dinput_test_device_thread, stop_event, 0, NULL ); ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); - removed = FALSE; - while (device_change_count < device_change_expect) - { - MsgWaitForMultipleObjects( 0, NULL, FALSE, 50, QS_ALLINPUT ); - while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) - { - TranslateMessage( &msg ); - ok( msg.message != WM_DEVICECHANGE, "got WM_DEVICECHANGE\n" ); - DispatchMessageW( &msg ); - } - if (controller_added.invoked && !removed) - { - ok( !controller_removed.invoked, "controller removed handler invoked\n" ); - removed = TRUE; + wait_for_events( 1, &controller_added.event, INFINITE ); - hr = IVectorView_RawGameController_get_Size( controller_view, &size ); - ok( hr == S_OK, "get_Size returned %#lx\n", hr ); - ok( size == 0, "got size %u\n", size ); + ok( controller_added.invoked, "controller added handler not invoked\n" ); + ok( !controller_removed.invoked, "controller removed handler invoked\n" ); - IVectorView_RawGameController_Release( controller_view ); - hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); - ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); - hr = IVectorView_RawGameController_get_Size( controller_view, &size ); - ok( hr == S_OK, "get_Size returned %#lx\n", hr ); - ok( size == 1, "got size %u\n", size ); + IVectorView_RawGameController_Release( controller_view ); + hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); - SetEvent( stop_event ); - } - } + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 1, "got size %u\n", size ); + + SetEvent( stop_event ); + wait_for_events( 1, &controller_removed.event, INFINITE ); ok( controller_added.invoked, "controller added handler not invoked\n" ); ok( controller_removed.invoked, "controller removed handler not invoked\n" ); @@ -667,6 +682,9 @@ static void test_windows_gaming_input(void) DestroyWindow( hwnd ); UnregisterClassW( class.lpszClassName, class.hInstance ); + + CloseHandle( controller_added.event ); + CloseHandle( controller_removed.event ); } START_TEST( hotplug )

1 0

Alexandros Frantzis : win32u: Fix NtUserCallHooks return value.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 3bfbdc6d11dc5a90a625dd2d5f4bfc95c0790d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bfbdc6d11dc5a90a625dd2d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Feb 28 16:54:46 2022 +0200 win32u: Fix NtUserCallHooks return value. Return the actual result value of NtUserCallHooks invocations, which also fixes an inadvertent switch statement case fallthrough. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b5d82748c71..cd4ff91255e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4582,7 +4582,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallHooks: { const struct win_hook_params *params = (struct win_hook_params *)arg; - call_hooks( params->id, params->code, params->wparam, params->lparam, params->next_unicode ); + return call_hooks( params->id, params->code, params->wparam, params->lparam, + params->next_unicode ); } case NtUserFlushWindowSurfaces: flush_window_surfaces( arg );

1 0

Rémi Bernon : dinput/tests: Make combase.dll dependency optional.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 9a9d73b572b35450c37a093e6126e0e94025bc40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9d73b572b35450c37a093e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 28 09:44:02 2022 +0100 dinput/tests: Make combase.dll dependency optional. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/hotplug.c | 42 ++++++++++++++++++++++++++++--------- dlls/dinput/tests/joystick8.c | 49 +++++++++++++++++++++++++++++++++---------- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index d32092ca03b..5ba0e5be4d7 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dinput.dll -IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm combase +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 49cc5423807..4dc635932ab 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -47,6 +47,31 @@ #define WIDL_using_Windows_Gaming_Input #include "windows.gaming.input.h" +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( RoGetActivationFactory ); +MAKE_FUNC( RoInitialize ); +MAKE_FUNC( WindowsCreateString ); +MAKE_FUNC( WindowsDeleteString ); +#undef MAKE_FUNC + +static BOOL load_combase_functions(void) +{ + HMODULE combase = GetModuleHandleW( L"combase.dll" ); + +#define LOAD_FUNC(m, f) if (!(p ## f = (void *)GetProcAddress( m, #f ))) goto failed; + LOAD_FUNC( combase, RoGetActivationFactory ); + LOAD_FUNC( combase, RoInitialize ); + LOAD_FUNC( combase, WindowsCreateString ); + LOAD_FUNC( combase, WindowsDeleteString ); +#undef LOAD_FUNC + + return TRUE; + +failed: + win_skip("Failed to load combase.dll functions, skipping tests\n"); + return FALSE; +} + static BOOL test_input_lost( DWORD version ) { #include "psh_hid_macros.h" @@ -529,20 +554,20 @@ static void test_windows_gaming_input(void) HRESULT hr; MSG msg; - hr = RoInitialize( RO_INIT_MULTITHREADED ); + if (!load_combase_functions()) return; + + hr = pRoInitialize( RO_INIT_MULTITHREADED ); ok( hr == RPC_E_CHANGED_MODE, "RoInitialize failed, hr %#lx\n", hr ); - hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); + hr = pWindowsCreateString( class_name, wcslen( class_name ), &str ); ok( hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr ); - - hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&statics ); + hr = pRoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&statics ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory failed, hr %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); if (hr == REGDB_E_CLASSNOTREG) { win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( class_name ) ); - RoUninitialize(); return; } @@ -551,7 +576,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); todo_wine ok( controller_added_token.value, "got token %I64u\n", controller_added_token.value ); - if (!controller_added_token.value) goto done; + if (!controller_added_token.value) return; hr = IRawGameControllerStatics_add_RawGameControllerRemoved( statics, &controller_removed.IEventHandler_RawGameController_iface, &controller_removed_token ); @@ -642,9 +667,6 @@ static void test_windows_gaming_input(void) DestroyWindow( hwnd ); UnregisterClassW( class.lpszClassName, class.hInstance ); - -done: - RoUninitialize(); } START_TEST( hotplug ) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f01bed08030..e65e3ca9970 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -46,6 +46,33 @@ #define WIDL_using_Windows_Gaming_Input #include "windows.gaming.input.h" +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( RoGetActivationFactory ); +MAKE_FUNC( RoInitialize ); +MAKE_FUNC( WindowsCreateString ); +MAKE_FUNC( WindowsDeleteString ); +MAKE_FUNC( WindowsGetStringRawBuffer ); +#undef MAKE_FUNC + +static BOOL load_combase_functions(void) +{ + HMODULE combase = GetModuleHandleW( L"combase.dll" ); + +#define LOAD_FUNC(m, f) if (!(p ## f = (void *)GetProcAddress( m, #f ))) goto failed; + LOAD_FUNC( combase, RoGetActivationFactory ); + LOAD_FUNC( combase, RoInitialize ); + LOAD_FUNC( combase, WindowsCreateString ); + LOAD_FUNC( combase, WindowsDeleteString ); + LOAD_FUNC( combase, WindowsGetStringRawBuffer ); +#undef LOAD_FUNC + + return TRUE; + +failed: + win_skip("Failed to load combase.dll functions, skipping tests\n"); + return FALSE; +} + struct check_objects_todos { BOOL type; @@ -3214,9 +3241,9 @@ static void check_runtimeclass_( int line, IInspectable *inspectable, const WCHA hr = IInspectable_GetRuntimeClassName( inspectable, &str ); ok_ (__FILE__, line)( hr == S_OK, "GetRuntimeClassName returned %#lx\n", hr ); - buffer = WindowsGetStringRawBuffer( str, &length ); + buffer = pWindowsGetStringRawBuffer( str, &length ); ok_ (__FILE__, line)( !wcscmp( buffer, class_name ), "got class name %s\n", debugstr_w(buffer) ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); } static void test_windows_gaming_input(void) @@ -3284,20 +3311,22 @@ static void test_windows_gaming_input(void) HSTRING str; HRESULT hr; + if (!load_combase_functions()) return; + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - hr = RoInitialize( RO_INIT_MULTITHREADED ); + hr = pRoInitialize( RO_INIT_MULTITHREADED ); ok( hr == RPC_E_CHANGED_MODE, "RoInitialize returned %#lx\n", hr ); - hr = WindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); + hr = pWindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); - hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); + hr = pRoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory returned %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); if (hr == REGDB_E_CLASSNOTREG) { @@ -3336,11 +3365,11 @@ static void test_windows_gaming_input(void) /* HID gamepads aren't exposed as WGI gamepads on Windows */ - hr = WindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); + hr = pWindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); - hr = RoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); + hr = pRoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); hr = IGamepadStatics_get_Gamepads( gamepad_statics, &gamepads_view ); ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); @@ -3384,8 +3413,6 @@ done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); - - RoUninitialize(); } START_TEST( joystick8 )

1 0

Paul Gofman : winhttp: Support receiving web socket buffer fragments.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 0fc08a974f77b2dc5267e9657eebcfaaf839eb96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc08a974f77b2dc5267e965… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 28 12:37:51 2022 +0100 winhttp: Support receiving web socket buffer fragments. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 66 ++++++++++++++++++++++++++++++++++++------ dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 48e25023d07..b409c4cdced 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3550,6 +3550,7 @@ static BOOL is_supported_opcode( enum socket_opcode opcode ) { switch (opcode) { + case SOCKET_OPCODE_CONTINUE: case SOCKET_OPCODE_TEXT: case SOCKET_OPCODE_BINARY: case SOCKET_OPCODE_CLOSE: @@ -3562,7 +3563,7 @@ static BOOL is_supported_opcode( enum socket_opcode opcode ) } } -static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_opcode *opcode ) +static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_opcode *opcode, BOOL *final ) { DWORD ret, len, count; char hdr[2]; @@ -3573,7 +3574,8 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } *opcode = hdr[0] & 0xf; - TRACE("received %02x frame\n", *opcode); + *final = hdr[0] & FIN_BIT; + TRACE("received %02x frame, final %#x\n", *opcode, *final); len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3720,18 +3722,49 @@ static DWORD handle_control_frame( struct socket *socket ) return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( struct socket *socket, enum socket_opcode opcode, BOOL fragment ) { + enum fragment_type frag_type = socket->receiving_fragment_type; + switch (opcode) { case SOCKET_OPCODE_TEXT: - if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + if (frag_type && frag_type != SOCKET_FRAGMENT_UTF8) + FIXME( "Received SOCKET_OPCODE_TEXT with prev fragment %u.\n", frag_type ); + if (fragment) + { + socket->receiving_fragment_type = SOCKET_FRAGMENT_UTF8; + return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; case SOCKET_OPCODE_BINARY: - if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + if (frag_type && frag_type != SOCKET_FRAGMENT_BINARY) + FIXME( "Received SOCKET_OPCODE_BINARY with prev fragment %u.\n", frag_type ); + if (fragment) + { + socket->receiving_fragment_type = SOCKET_FRAGMENT_BINARY; + return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + case SOCKET_OPCODE_CONTINUE: + if (!frag_type) + { + FIXME( "Received SOCKET_OPCODE_CONTINUE without starting fragment.\n" ); + return ~0u; + } + if (fragment) + { + return frag_type == SOCKET_FRAGMENT_BINARY ? WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE + : WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; + return frag_type == SOCKET_FRAGMENT_BINARY ? WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + : WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + case SOCKET_OPCODE_CLOSE: return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; @@ -3744,13 +3777,14 @@ static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOO static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) { + BOOL final = socket->last_receive_final; DWORD count, ret = ERROR_SUCCESS; if (!socket->read_size) { for (;;) { - if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode ))) + if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode, &final ))) { if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket )) || socket->opcode == SOCKET_OPCODE_CLOSE) break; @@ -3759,7 +3793,11 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (ret) break; } } - if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); + if (!ret) + { + socket->last_receive_final = final; + ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); + } if (!ret) { if (count < socket->read_size) @@ -3767,7 +3805,14 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD socket->read_size -= count; *ret_len = count; - *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); + *ret_type = map_opcode( socket, socket->opcode, !final || socket->read_size != 0 ); + TRACE( "len %lu, *ret_len %lu, *ret_type %u.\n", len, *ret_len, *ret_type ); + if (*ret_type == ~0u) + { + FIXME( "Unexpected opcode %u.\n", socket->opcode ); + socket->read_size = 0; + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } } return ret; } @@ -3978,6 +4023,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r static DWORD socket_close( struct socket *socket ) { + BOOL final = FALSE; DWORD ret, count; if (socket->close_frame_received) return socket->close_frame_receive_err; @@ -3986,12 +4032,14 @@ static DWORD socket_close( struct socket *socket ) while (1) { - if ((ret = receive_frame( socket, &count, &socket->opcode ))) return ret; + if ((ret = receive_frame( socket, &count, &socket->opcode, &final ))) return ret; if (socket->opcode == SOCKET_OPCODE_CLOSE) break; socket->read_size = count; if ((ret = socket_drain( socket ))) return ret; } + if (!final) + FIXME( "Received close opcode without FIN bit.\n" ); return receive_close_status( socket, count ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index bebc3ac1a07..19ef9a35e2d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -269,6 +269,8 @@ struct socket SRWLOCK send_lock; volatile LONG pending_noncontrol_send; enum fragment_type sending_fragment_type; + enum fragment_type receiving_fragment_type; + BOOL last_receive_final; }; struct send_request

1 0

Paul Gofman : winhttp: Don't allow websocket send if another non-control send is pending.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 11c835d4718aff84c8250084128f29a7fb7e7ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c835d4718aff84c8250084… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 28 12:37:49 2022 +0100 winhttp: Don't allow websocket send if another non-control send is pending. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 16 +++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d0732952e11..de011060236 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3349,6 +3349,7 @@ static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL ); send_io_complete( &s->socket->hdr ); + InterlockedExchange( &s->socket->pending_noncontrol_send, 0 ); socket_send_complete( s->socket, ret, s->type, s->len ); release_object( &s->socket->hdr ); @@ -3386,8 +3387,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ BOOL async_send, complete_async = FALSE; struct socket_send *s; + if (InterlockedCompareExchange( &socket->pending_noncontrol_send, 1, 0 )) + { + WARN( "Previous send is still queued.\n" ); + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + if (!(s = malloc( sizeof(*s) ))) { + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } @@ -3417,11 +3426,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) { InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); free( s ); } } - else InterlockedDecrement( &socket->hdr.pending_sends ); + else + { + InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + } ReleaseSRWLockExclusive( &socket->send_lock ); if (!async_send) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 732f0afaa88..cf6655f561f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -260,6 +260,7 @@ struct socket unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; SRWLOCK send_lock; + volatile LONG pending_noncontrol_send; }; struct send_request

1 0