April 2022 - Wine-commits - list.winehq.org

Hugh McMaster : conhost: Save default font's pitch and family on first run.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: a2bb60e62c0e7c0f0733bd2d0c66ba81d91fe19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2bb60e62c0e7c0f0733bd2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 20 23:18:03 2022 +1000 conhost: Save default font's pitch and family on first run. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..c115e42a282 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -823,6 +823,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; + config.font_pitch_family = fc->console->active->font.pitch_family; memcpy( config.face_name, fc->console->active->font.face_name, fc->console->active->font.face_len * sizeof(WCHAR) ); config.face_name[fc->console->active->font.face_len] = 0;

1 0

Rémi Bernon : windows.gaming.input: Introduce Windows.Gaming.Input.RacingWheel activation factory.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 9f5dc12a07523d586d6ad26e33007deeb1977c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f5dc12a07523d586d6ad26e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:05 2022 +0200 windows.gaming.input: Introduce Windows.Gaming.Input.RacingWheel activation factory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 2 + dlls/windows.gaming.input/racing_wheel.c | 117 +++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 6c075c3d67c..1e0ce5c360c 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ main.c \ manager.c \ provider.c \ + racing_wheel.c \ vector.c IDL_SRCS = \ diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 1ddd3a8fd23..2d8f6a340b0 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -180,6 +180,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RacingWheel )) + IActivationFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index bb2fb68b8a8..73fab47a770 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -34,6 +34,7 @@ #define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input #define WIDL_using_Windows_Gaming_Input_Custom +#define WIDL_using_Windows_Gaming_Input_ForceFeedback #include "windows.gaming.input.custom.h" #include "wine/list.h" @@ -41,6 +42,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; +extern IActivationFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; struct vector_iids diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c new file mode 100644 index 00000000000..a8d20bc26ff --- /dev/null +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -0,0 +1,117 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 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 + */ + +#include "private.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +struct racing_wheel_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct racing_wheel_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct racing_wheel_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct racing_wheel_statics racing_wheel_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *racing_wheel_factory = &racing_wheel_statics.IActivationFactory_iface;

1 0

