March 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : windows.gaming.input: Implement IGamepadStatics_get_Gamepads.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: e609c640a261fe4cd9b6044ca1fffc07e9e24299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e609c640a261fe4cd9b6044c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 10 13:05:48 2022 +0100 windows.gaming.input: Implement IGamepadStatics_get_Gamepads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 1 + dlls/windows.gaming.input/gamepad.c | 82 ++++++++++++++++++++++++++++++------- 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e74e76482f9..c4cfceeee3e 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3356,6 +3356,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + todo_wine /* but Wine currently intentionally does */ ok( size == 0, "got size %u\n", size ); IVectorView_Gamepad_Release( gamepads_view ); IGamepadStatics_Release( gamepad_statics ); diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 172ca74e3f6..70c9f4cd792 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -24,6 +24,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION gamepad_cs; +static CRITICAL_SECTION_DEBUG gamepad_cs_debug = +{ + 0, 0, &gamepad_cs, + { &gamepad_cs_debug.ProcessLocksList, &gamepad_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": gamepad_cs") } +}; +static CRITICAL_SECTION gamepad_cs = { &gamepad_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_Gamepad *gamepads; + +static HRESULT init_gamepads(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_Gamepad, + .view = &IID_IVectorView_Gamepad, + .iterable = &IID_IIterable_Gamepad, + .iterator = &IID_IIterator_Gamepad, + }; + HRESULT hr; + + EnterCriticalSection( &gamepad_cs ); + if (gamepads) hr = S_OK; + else hr = vector_create( &iids, (void **)&gamepads ); + LeaveCriticalSection( &gamepad_cs ); + + return hr; +} + struct gamepad { IGameControllerImpl IGameControllerImpl_iface; @@ -118,13 +148,19 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo IGameControllerProvider *provider ) { struct gamepad *impl = impl_from_IGameControllerImpl( iface ); + HRESULT hr; TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); - return S_OK; + EnterCriticalSection( &gamepad_cs ); + if (SUCCEEDED(hr = init_gamepads())) + hr = IVector_Gamepad_Append( gamepads, &impl->IGamepad_iface ); + LeaveCriticalSection( &gamepad_cs ); + + return hr; } static const struct IGameControllerImplVtbl controller_vtbl = @@ -341,23 +377,14 @@ static HRESULT WINAPI statics_remove_GamepadRemoved( IGamepadStatics *iface, Eve static HRESULT WINAPI statics_get_Gamepads( IGamepadStatics *iface, IVectorView_Gamepad **value ) { - static const struct vector_iids iids = - { - .vector = &IID_IVector_Gamepad, - .view = &IID_IVectorView_Gamepad, - .iterable = &IID_IIterable_Gamepad, - .iterator = &IID_IIterator_Gamepad, - }; - IVector_Gamepad *gamepads; HRESULT hr; TRACE( "iface %p, value %p.\n", iface, value ); - if (SUCCEEDED(hr = vector_create( &iids, (void **)&gamepads ))) - { + EnterCriticalSection( &gamepad_cs ); + if (SUCCEEDED(hr = init_gamepads())) hr = IVector_Gamepad_GetView( gamepads, value ); - IVector_Gamepad_Release( gamepads ); - } + LeaveCriticalSection( &gamepad_cs ); return hr; } @@ -440,8 +467,33 @@ static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameContr static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + IGamepad *gamepad; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IGamepad, (void **)&gamepad ))) + return hr; + + EnterCriticalSection( &gamepad_cs ); + if (SUCCEEDED(hr = init_gamepads())) + { + if (FAILED(hr = IVector_Gamepad_IndexOf( gamepads, gamepad, &index, &found )) || !found) + WARN( "Could not find gamepad %p, hr %#lx!\n", gamepad, hr ); + else + hr = IVector_Gamepad_RemoveAt( gamepads, index ); + } + LeaveCriticalSection( &gamepad_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove gamepad %p, hr %#lx!\n", gamepad, hr ); + else if (found) + TRACE( "Removed gamepad %p.\n", gamepad ); + IGamepad_Release( gamepad ); + + return S_OK; } static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl =

1 0

Paul Gofman : ws2_32: Manage shorter length for TCP_NODELAY.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 4259f9333777406b7b3bc78cb453eb0cf4426013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4259f9333777406b7b3bc78c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 10 12:40:52 2022 +0300 ws2_32: Manage shorter length for TCP_NODELAY. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++++++++------ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9f140a6ee44..80665ff57a4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1725,6 +1725,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl switch(optname) { case TCP_NODELAY: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen ); default: @@ -2998,14 +3004,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - { - INT nodelay = *optval; - if (optlen <= 0) { - SetLastError(WSAEFAULT); + if (optlen <= 0 || !optval) + { + SetLastError( optlen && optval ? WSAENOBUFS : WSAEFAULT ); return SOCKET_ERROR; } - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); - } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&value, sizeof(value) ); + default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dfa1640e8bc..afdfc68905b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1181,6 +1181,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_NODELAY, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE},

