[PATCH 0/4] MR7146: windows.ui.xaml: Implement IColorHelperStatics::FromArgb().
Needed by iCUE. For after the code freeze. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- configure.ac | 2 + dlls/windows.ui.xaml/Makefile.in | 7 ++ dlls/windows.ui.xaml/classes.idl | 23 +++++ dlls/windows.ui.xaml/color_helper.c | 115 ++++++++++++++++++++++ dlls/windows.ui.xaml/main.c | 38 +++++++ dlls/windows.ui.xaml/private.h | 42 ++++++++ dlls/windows.ui.xaml/tests/Makefile.in | 5 + dlls/windows.ui.xaml/tests/xaml.c | 84 ++++++++++++++++ dlls/windows.ui.xaml/windows.ui.xaml.spec | 15 +++ 9 files changed, 331 insertions(+) create mode 100644 dlls/windows.ui.xaml/Makefile.in create mode 100644 dlls/windows.ui.xaml/classes.idl create mode 100644 dlls/windows.ui.xaml/color_helper.c create mode 100644 dlls/windows.ui.xaml/main.c create mode 100644 dlls/windows.ui.xaml/private.h create mode 100644 dlls/windows.ui.xaml/tests/Makefile.in create mode 100644 dlls/windows.ui.xaml/tests/xaml.c create mode 100644 dlls/windows.ui.xaml/windows.ui.xaml.spec diff --git a/configure.ac b/configure.ac index b999e3506e0..5f9e63b6f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -3248,6 +3248,8 @@ WINE_CONFIG_MAKEFILE(dlls/windows.storage.applicationdata) WINE_CONFIG_MAKEFILE(dlls/windows.storage.applicationdata/tests) WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers) WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.ui.xaml) +WINE_CONFIG_MAKEFILE(dlls/windows.ui.xaml/tests) WINE_CONFIG_MAKEFILE(dlls/windows.ui) WINE_CONFIG_MAKEFILE(dlls/windows.ui/tests) WINE_CONFIG_MAKEFILE(dlls/windows.web) diff --git a/dlls/windows.ui.xaml/Makefile.in b/dlls/windows.ui.xaml/Makefile.in new file mode 100644 index 00000000000..2c8e5b7e70f --- /dev/null +++ b/dlls/windows.ui.xaml/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.ui.xaml.dll +IMPORTS = combase + +SOURCES = \ + classes.idl \ + color_helper.c \ + main.c diff --git a/dlls/windows.ui.xaml/classes.idl b/dlls/windows.ui.xaml/classes.idl new file mode 100644 index 00000000000..1783048c492 --- /dev/null +++ b/dlls/windows.ui.xaml/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.ui.xaml.dll + * + * Copyright (C) 2025 Mohamad Al-Jaf + * + * 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 + */ + +#pragma makedep register + +#include "windows.ui.idl" diff --git a/dlls/windows.ui.xaml/color_helper.c b/dlls/windows.ui.xaml/color_helper.c new file mode 100644 index 00000000000..44e61a829e3 --- /dev/null +++ b/dlls/windows.ui.xaml/color_helper.c @@ -0,0 +1,115 @@ +/* WinRT Windows.UI.ColorHelper Implementation + * + * Copyright (C) 2025 Mohamad Al-Jaf + * + * 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" + +WINE_DEFAULT_DEBUG_CHANNEL(xaml); + +struct color_helper_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct color_helper_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct color_helper_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct color_helper_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 )) + { + *out = &impl->IActivationFactory_iface; + IInspectable_AddRef( *out ); + 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 color_helper_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 color_helper_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 color_helper_statics color_helper_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *color_helper_factory = &color_helper_statics.IActivationFactory_iface; diff --git a/dlls/windows.ui.xaml/main.c b/dlls/windows.ui.xaml/main.c new file mode 100644 index 00000000000..fae440d18c2 --- /dev/null +++ b/dlls/windows.ui.xaml/main.c @@ -0,0 +1,38 @@ +/* WinRT Windows.UI.Xaml Implementation + * + * Copyright (C) 2025 Mohamad Al-Jaf + * + * 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 "initguid.h" +#include "private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaml); + +HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **factory ) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer( classid, NULL ); + + TRACE( "class %s, factory %p.\n", debugstr_hstring(classid), factory ); + + *factory = NULL; + + if (!wcscmp( buffer, RuntimeClass_Windows_UI_ColorHelper )) + IActivationFactory_QueryInterface( color_helper_factory, &IID_IActivationFactory, (void **)factory ); + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.ui.xaml/private.h b/dlls/windows.ui.xaml/private.h new file mode 100644 index 00000000000..9a60dd7b6f5 --- /dev/null +++ b/dlls/windows.ui.xaml/private.h @@ -0,0 +1,42 @@ +/* WinRT Windows.UI.Xaml Implementation + * + * Copyright (C) 2025 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef __WINE_WINDOWS_UI_XAML_PRIVATE_H +#define __WINE_WINDOWS_UI_XAML_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "activation.h" + +#include "wine/debug.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_UI +#include "windows.ui.h" + +extern IActivationFactory *color_helper_factory; + +#endif diff --git a/dlls/windows.ui.xaml/tests/Makefile.in b/dlls/windows.ui.xaml/tests/Makefile.in new file mode 100644 index 00000000000..4af70f1e093 --- /dev/null +++ b/dlls/windows.ui.xaml/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.ui.xaml.dll +IMPORTS = combase + +SOURCES = \ + xaml.c diff --git a/dlls/windows.ui.xaml/tests/xaml.c b/dlls/windows.ui.xaml/tests/xaml.c new file mode 100644 index 00000000000..02895e7ed38 --- /dev/null +++ b/dlls/windows.ui.xaml/tests/xaml.c @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2025 Mohamad Al-Jaf + * + * 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 + */ +#define COBJMACROS +#include "initguid.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_UI +#include "windows.ui.h" + +#include "wine/test.h" + +#define check_interface( obj, iid, is_broken ) check_interface_( __LINE__, obj, iid, is_broken ) +static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL is_broken ) +{ + IUnknown *iface = obj; + IUnknown *unk; + HRESULT hr; + + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_(__FILE__, line)( hr == S_OK || broken( is_broken && hr == E_NOINTERFACE ), "got hr %#lx.\n", hr ); + if (SUCCEEDED(hr)) + IUnknown_Release( unk ); +} + +static void test_ColorHelper(void) +{ + static const WCHAR *color_helper_statics_name = L"Windows.UI.ColorHelper"; + IActivationFactory *factory = (void *)0xdeadbeef; + HSTRING str; + HRESULT hr; + + hr = WindowsCreateString( color_helper_statics_name, wcslen( color_helper_statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( color_helper_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, TRUE /* Missing on Windows older than 1809v2 */ ); + + IActivationFactory_Release( factory ); +} + +START_TEST(xaml) +{ + HRESULT hr; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + + test_ColorHelper(); + + RoUninitialize(); +} diff --git a/dlls/windows.ui.xaml/windows.ui.xaml.spec b/dlls/windows.ui.xaml/windows.ui.xaml.spec new file mode 100644 index 00000000000..64b8ae5b7f9 --- /dev/null +++ b/dlls/windows.ui.xaml/windows.ui.xaml.spec @@ -0,0 +1,15 @@ +@ stub CreateString +@ stub CreateXamlUIPresenter +@ stub DeleteString +@ stub DisableDeferredInvoke +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllMain(long long ptr) +@ stub GetDependencyObjectAddress +@ stub GetErrorContextIndex +@ stub GetGlobalModuleParams +@ stub GetStringLen +@ stub GetStringRawBuffer +@ stub InitializeXamlDiagnosticsEx +@ stub OverrideXamlMetadataProvider +@ stub OverrideXamlResourcePropertyBag -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/windows.ui.xaml/color_helper.c | 30 +++++++++++++++++++++++ dlls/windows.ui.xaml/private.h | 38 +++++++++++++++++++++++++++++ dlls/windows.ui.xaml/tests/xaml.c | 5 ++++ 3 files changed, 73 insertions(+) diff --git a/dlls/windows.ui.xaml/color_helper.c b/dlls/windows.ui.xaml/color_helper.c index 44e61a829e3..8df93641e0f 100644 --- a/dlls/windows.ui.xaml/color_helper.c +++ b/dlls/windows.ui.xaml/color_helper.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaml); struct color_helper_statics { IActivationFactory IActivationFactory_iface; + IColorHelperStatics IColorHelperStatics_iface; LONG ref; }; @@ -48,6 +49,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IColorHelperStatics )) + { + *out = &impl->IColorHelperStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -106,9 +114,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( color_helper_statics, IColorHelperStatics, struct color_helper_statics, IActivationFactory_iface ) + +static HRESULT WINAPI color_helper_statics_FromArgb( IColorHelperStatics *iface, BYTE a, BYTE r, BYTE g, BYTE b, Color *value ) +{ + FIXME( "iface %p, a %u, r %u, g %u, b %u, value %p stub!\n", iface, a, r, g, b, value ); + return E_NOTIMPL; +} + +static const struct IColorHelperStaticsVtbl color_helper_statics_vtbl = +{ + color_helper_statics_QueryInterface, + color_helper_statics_AddRef, + color_helper_statics_Release, + /* IInspectable methods */ + color_helper_statics_GetIids, + color_helper_statics_GetRuntimeClassName, + color_helper_statics_GetTrustLevel, + /* IColorHelperStatics methods */ + color_helper_statics_FromArgb, +}; + static struct color_helper_statics color_helper_statics = { {&factory_vtbl}, + {&color_helper_statics_vtbl}, 1, }; diff --git a/dlls/windows.ui.xaml/private.h b/dlls/windows.ui.xaml/private.h index 9a60dd7b6f5..e634d159c79 100644 --- a/dlls/windows.ui.xaml/private.h +++ b/dlls/windows.ui.xaml/private.h @@ -39,4 +39,42 @@ extern IActivationFactory *color_helper_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.ui.xaml/tests/xaml.c b/dlls/windows.ui.xaml/tests/xaml.c index 02895e7ed38..c1b5fdfbedd 100644 --- a/dlls/windows.ui.xaml/tests/xaml.c +++ b/dlls/windows.ui.xaml/tests/xaml.c @@ -49,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL static void test_ColorHelper(void) { static const WCHAR *color_helper_statics_name = L"Windows.UI.ColorHelper"; + IColorHelperStatics *color_helper_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; HSTRING str; HRESULT hr; @@ -68,6 +69,10 @@ static void test_ColorHelper(void) check_interface( factory, &IID_IInspectable, FALSE ); check_interface( factory, &IID_IAgileObject, TRUE /* Missing on Windows older than 1809v2 */ ); + hr = IActivationFactory_QueryInterface( factory, &IID_IColorHelperStatics, (void **)&color_helper_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + IColorHelperStatics_Release( color_helper_statics ); IActivationFactory_Release( factory ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/windows.ui.xaml/tests/xaml.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/windows.ui.xaml/tests/xaml.c b/dlls/windows.ui.xaml/tests/xaml.c index c1b5fdfbedd..eb0b845abf3 100644 --- a/dlls/windows.ui.xaml/tests/xaml.c +++ b/dlls/windows.ui.xaml/tests/xaml.c @@ -51,6 +51,7 @@ static void test_ColorHelper(void) static const WCHAR *color_helper_statics_name = L"Windows.UI.ColorHelper"; IColorHelperStatics *color_helper_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; + Color color; HSTRING str; HRESULT hr; @@ -72,6 +73,17 @@ static void test_ColorHelper(void) hr = IActivationFactory_QueryInterface( factory, &IID_IColorHelperStatics, (void **)&color_helper_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + memset( &color, 0, sizeof( color ) ); + hr = IColorHelperStatics_FromArgb( color_helper_statics, 255, 255, 255, 255, NULL ); + todo_wine + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IColorHelperStatics_FromArgb( color_helper_statics, 255, 255, 255, 255, &color ); + todo_wine + ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine + ok( color.A == 255 && color.R == 255 && color.G == 255 && color.B == 255, + "got color.A = %u, color.R = %u, color.G = %u, color.B = %u,\n", color.A, color.R, color.G, color.B ); + IColorHelperStatics_Release( color_helper_statics ); IActivationFactory_Release( factory ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Needed by iCUE. --- dlls/windows.ui.xaml/color_helper.c | 15 +++++++++++++-- dlls/windows.ui.xaml/tests/xaml.c | 3 --- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/windows.ui.xaml/color_helper.c b/dlls/windows.ui.xaml/color_helper.c index 8df93641e0f..09f0ae0196d 100644 --- a/dlls/windows.ui.xaml/color_helper.c +++ b/dlls/windows.ui.xaml/color_helper.c @@ -118,8 +118,19 @@ DEFINE_IINSPECTABLE( color_helper_statics, IColorHelperStatics, struct color_hel static HRESULT WINAPI color_helper_statics_FromArgb( IColorHelperStatics *iface, BYTE a, BYTE r, BYTE g, BYTE b, Color *value ) { - FIXME( "iface %p, a %u, r %u, g %u, b %u, value %p stub!\n", iface, a, r, g, b, value ); - return E_NOTIMPL; + Color color; + + TRACE( "iface %p, a %u, r %u, g %u, b %u, value %p\n", iface, a, r, g, b, value ); + + if (!value) return E_POINTER; + + color.A = a; + color.R = r; + color.G = g; + color.B = b; + + *value = color; + return S_OK; } static const struct IColorHelperStaticsVtbl color_helper_statics_vtbl = diff --git a/dlls/windows.ui.xaml/tests/xaml.c b/dlls/windows.ui.xaml/tests/xaml.c index eb0b845abf3..4d181b9bc66 100644 --- a/dlls/windows.ui.xaml/tests/xaml.c +++ b/dlls/windows.ui.xaml/tests/xaml.c @@ -75,12 +75,9 @@ static void test_ColorHelper(void) memset( &color, 0, sizeof( color ) ); hr = IColorHelperStatics_FromArgb( color_helper_statics, 255, 255, 255, 255, NULL ); - todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); hr = IColorHelperStatics_FromArgb( color_helper_statics, 255, 255, 255, 255, &color ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( color.A == 255 && color.R == 255 && color.G == 255 && color.B == 255, "got color.A = %u, color.R = %u, color.G = %u, color.B = %u,\n", color.A, color.R, color.G, color.B ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
Does iCUE even work on Wine though? I think it does direct USB device access for mice/keyboards (and other peripherals) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7146#note_91980
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7146
participants (4)
-
Aida Jonikienė -
Mohamad Al-Jaf
-
Mohamad Al-Jaf (＠maljaf)
-
Rémi Bernon