Rémi Bernon : windows.gaming.input: Implement IRacingWheelStatics interface for RacingWheel.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: d1bf6e7e3798546797f0f3f09896205ff99f9781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1bf6e7e3798546797f0f3f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:06 2022 +0200 windows.gaming.input: Implement IRacingWheelStatics interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/racing_wheel.c | 100 +++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index a8d20bc26ff..458f79a2aa0 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -24,9 +24,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION racing_wheel_cs; +static CRITICAL_SECTION_DEBUG racing_wheel_cs_debug = +{ + 0, 0, &racing_wheel_cs, + { &racing_wheel_cs_debug.ProcessLocksList, &racing_wheel_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": racing_wheel_cs") } +}; +static CRITICAL_SECTION racing_wheel_cs = { &racing_wheel_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_RacingWheel *racing_wheels; +static struct list racing_wheel_added_handlers = LIST_INIT( racing_wheel_added_handlers ); +static struct list racing_wheel_removed_handlers = LIST_INIT( racing_wheel_removed_handlers ); + +static HRESULT init_racing_wheels(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_RacingWheel, + .view = &IID_IVectorView_RacingWheel, + .iterable = &IID_IIterable_RacingWheel, + .iterator = &IID_IIterator_RacingWheel, + }; + HRESULT hr; + + EnterCriticalSection( &racing_wheel_cs ); + if (racing_wheels) hr = S_OK; + else hr = vector_create( &iids, (void **)&racing_wheels ); + LeaveCriticalSection( &racing_wheel_cs ); + + return hr; +} + struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; + IRacingWheelStatics IRacingWheelStatics_iface; LONG ref; }; @@ -50,6 +83,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IRacingWheelStatics )) + { + IInspectable_AddRef( (*out = &impl->IRacingWheelStatics_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -108,9 +147,70 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( statics, IRacingWheelStatics, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics_add_RacingWheelAdded( IRacingWheelStatics *iface, IEventHandler_RacingWheel *handler, + EventRegistrationToken *token ) +{ + TRACE( "iface %p, handler %p, token %p.\n", iface, handler, token ); + if (!handler) return E_INVALIDARG; + return event_handlers_append( &racing_wheel_added_handlers, (IEventHandler_IInspectable *)handler, token ); +} + +static HRESULT WINAPI statics_remove_RacingWheelAdded( IRacingWheelStatics *iface, EventRegistrationToken token ) +{ + TRACE( "iface %p, token %#I64x.\n", iface, token.value ); + return event_handlers_remove( &racing_wheel_added_handlers, &token ); +} + +static HRESULT WINAPI statics_add_RacingWheelRemoved( IRacingWheelStatics *iface, IEventHandler_RacingWheel *handler, + EventRegistrationToken *token ) +{ + TRACE( "iface %p, handler %p, token %p.\n", iface, handler, token ); + if (!handler) return E_INVALIDARG; + return event_handlers_append( &racing_wheel_removed_handlers, (IEventHandler_IInspectable *)handler, token ); +} + +static HRESULT WINAPI statics_remove_RacingWheelRemoved( IRacingWheelStatics *iface, EventRegistrationToken token ) +{ + TRACE( "iface %p, token %#I64x.\n", iface, token.value ); + return event_handlers_remove( &racing_wheel_removed_handlers, &token ); +} + +static HRESULT WINAPI statics_get_RacingWheels( IRacingWheelStatics *iface, IVectorView_RacingWheel **value ) +{ + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + EnterCriticalSection( &racing_wheel_cs ); + if (SUCCEEDED(hr = init_racing_wheels())) hr = IVector_RacingWheel_GetView( racing_wheels, value ); + LeaveCriticalSection( &racing_wheel_cs ); + + return hr; +} + +static const struct IRacingWheelStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* IRacingWheelStatics methods */ + statics_add_RacingWheelAdded, + statics_remove_RacingWheelAdded, + statics_add_RacingWheelRemoved, + statics_remove_RacingWheelRemoved, + statics_get_RacingWheels, +}; + static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, + {&statics_vtbl}, 1, };

1 0

Rémi Bernon : windows.gaming.input: Implement ICustomGameControllerFactory interface for RacingWheel.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: acc2b32a5e81357c7cf37ccadaa7fd0d31e52773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc2b32a5e81357c7cf37cca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:07 2022 +0200 windows.gaming.input: Implement ICustomGameControllerFactory interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 2 +- dlls/windows.gaming.input/private.h | 2 +- dlls/windows.gaming.input/racing_wheel.c | 83 +++++++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 2d8f6a340b0..21808d9c2ad 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -181,7 +181,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RacingWheel )) - IActivationFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 73fab47a770..58b2040d3de 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -42,7 +42,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; -extern IActivationFactory *racing_wheel_factory; +extern ICustomGameControllerFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; struct vector_iids diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index 458f79a2aa0..818e46bab42 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -60,6 +60,7 @@ struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; IRacingWheelStatics IRacingWheelStatics_iface; + ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -89,6 +90,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) + { + IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -207,11 +214,85 @@ static const struct IRacingWheelStaticsVtbl statics_vtbl = statics_get_RacingWheels, }; +DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, + IInspectable **value ) +{ + FIXME( "iface %p, provider %p, value %p stub!.\n", iface, provider, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value ) +{ + IRacingWheel *racing_wheel; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRacingWheel, (void **)&racing_wheel ))) + return hr; + event_handlers_notify( &racing_wheel_added_handlers, (IInspectable *)racing_wheel ); + IRacingWheel_Release( racing_wheel ); + + return S_OK; +} + +static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) +{ + IRacingWheel *racing_wheel; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRacingWheel, (void **)&racing_wheel ))) + return hr; + + EnterCriticalSection( &racing_wheel_cs ); + if (SUCCEEDED(hr = init_racing_wheels())) + { + if (FAILED(hr = IVector_RacingWheel_IndexOf( racing_wheels, racing_wheel, &index, &found )) || !found) + WARN( "Could not find RacingWheel %p, hr %#lx!\n", racing_wheel, hr ); + else + hr = IVector_RacingWheel_RemoveAt( racing_wheels, index ); + } + LeaveCriticalSection( &racing_wheel_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove RacingWheel %p, hr %#lx!\n", racing_wheel, hr ); + else if (found) + { + TRACE( "Removed RacingWheel %p.\n", racing_wheel ); + event_handlers_notify( &racing_wheel_removed_handlers, (IInspectable *)racing_wheel ); + } + IRacingWheel_Release( racing_wheel ); + + return S_OK; +} + +static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = +{ + controller_factory_QueryInterface, + controller_factory_AddRef, + controller_factory_Release, + /* IInspectable methods */ + controller_factory_GetIids, + controller_factory_GetRuntimeClassName, + controller_factory_GetTrustLevel, + /* ICustomGameControllerFactory methods */ + controller_factory_CreateGameController, + controller_factory_OnGameControllerAdded, + controller_factory_OnGameControllerRemoved, +}; + static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&controller_factory_vtbl}, 1, }; -IActivationFactory *racing_wheel_factory = &racing_wheel_statics.IActivationFactory_iface; +ICustomGameControllerFactory *racing_wheel_factory = &racing_wheel_statics.ICustomGameControllerFactory_iface;

1 0

Rémi Bernon : windows.gaming.input: Implement IRacingWheelStatics2 interface for RacingWheel.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: e2e038e231379e31c89dd1e41548e41ca06e5103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e038e231379e31c89dd1e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:08 2022 +0200 windows.gaming.input: Implement IRacingWheelStatics2 interface for RacingWheel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/racing_wheel.c | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index 818e46bab42..1fc39f64f19 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -60,6 +60,7 @@ struct racing_wheel_statics { IActivationFactory IActivationFactory_iface; IRacingWheelStatics IRacingWheelStatics_iface; + IRacingWheelStatics2 IRacingWheelStatics2_iface; ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -90,6 +91,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IRacingWheelStatics2 )) + { + IInspectable_AddRef( (*out = &impl->IRacingWheelStatics2_iface) ); + return S_OK; + } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) { IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); @@ -214,6 +221,39 @@ static const struct IRacingWheelStaticsVtbl statics_vtbl = statics_get_RacingWheels, }; +DEFINE_IINSPECTABLE( statics2, IRacingWheelStatics2, struct racing_wheel_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics2_FromGameController( IRacingWheelStatics2 *iface, IGameController *game_controller, IRacingWheel **value ) +{ + struct racing_wheel_statics *impl = impl_from_IRacingWheelStatics2( iface ); + IGameController *controller; + HRESULT hr; + + TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + + *value = NULL; + hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, + game_controller, &controller ); + if (FAILED(hr) || !controller) return hr; + + hr = IGameController_QueryInterface( controller, &IID_IRacingWheel, (void **)value ); + IGameController_Release( controller ); + return hr; +} + +static const struct IRacingWheelStatics2Vtbl statics2_vtbl = +{ + statics2_QueryInterface, + statics2_AddRef, + statics2_Release, + /* IInspectable methods */ + statics2_GetIids, + statics2_GetRuntimeClassName, + statics2_GetTrustLevel, + /* IRacingWheelStatics2 methods */ + statics2_FromGameController, +}; + DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct racing_wheel_statics, IActivationFactory_iface ) static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, @@ -291,6 +331,7 @@ static struct racing_wheel_statics racing_wheel_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&statics2_vtbl}, {&controller_factory_vtbl}, 1, };