1 0

Rémi Bernon : windows.gaming.input: Implement GetCurrentReading for the Gamepad runtimeclass.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: c2e2e919bc0330116c704f6ce86610b57cb3d86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e2e919bc0330116c704f6c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 10 13:05:52 2022 +0100 windows.gaming.input: Implement GetCurrentReading for the Gamepad runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/gamepad.c | 72 +++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index fbb439d3fec..b815d5c0a13 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -65,6 +65,7 @@ struct gamepad LONG ref; IGameControllerProvider *provider; + IWineGameControllerProvider *wine_provider; }; static inline struct gamepad *impl_from_IGameControllerImpl( IGameControllerImpl *iface ) @@ -120,6 +121,8 @@ static ULONG WINAPI controller_Release( IGameControllerImpl *iface ) if (!ref) { + if (impl->wine_provider) + IWineGameControllerProvider_Release( impl->wine_provider ); IGameControllerProvider_Release( impl->provider ); free( impl ); } @@ -157,6 +160,10 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); + hr = IGameControllerProvider_QueryInterface( provider, &IID_IWineGameControllerProvider, + (void **)&impl->wine_provider ); + if (FAILED(hr)) return hr; + EnterCriticalSection( &gamepad_cs ); if (SUCCEEDED(hr = init_gamepads())) hr = IVector_Gamepad_Append( gamepads, &impl->IGamepad_iface ); @@ -222,8 +229,69 @@ static HRESULT WINAPI gamepad_put_Vibration( IGamepad *iface, struct GamepadVibr static HRESULT WINAPI gamepad_GetCurrentReading( IGamepad *iface, struct GamepadReading *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL;} + struct gamepad *impl = impl_from_IGamepad( iface ); + struct WineGameControllerState state; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IWineGameControllerProvider_get_State( impl->wine_provider, &state ))) return hr; + + value->Buttons = 0; + if (state.buttons[0]) value->Buttons |= GamepadButtons_A; + if (state.buttons[1]) value->Buttons |= GamepadButtons_B; + if (state.buttons[2]) value->Buttons |= GamepadButtons_X; + if (state.buttons[3]) value->Buttons |= GamepadButtons_Y; + if (state.buttons[4]) value->Buttons |= GamepadButtons_LeftShoulder; + if (state.buttons[5]) value->Buttons |= GamepadButtons_RightShoulder; + if (state.buttons[6]) value->Buttons |= GamepadButtons_Menu; + if (state.buttons[7]) value->Buttons |= GamepadButtons_View; + if (state.buttons[8]) value->Buttons |= GamepadButtons_LeftThumbstick; + if (state.buttons[9]) value->Buttons |= GamepadButtons_RightThumbstick; + + switch (state.switches[0]) + { + case GameControllerSwitchPosition_Up: + case GameControllerSwitchPosition_UpRight: + case GameControllerSwitchPosition_UpLeft: + value->Buttons |= GamepadButtons_DPadUp; + break; + case GameControllerSwitchPosition_Down: + case GameControllerSwitchPosition_DownRight: + case GameControllerSwitchPosition_DownLeft: + value->Buttons |= GamepadButtons_DPadDown; + break; + default: + break; + } + + switch (state.switches[0]) + { + case GameControllerSwitchPosition_Right: + case GameControllerSwitchPosition_UpRight: + case GameControllerSwitchPosition_DownRight: + value->Buttons |= GamepadButtons_DPadRight; + break; + case GameControllerSwitchPosition_Left: + case GameControllerSwitchPosition_UpLeft: + case GameControllerSwitchPosition_DownLeft: + value->Buttons |= GamepadButtons_DPadLeft; + break; + default: + break; + } + + value->LeftThumbstickX = 2. * state.axes[0] - 1.; + value->LeftThumbstickY = 1. - 2. * state.axes[1]; + value->LeftTrigger = state.axes[2]; + value->RightThumbstickX = 2. * state.axes[3] - 1.; + value->RightThumbstickY = 1. - 2. * state.axes[4]; + value->RightTrigger = state.axes[5]; + + value->Timestamp = state.timestamp; + + return hr; +} static const struct IGamepadVtbl gamepad_vtbl = {

1 0

Rémi Bernon : windows.gaming.input: Return object counts and VID/PID for RawGameController.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 5fa86231f726c73406e96133e9f0574a34f56721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fa86231f726c73406e96133… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 10 13:05:50 2022 +0100 windows.gaming.input: Return object counts and VID/PID for RawGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 27 ++++++++------ dlls/windows.gaming.input/provider.c | 64 +++++++++++++++++++++++++++++++--- dlls/windows.gaming.input/provider.idl | 3 ++ 3 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index ab0183c7d4f..83e4e167ec9 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -65,6 +65,7 @@ struct controller LONG ref; IGameControllerProvider *provider; + IWineGameControllerProvider *wine_provider; }; static inline struct controller *impl_from_IGameControllerImpl( IGameControllerImpl *iface ) @@ -120,6 +121,8 @@ static ULONG WINAPI controller_Release( IGameControllerImpl *iface ) if (!ref) { + if (impl->wine_provider) + IWineGameControllerProvider_Release( impl->wine_provider ); IGameControllerProvider_Release( impl->provider ); free( impl ); } @@ -157,6 +160,10 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); + hr = IGameControllerProvider_QueryInterface( provider, &IID_IWineGameControllerProvider, + (void **)&impl->wine_provider ); + if (FAILED(hr)) return hr; + EnterCriticalSection( &controller_cs ); if (SUCCEEDED(hr = init_controllers())) hr = IVector_RawGameController_Append( controllers, &impl->IRawGameController_iface ); @@ -210,14 +217,14 @@ DEFINE_IINSPECTABLE_OUTER( raw_controller, IRawGameController, struct controller static HRESULT WINAPI raw_controller_get_AxisCount( IRawGameController *iface, INT32 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct controller *impl = impl_from_IRawGameController( iface ); + return IWineGameControllerProvider_get_AxisCount( impl->wine_provider, value ); } static HRESULT WINAPI raw_controller_get_ButtonCount( IRawGameController *iface, INT32 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct controller *impl = impl_from_IRawGameController( iface ); + return IWineGameControllerProvider_get_ButtonCount( impl->wine_provider, value ); } static HRESULT WINAPI raw_controller_get_ForceFeedbackMotors( IRawGameController *iface, IVectorView_ForceFeedbackMotor **value ) @@ -228,20 +235,20 @@ static HRESULT WINAPI raw_controller_get_ForceFeedbackMotors( IRawGameController static HRESULT WINAPI raw_controller_get_HardwareProductId( IRawGameController *iface, UINT16 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct controller *impl = impl_from_IRawGameController( iface ); + return IGameControllerProvider_get_HardwareProductId( impl->provider, value ); } static HRESULT WINAPI raw_controller_get_HardwareVendorId( IRawGameController *iface, UINT16 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct controller *impl = impl_from_IRawGameController( iface ); + return IGameControllerProvider_get_HardwareVendorId( impl->provider, value ); } static HRESULT WINAPI raw_controller_get_SwitchCount( IRawGameController *iface, INT32 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct controller *impl = impl_from_IRawGameController( iface ); + return IWineGameControllerProvider_get_SwitchCount( impl->wine_provider, value ); } static HRESULT WINAPI raw_controller_GetButtonLabel( IRawGameController *iface, INT32 index, diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c index 703516ccfe2..7883ec6af68 100644 --- a/dlls/windows.gaming.input/provider.c +++ b/dlls/windows.gaming.input/provider.c @@ -143,6 +143,45 @@ static HRESULT WINAPI wine_provider_get_Type( IWineGameControllerProvider *iface return S_OK; } +static HRESULT WINAPI wine_provider_get_AxisCount( IWineGameControllerProvider *iface, INT32 *value ) +{ + struct provider *impl = impl_from_IWineGameControllerProvider( iface ); + DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (SUCCEEDED(hr = IDirectInputDevice8_GetCapabilities( impl->dinput_device, &caps ))) + *value = caps.dwAxes; + return hr; +} + +static HRESULT WINAPI wine_provider_get_ButtonCount( IWineGameControllerProvider *iface, INT32 *value ) +{ + struct provider *impl = impl_from_IWineGameControllerProvider( iface ); + DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (SUCCEEDED(hr = IDirectInputDevice8_GetCapabilities( impl->dinput_device, &caps ))) + *value = caps.dwButtons; + return hr; +} + +static HRESULT WINAPI wine_provider_get_SwitchCount( IWineGameControllerProvider *iface, INT32 *value ) +{ + struct provider *impl = impl_from_IWineGameControllerProvider( iface ); + DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (SUCCEEDED(hr = IDirectInputDevice8_GetCapabilities( impl->dinput_device, &caps ))) + *value = caps.dwPOVs; + return hr; +} + static const struct IWineGameControllerProviderVtbl wine_provider_vtbl = { wine_provider_QueryInterface, @@ -154,6 +193,9 @@ static const struct IWineGameControllerProviderVtbl wine_provider_vtbl = wine_provider_GetTrustLevel, /* IWineGameControllerProvider methods */ wine_provider_get_Type, + wine_provider_get_AxisCount, + wine_provider_get_ButtonCount, + wine_provider_get_SwitchCount, }; DEFINE_IINSPECTABLE( game_provider, IGameControllerProvider, struct provider, IWineGameControllerProvider_iface ) @@ -166,14 +208,28 @@ static HRESULT WINAPI game_provider_get_FirmwareVersionInfo( IGameControllerProv static HRESULT WINAPI game_provider_get_HardwareProductId( IGameControllerProvider *iface, UINT16 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + DIPROPDWORD vid_pid = {.diph = {.dwHeaderSize = sizeof(DIPROPHEADER), .dwSize = sizeof(DIPROPDWORD)}}; + struct provider *impl = impl_from_IGameControllerProvider( iface ); + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (SUCCEEDED(hr = IDirectInputDevice8_GetProperty( impl->dinput_device, DIPROP_VIDPID, &vid_pid.diph ))) + *value = HIWORD(vid_pid.dwData); + return hr; } static HRESULT WINAPI game_provider_get_HardwareVendorId( IGameControllerProvider *iface, UINT16 *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + DIPROPDWORD vid_pid = {.diph = {.dwHeaderSize = sizeof(DIPROPHEADER), .dwSize = sizeof(DIPROPDWORD)}}; + struct provider *impl = impl_from_IGameControllerProvider( iface ); + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (SUCCEEDED(hr = IDirectInputDevice8_GetProperty( impl->dinput_device, DIPROP_VIDPID, &vid_pid.diph ))) + *value = LOWORD(vid_pid.dwData); + return hr; } static HRESULT WINAPI game_provider_get_HardwareVersionInfo( IGameControllerProvider *iface, GameControllerVersionInfo *value ) diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 6af700bb12d..19d5643f767 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -59,6 +59,9 @@ namespace Windows.Gaming.Input.Custom { requires Windows.Gaming.Input.Custom.IGameControllerProvider { [propget] HRESULT Type([out, retval] WineGameControllerType *value); + [propget] HRESULT AxisCount([out, retval] INT32 *value); + [propget] HRESULT ButtonCount([out, retval] INT32 *value); + [propget] HRESULT SwitchCount([out, retval] INT32 *value); } [

1 0

Kevin Puetz : oleaut32: Fix QueryPathOfRegTypeLib minor version comparison.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 288a1024b9b78b7c568e3ac1fae081b8bfd2734f URL: https://source.winehq.org/git/wine.git/?a=commit;h=288a1024b9b78b7c568e3ac1… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Sat Feb 19 14:06:21 2022 -0600 oleaut32: Fix QueryPathOfRegTypeLib minor version comparison. A search with wMin != 0xFFFF should match only if the actual version found matches the major and is is >= the minor version requested (preferring an exact match if one is available) Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 4 ++-- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4266243c1ba..6bfc50642a4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1521,7 +1521,7 @@ cleanup: static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, DWORD arch, LPCWSTR base, BOOL remove) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; - static const WCHAR formatW[] = {'\\','%','u','.','%','u','\\','0','\\','w','i','n','%','u',0}; + static const WCHAR formatW[] = {'\\','%','x','.','%','x','\\','0','\\','w','i','n','%','u',0}; static const WCHAR format2W[] = {'%','s','_','%','u','_','%','u','.','d','l','l',0}; WCHAR buf[128]; HKEY hkey; @@ -1578,7 +1578,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) { 3, 1, S_OK, {'f','a','k','e','_','3','_','1','.','d','l','l',0 } }, { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, - { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, + { 3, 40, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 0xffff, 0xffff, S_OK, {'f','a','k','e','_','5','_','3','7','.','d','l','l',0 } }, { 0xffff, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 3, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cdc48e9c7fe..7f10bcc968d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -207,7 +207,7 @@ static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) best_min = v_min; break; /* exact match */ } - if (*wMin != 0xffff && v_min > best_min) best_min = v_min; + if (*wMin != 0xffff && v_min >= *wMin && v_min > best_min) best_min = v_min; } } len = sizeof(key_name);

1 0

Hans Leidekker : crypt32: Requestor name is optional in OCSP request.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 6de79d64fa930cfc2d1497f0519015af5788bb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de79d64fa930cfc2d1497f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 14:15:48 2022 +0100 crypt32: Requestor name is optional in OCSP request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 21 ++++++++++++--------- dlls/crypt32/tests/encode.c | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index a506f197be1..3391e61679c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4632,18 +4632,21 @@ static BOOL WINAPI CRYPT_AsnEncodeOCSPRequest(DWORD dwCertEncodingType, { struct AsnConstructedItem name; struct AsnEncodeSequenceItem items[2]; - DWORD count = 1; - - name.tag = 1; - name.pvStructInfo = info->pRequestorName; - name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; - items[0].pvStructInfo = &name; - items[0].encodeFunc = CRYPT_AsnEncodeConstructed; + DWORD count = 0; + if (info->pRequestorName) + { + name.tag = 1; + name.pvStructInfo = info->pRequestorName; + name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; + items[count].pvStructInfo = &name; + items[count].encodeFunc = CRYPT_AsnEncodeConstructed; + count++; + } if (info->cRequestEntry) { - items[1].pvStructInfo = &info->cRequestEntry; - items[1].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; + items[count].pvStructInfo = &info->cRequestEntry; + items[count].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; count++; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9d12223c54c..747b4a7d18f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8656,6 +8656,17 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE expected3[] = + {0x30, 0x81, 0x9d, 0x30, 0x81, 0x9a, 0x30, 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, + 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, + 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, + 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, + 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, + 0x8f, 0x49, 0x08, 0x30, 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, + 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, + 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, + 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, + 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; static const BYTE issuer_name[] = {0xe4, 0xe3 ,0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; @@ -8715,6 +8726,16 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) ok(size == sizeof(expected2), "got %lu\n", size); ok(!memcmp(buf, expected2, sizeof(expected2)), "unexpected value\n"); LocalFree(buf); + + /* requestor name not set */ + info.pRequestorName = NULL; + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected3), "got %lu\n", size); + ok(!memcmp(buf, expected3, sizeof(expected3)), "unexpected value\n"); + LocalFree(buf); } START_TEST(encode)

1 0

Zhiyi Zhang : comctl32/tests: Fix a possible test failure.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 7de22a743827e4a74b228b851f508db9eee1f8d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de22a743827e4a74b228b85… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 10 21:44:58 2022 +0800 comctl32/tests: Fix a possible test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52639 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 80f9e067c00..31c360304c6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2639,6 +2639,7 @@ static void test_visual(void) SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); ok(ret, "TB_ADDBUTTONSA failed.\n"); + flush_events(); theme = pGetWindowTheme(toolbar); ok(!theme, "Expected theme not opened by window.\n"); @@ -2650,7 +2651,6 @@ static void test_visual(void) ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); ok(ret, "RedrawWindow failed.\n"); - flush_events(); mem_dc1 = CreateCompatibleDC(toolbar_dc); mem_bitmap1 = CreateCompatibleBitmap(toolbar_dc, width, height);

1 0

Jacek Caban : win32u: Move NtUserUpdateLayeredWindow implementation from user32.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: ba373a3eb2704d83679b78ba1f0d8db9887225ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba373a3eb2704d83679b78ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:33:27 2022 +0100 win32u: Move NtUserUpdateLayeredWindow implementation from user32. 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/user32/driver.c | 15 +--------- dlls/user32/win.c | 49 +++---------------------------- dlls/win32u/driver.c | 7 +++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 +++ dlls/win32u/window.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 9 ++++++ include/ntuser.h | 3 ++ 9 files changed, 100 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba373a3eb2704d83679b…

1 0

Rémi Bernon : windows.gaming.input: Implement Controller(Added|Removed) event support.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 1e9b83a440cf746eb67432687e7718d5b194f5e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9b83a440cf746eb6743268… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 10 13:05:49 2022 +0100 windows.gaming.input: Implement Controller(Added|Removed) event support. Using a generic EventHandler<IInspectable *> implementation. This adds several todo_wine because we currently do not implement custom game controller factories. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 21 +++++-- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/controller.c | 46 +++++++++------ dlls/windows.gaming.input/event_handlers.c | 89 ++++++++++++++++++++++++++++++ dlls/windows.gaming.input/gamepad.c | 44 +++++++++------ dlls/windows.gaming.input/manager.c | 1 - dlls/windows.gaming.input/private.h | 6 ++ dlls/windows.gaming.input/provider.c | 1 - include/windows.foundation.idl | 1 + 9 files changed, 171 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e9b83a440cf746eb674…

1 0

Jacek Caban : win32u: Move GetWindowPlacement and MonitorFromWindow implementation from user32.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: c7e5ab198eaca24c6876c2268bb545882b3cf857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7e5ab198eaca24c6876c226… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:32:34 2022 +0100 win32u: Move GetWindowPlacement and MonitorFromWindow implementation from user32. 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/user32/sysparams.c | 19 +---- dlls/user32/winpos.c | 80 +------------------- dlls/win32u/region.c | 2 +- dlls/win32u/sysparams.c | 23 +++++- dlls/win32u/win32u_private.h | 6 +- dlls/win32u/window.c | 174 +++++++++++++++++++++++++++++++++++++++++-- include/ntuser.h | 2 + 7 files changed, 201 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7e5ab198eaca24c6876…

1 0