1 0

Rémi Bernon : windows.gaming.input: Implement RacingWheel runtimeclass stub.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: b12c74e435c86b74e723d41fc5870fa11ea27a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12c74e435c86b74e723d41f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:09 2022 +0200 windows.gaming.input: Implement RacingWheel runtimeclass stub. And instantiate the class for DI8DEVTYPE_DRIVING devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/manager.c | 4 + dlls/windows.gaming.input/provider.c | 1 + dlls/windows.gaming.input/provider.idl | 1 + dlls/windows.gaming.input/racing_wheel.c | 242 ++++++++++++++++++++++++++++++- 4 files changed, 246 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b12c74e435c86b74e723…

1 0

Rémi Bernon : dinput/tests: Add some RacingWheel runtimeclass tests.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: ea30b88a993b5a2944b1fa4f5df7465c46027324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea30b88a993b5a2944b1fa4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 22 11:49:10 2022 +0200 dinput/tests: Add some RacingWheel runtimeclass tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 094612d7140..a4588f7022d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5157,6 +5157,7 @@ static void test_windows_gaming_input(void) }; static const WCHAR *force_feedback_motor = RuntimeClass_Windows_Gaming_Input_ForceFeedback_ForceFeedbackMotor; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + static const WCHAR *racing_wheel_class_name = RuntimeClass_Windows_Gaming_Input_RacingWheel; DIPROPGUIDANDPATH guid_path = { @@ -5174,17 +5175,22 @@ static void test_windows_gaming_input(void) EventRegistrationToken controller_added_token; struct bool_async_handler bool_async_handler; IVectorView_ForceFeedbackMotor *motors_view; + IVectorView_RacingWheel *racing_wheels_view; + IRacingWheelStatics2 *racing_wheel_statics2; + IRacingWheelStatics *racing_wheel_statics; ForceFeedbackEffectAxes supported_axes; IAsyncOperation_boolean *bool_async; IRawGameController *raw_controller; + IGameController *game_controller; IDirectInputDevice8W *device; IForceFeedbackMotor *motor; + IRacingWheel *racing_wheel; BOOLEAN paused, enabled; IAsyncInfo *async_info; + DOUBLE gain; HSTRING str; HANDLE file; UINT32 size; - DOUBLE gain; HRESULT hr; DWORD ret; ULONG ref; @@ -5248,6 +5254,34 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "GetAt returned %#lx\n", hr ); IVectorView_RawGameController_Release( controllers_view ); + hr = pWindowsCreateString( racing_wheel_class_name, wcslen( racing_wheel_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = pRoGetActivationFactory( str, &IID_IRacingWheelStatics, (void **)&racing_wheel_statics ); + ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); + hr = pRoGetActivationFactory( str, &IID_IRacingWheelStatics2, (void **)&racing_wheel_statics2 ); + ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); + pWindowsDeleteString( str ); + + /* HID driving wheels aren't exposed as WGI gamepads on Windows */ + + hr = IRacingWheelStatics_get_RacingWheels( racing_wheel_statics, &racing_wheels_view ); + ok( hr == S_OK, "get_RacingWheels returned %#lx\n", hr ); + hr = IVectorView_RacingWheel_get_Size( racing_wheels_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_RacingWheel_Release( racing_wheels_view ); + IRacingWheelStatics_Release( racing_wheel_statics ); + + hr = IRawGameController_QueryInterface( raw_controller, &IID_IGameController, (void **)&game_controller ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IRacingWheelStatics2_FromGameController( racing_wheel_statics2, game_controller, &racing_wheel ); + ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); + todo_wine + ok( racing_wheel == NULL, "got racing_wheel %p\n", racing_wheel ); + IGameController_Release( game_controller ); + IRacingWheelStatics2_Release( racing_wheel_statics2 ); + set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IRawGameController_get_ForceFeedbackMotors( raw_controller, &motors_view ); todo_wine

1 0

Alex Henrie : kernel32: Fix percentage calculation in GetSystemPowerStatus.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 8a5d8d6cf9a1c405d8b8ef6ca19a102534b64a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5d8d6cf9a1c405d8b8ef6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Apr 22 02:12:53 2022 -0600 kernel32: Fix percentage calculation in GetSystemPowerStatus. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index ca62019b256..ae83de3c523 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -63,7 +63,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) if (bs.BatteryPresent) { - ps->BatteryLifePercent = bs.MaxCapacity ? bs.RemainingCapacity / bs.MaxCapacity : 100; + ps->BatteryLifePercent = bs.MaxCapacity ? 100 * bs.RemainingCapacity / bs.MaxCapacity : 100; ps->BatteryLifeTime = bs.EstimatedTime; if (!bs.Charging && (LONG)bs.Rate < 0) ps->BatteryFullLifeTime = 3600 * bs.MaxCapacity / -(LONG)bs.Rate;

1 0

Alexandre Julliard : winedump: Add support for dumping locale.nls.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 6f04c33c040f0aa5eb92f807103f454a983215a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f04c33c040f0aa5eb92f807… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 15:25:26 2022 +0200 winedump: Add support for dumping locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/nls.c | 542 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 535 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f04c33c040f0aa5eb92…

1 0

Alexandre Julliard : include: Avoid Windows types in CodeView structure definitions.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 53ab4c53857c01424cd20b18e6b10e66b8d03d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ab4c53857c01424cd20b18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 16:01:34 2022 +0200 include: Avoid Windows types in CodeView structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 33 ++-- include/wine/mscvpdb.h | 364 ++++++++++++++++++++--------------------- tools/winedump/debug.c | 12 +- 4 files changed, 206 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ab4c53857c01424cd2…

1 0