February 2023 - Wine-commits

Alex Henrie : winebus: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 4318b9dbd83a53bd2f83006bb1f7b89687df99b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4318b9dbd83a53bd2f83006bb1f7b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 10 09:02:29 2023 -0700 winebus: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/winebus.sys/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c02f786a11f..ae676f80565 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -645,17 +645,16 @@ static void sdl_bus_free_mappings(struct sdl_bus_options *options) static void sdl_bus_load_mappings(struct sdl_bus_options *options) { ULONG idx = 0, len, count = 0, capacity, info_size, info_max_size; + UNICODE_STRING path = RTL_CONSTANT_STRING(L"map"); KEY_VALUE_FULL_INFORMATION *info; OBJECT_ATTRIBUTES attr = {0}; char **mappings = NULL; - UNICODE_STRING path; NTSTATUS status; HANDLE key; options->mappings_count = 0; options->mappings = NULL; - RtlInitUnicodeString(&path, L"map"); InitializeObjectAttributes(&attr, &path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, driver_key, NULL); status = NtOpenKey(&key, KEY_ALL_ACCESS, &attr); if (status) return;

1 0

Mohamad Al-Jaf : include: Add windows.ui.viewmanagement.idl file.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 5fc131ef816f764bd1879cde0c889f1f69b176f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fc131ef816f764bd1879cde0c889f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 02:17:12 2023 -0500 include: Add windows.ui.viewmanagement.idl file. --- include/Makefile.in | 1 + include/windows.ui.viewmanagement.idl | 167 ++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dba9ae86135..963fe1a2858 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -826,6 +826,7 @@ SOURCES = \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.idl \ + windows.ui.viewmanagement.idl \ windowscontracts.idl \ windowsx.h \ wine/afd.h \ diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl new file mode 100644 index 00000000000..e7a90646338 --- /dev/null +++ b/include/windows.ui.viewmanagement.idl @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2023 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 + */ + +#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.devices.enumeration.idl"; +/* import "windows.phone.idl"; */ +import "windows.ui.idl"; +/* import "windows.ui.core.idl"; */ +/* import "windows.ui.popups.idl"; */ +/* import "windows.ui.windowmanagement.idl"; */ + +namespace Windows.UI.ViewManagement +{ + typedef enum HandPreference HandPreference; + typedef enum UIColorType UIColorType; + typedef enum UIElementType UIElementType; + + interface IUISettings; + interface IUISettings3; + + runtimeclass UISettings; + + declare { + interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum HandPreference + { + LeftHanded = 0, + RightHanded = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UIColorType + { + Background = 0, + Foreground = 1, + AccentDark3 = 2, + AccentDark2 = 3, + AccentDark1 = 4, + Accent = 5, + AccentLight1 = 6, + AccentLight2 = 7, + AccentLight3 = 8, + Complement = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UIElementType + { + ActiveCaption = 0, + Background = 1, + ButtonFace = 2, + ButtonText = 3, + CaptionText = 4, + GrayText = 5, + Highlight = 6, + HighlightText = 7, + Hotlight = 8, + InactiveCaption = 9, + InactiveCaptionText = 10, + Window = 11, + WindowText = 12, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + AccentColor = 1000, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextHigh = 1001, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextMedium = 1002, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextLow = 1003, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextContrastWithHigh = 1004, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextHigh = 1005, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMediumHigh = 1006, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMedium = 1007, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMediumLow = 1008, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextLow = 1009, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PageBackground = 1010, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PopupBackground = 1011, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + OverlayOutsidePopup = 1012, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.UISettings), + uuid(85361600-1c63-4627-bcb1-3a89e0bc9c55) + ] + interface IUISettings : IInspectable + { + [propget] HRESULT HandPreference([out, retval] Windows.UI.ViewManagement.HandPreference *value); + [propget] HRESULT CursorSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarArrowSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarThumbBoxSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT MessageDuration([out, retval] UINT32 *value); + [propget] HRESULT AnimationsEnabled([out, retval] boolean *value); + [propget] HRESULT CaretBrowsingEnabled([out, retval] boolean *value); + [propget] HRESULT CaretBlinkRate([out, retval] UINT32 *value); + [propget] HRESULT CaretWidth([out, retval] UINT32 *value); + [propget] HRESULT DoubleClickTime([out, retval] UINT32 *value); + [propget] HRESULT MouseHoverTime([out, retval] UINT32 *value); + HRESULT UIElementColor([in] Windows.UI.ViewManagement.UIElementType element, [out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.UISettings), + uuid(03021be4-5254-4781-8194-5168f7d06d7b) + ] + interface IUISettings3 : IInspectable + { + HRESULT GetColorValue([in] Windows.UI.ViewManagement.UIColorType color, [out, retval] Windows.UI.Color *value); + [eventadd] HRESULT ColorValuesChanged([in] Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT ColorValuesChanged([in] EventRegistrationToken cookie); + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UISettings + { + [default] interface Windows.UI.ViewManagement.IUISettings; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings3; + } +}

1 0

Mohamad Al-Jaf : windows.ui: Add stub DLL.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 9e440328e7eb01efc2fefbe1cf92f83cffd4ba88 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e440328e7eb01efc2fefbe1cf92f8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 03:05:40 2023 -0500 windows.ui: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.ui/Makefile.in | 9 +++ dlls/windows.ui/classes.idl | 23 ++++++++ dlls/windows.ui/main.c | 55 ++++++++++++++++++ dlls/windows.ui/private.h | 41 +++++++++++++ dlls/windows.ui/tests/Makefile.in | 5 ++ dlls/windows.ui/tests/uisettings.c | 90 ++++++++++++++++++++++++++++ dlls/windows.ui/uisettings.c | 116 +++++++++++++++++++++++++++++++++++++ dlls/windows.ui/windows.ui.spec | 7 +++ 10 files changed, 351 insertions(+)

1 0

Mohamad Al-Jaf : windows.ui: Add IUISettings3 stub interface.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 8664fbe8cacbb330c3cd2b7914a5d3a99cd7bb72 URL: https://gitlab.winehq.org/wine/wine/-/commit/8664fbe8cacbb330c3cd2b7914a5d3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 03:27:27 2023 -0500 windows.ui: Add IUISettings3 stub interface. --- dlls/windows.ui/tests/uisettings.c | 22 ++++++- dlls/windows.ui/uisettings.c | 119 ++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c index d9e10aee177..a54b581dfd0 100644 --- a/dlls/windows.ui/tests/uisettings.c +++ b/dlls/windows.ui/tests/uisettings.c @@ -53,6 +53,8 @@ static void test_UISettings(void) { static const WCHAR *uisettings_name = L"Windows.UI.ViewManagement.UISettings"; IActivationFactory *factory; + IUISettings3 *uisettings3; + IInspectable *inspectable; HSTRING str; HRESULT hr; LONG ref; @@ -61,7 +63,6 @@ static void test_UISettings(void) 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) { @@ -72,7 +73,26 @@ static void test_UISettings(void) check_interface( factory, &IID_IUnknown, TRUE ); check_interface( factory, &IID_IInspectable, TRUE ); check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_IUISettings3, FALSE ); + + hr = RoActivateInstance( str, &inspectable ); + ok( hr == S_OK, "Got unexpected hr %#lx.\n", hr ); + WindowsDeleteString( str ); + + hr = IInspectable_QueryInterface( inspectable, &IID_IUISettings3, (void **)&uisettings3 ); + ok( hr == S_OK || broken( hr == E_NOINTERFACE ), "Got unexpected hr %#lx.\n", hr ); + if (FAILED(hr)) + { + win_skip( "IUISettings3 not supported.\n" ); + goto skip_uisettings3; + } + + check_interface( inspectable, &IID_IAgileObject, TRUE ); + + IUISettings3_Release( uisettings3 ); +skip_uisettings3: + IInspectable_Release( inspectable ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 1ce1096d708..983a9b9f0cf 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -23,6 +23,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(ui); +struct uisettings +{ + IUISettings3 IUISettings3_iface; + LONG ref; +}; + +static inline struct uisettings *impl_from_IUISettings3( IUISettings3 *iface ) +{ + return CONTAINING_RECORD( iface, struct uisettings, IUISettings3_iface ); +} + +static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) +{ + struct uisettings *impl = impl_from_IUISettings3( 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_IUISettings3 )) + { + *out = &impl->IUISettings3_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 uisettings3_AddRef( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI uisettings3_GetIids( IUISettings3 *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 uisettings3_GetRuntimeClassName( IUISettings3 *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_GetTrustLevel( IUISettings3 *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_GetColorValue( IUISettings3 *iface, UIColorType type, Color *value ) +{ + FIXME( "iface %p, type %d, color %p stub!\n", iface, type, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_add_ColorValuesChanged( IUISettings3 *iface, ITypedEventHandler_UISettings_IInspectable *handler, EventRegistrationToken *cookie ) +{ + FIXME( "iface %p, handler %p, cookie %p stub!\n", iface, handler, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_remove_ColorValuesChanged( IUISettings3 *iface, EventRegistrationToken cookie ) +{ + FIXME( "iface %p, cookie %#I64x stub!\n", iface, cookie.value ); + return E_NOTIMPL; +} + +static const struct IUISettings3Vtbl uisettings3_vtbl = +{ + uisettings3_QueryInterface, + uisettings3_AddRef, + uisettings3_Release, + /* IInspectable methods */ + uisettings3_GetIids, + uisettings3_GetRuntimeClassName, + uisettings3_GetTrustLevel, + /* IUISettings3 methods */ + uisettings3_GetColorValue, + uisettings3_add_ColorValuesChanged, + uisettings3_remove_ColorValuesChanged, +}; + struct uisettings_statics { IActivationFactory IActivationFactory_iface; @@ -90,8 +192,21 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); - return E_NOTIMPL; + struct uisettings *impl; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) + { + *instance = NULL; + return E_OUTOFMEMORY; + } + + impl->IUISettings3_iface.lpVtbl = &uisettings3_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->IUISettings3_iface; + return S_OK; } static const struct IActivationFactoryVtbl factory_vtbl =

1 0

Mohamad Al-Jaf : windows.ui/tests: Add IUISettings3::GetColorValue() tests.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 3c403fe11fa2d99555da03430a9aba336f347eb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c403fe11fa2d99555da03430a9aba… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Feb 3 02:05:14 2023 -0500 windows.ui/tests: Add IUISettings3::GetColorValue() tests. --- dlls/windows.ui/tests/Makefile.in | 2 +- dlls/windows.ui/tests/uisettings.c | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/windows.ui/tests/Makefile.in b/dlls/windows.ui/tests/Makefile.in index 4c587f17f23..76dbfb1677c 100644 --- a/dlls/windows.ui/tests/Makefile.in +++ b/dlls/windows.ui/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.ui.dll -IMPORTS = combase +IMPORTS = combase advapi32 C_SRCS = \ uisettings.c diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c index a54b581dfd0..133173c528c 100644 --- a/dlls/windows.ui/tests/uisettings.c +++ b/dlls/windows.ui/tests/uisettings.c @@ -34,6 +34,10 @@ #include "wine/test.h" +static const WCHAR *subkey = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +static const WCHAR *name = L"AppsUseLightTheme"; +static const HKEY root = HKEY_CURRENT_USER; + #define check_interface( obj, iid, exp ) check_interface_( __LINE__, obj, iid, exp ) static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL supported ) { @@ -49,12 +53,45 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL IUnknown_Release( unk ); } +static DWORD get_app_theme(void) +{ + DWORD ret = 0, len = sizeof(ret), type; + HKEY hkey; + + if (RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE, &hkey )) return 1; + if (RegQueryValueExW( hkey, name, NULL, &type, (BYTE *)&ret, &len ) || type != REG_DWORD) ret = 1; + RegCloseKey( hkey ); + return ret; +} + +static DWORD set_app_theme( DWORD mode ) +{ + DWORD ret = 1, len = sizeof(ret); + HKEY hkey; + + if (RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE, &hkey )) return 0; + if (RegSetValueExW( hkey, name, 0, REG_DWORD, (const BYTE *)&mode, len )) ret = 0; + RegCloseKey( hkey ); + return ret; +} + +static void reset_color( Color *value ) +{ + value->A = 1; + value->R = 1; + value->G = 1; + value->B = 1; +} + static void test_UISettings(void) { static const WCHAR *uisettings_name = L"Windows.UI.ViewManagement.UISettings"; IActivationFactory *factory; IUISettings3 *uisettings3; IInspectable *inspectable; + DWORD default_theme; + UIColorType type; + Color value; HSTRING str; HRESULT hr; LONG ref; @@ -89,6 +126,44 @@ static void test_UISettings(void) check_interface( inspectable, &IID_IAgileObject, TRUE ); + default_theme = get_app_theme(); + + /* Light Theme */ + if (!set_app_theme( 1 )) goto done; + + reset_color( &value ); + type = UIColorType_Foreground; + hr = IUISettings3_GetColorValue( uisettings3, type, &value ); + todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + todo_wine ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0, + "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); + + reset_color( &value ); + type = UIColorType_Background; + hr = IUISettings3_GetColorValue( uisettings3, type, &value ); + todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + todo_wine ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255, + "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); + + /* Dark Theme */ + if (!set_app_theme( 0 )) goto done; + + reset_color( &value ); + type = UIColorType_Foreground; + hr = IUISettings3_GetColorValue( uisettings3, type, &value ); + todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + todo_wine ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255, + "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); + + reset_color( &value ); + type = UIColorType_Background; + hr = IUISettings3_GetColorValue( uisettings3, type, &value ); + todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + todo_wine ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0, + "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); + +done: + set_app_theme( default_theme ); IUISettings3_Release( uisettings3 ); skip_uisettings3:

1 0

Mohamad Al-Jaf : windows.ui: Implement IUISettings3::GetColorValue().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 7ac3b0fd856422159592b15be0d5d6dc568976a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ac3b0fd856422159592b15be0d5d6… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Jan 28 01:01:26 2023 -0500 windows.ui: Implement IUISettings3::GetColorValue(). --- dlls/windows.ui/Makefile.in | 2 +- dlls/windows.ui/tests/uisettings.c | 12 +++++----- dlls/windows.ui/uisettings.c | 46 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/windows.ui/Makefile.in b/dlls/windows.ui/Makefile.in index cb9b48a664b..592d023f353 100644 --- a/dlls/windows.ui/Makefile.in +++ b/dlls/windows.ui/Makefile.in @@ -1,5 +1,5 @@ MODULE = windows.ui.dll -IMPORTS = combase +IMPORTS = combase advapi32 C_SRCS = \ main.c \ diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c index 133173c528c..bd1e7a02d20 100644 --- a/dlls/windows.ui/tests/uisettings.c +++ b/dlls/windows.ui/tests/uisettings.c @@ -134,15 +134,15 @@ static void test_UISettings(void) reset_color( &value ); type = UIColorType_Foreground; hr = IUISettings3_GetColorValue( uisettings3, type, &value ); - todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); - todo_wine ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0, + ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0, "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); reset_color( &value ); type = UIColorType_Background; hr = IUISettings3_GetColorValue( uisettings3, type, &value ); - todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); - todo_wine ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255, + ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255, "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); /* Dark Theme */ @@ -151,14 +151,14 @@ static void test_UISettings(void) reset_color( &value ); type = UIColorType_Foreground; hr = IUISettings3_GetColorValue( uisettings3, type, &value ); - todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); todo_wine ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255, "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); reset_color( &value ); type = UIColorType_Background; hr = IUISettings3_GetColorValue( uisettings3, type, &value ); - todo_wine ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); todo_wine ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0, "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B ); diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 983a9b9f0cf..943fbb6a37e 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -92,10 +92,52 @@ static HRESULT WINAPI uisettings3_GetTrustLevel( IUISettings3 *iface, TrustLevel return E_NOTIMPL; } +static DWORD get_app_theme(void) +{ + static const WCHAR *subkey = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; + static const WCHAR *name = L"AppsUseLightTheme"; + static const HKEY root = HKEY_CURRENT_USER; + DWORD ret = 0, len = sizeof(ret), type; + HKEY hkey; + + if (RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE, &hkey )) return 1; + if (RegQueryValueExW( hkey, name, NULL, &type, (BYTE *)&ret, &len ) || type != REG_DWORD) ret = 1; + RegCloseKey( hkey ); + return ret; +} + +static void set_color_value( BYTE a, BYTE r, BYTE g, BYTE b, Color *out ) +{ + out->A = a; + out->R = r; + out->G = g; + out->B = b; +} + static HRESULT WINAPI uisettings3_GetColorValue( IUISettings3 *iface, UIColorType type, Color *value ) { - FIXME( "iface %p, type %d, color %p stub!\n", iface, type, value ); - return E_NOTIMPL; + DWORD theme; + + TRACE( "iface %p, type %d, value %p.\n", iface, type, value ); + + switch (type) + { + case UIColorType_Foreground: + case UIColorType_Background: + theme = get_app_theme(); + break; + default: + FIXME( "type %d not implemented.\n", type ); + return E_NOTIMPL; + } + + if (type == UIColorType_Foreground) + set_color_value( 255, theme ? 0 : 255, theme ? 0 : 255, theme ? 0 : 255, value ); + else + set_color_value( 255, theme ? 255 : 0, theme ? 255 : 0, theme ? 255 : 0, value ); + + TRACE( "Returning value.A = %d, value.R = %d, value.G = %d, value.B = %d\n", value->A, value->R, value->G, value->B ); + return S_OK; } static HRESULT WINAPI uisettings3_add_ColorValuesChanged( IUISettings3 *iface, ITypedEventHandler_UISettings_IInspectable *handler, EventRegistrationToken *cookie )

1 0

Alex Henrie : http: Avoid calling RtlInitUnicodeString on a constant.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 51bc735f7013b50e9b6bb55d9c2e131b657b7e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/51bc735f7013b50e9b6bb55d9c2e13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 21:23:01 2023 -0700 http: Avoid calling RtlInitUnicodeString on a constant. --- dlls/http.sys/http.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 680ef30730c..c2234aa14ad 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1199,19 +1199,18 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING device_http = RTL_CONSTANT_STRING(L"\\Device\\Http"); + UNICODE_STRING device_http_req_queue = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); WSADATA wsadata; NTSTATUS ret; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, L"\\Device\\Http"); - attr.ObjectName = &string; + attr.ObjectName = &device_http; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); - if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + if ((ret = IoCreateDevice(driver, 0, &device_http_req_queue, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj);

1 0

Mohamad Al-Jaf : include: Add DirectX 12 Agility SDK definitions.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 83625459c8227b0bd7b86c18946a35d3a806c80d URL: https://gitlab.winehq.org/wine/wine/-/commit/83625459c8227b0bd7b86c18946a35… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Jan 31 02:22:12 2023 -0500 include: Add DirectX 12 Agility SDK definitions. --- include/d3d12.idl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 082a436c9ec..816ff283ee8 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -66,6 +66,7 @@ const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SDK_VERSION = 4; const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; @@ -2589,3 +2590,55 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); + +cpp_quote("DEFINE_GUID(CLSID_D3D12Debug, 0xf2352aeb, 0xdd84, 0x49fe, 0xb9, 0x7b, 0xa9, 0xdc, 0xfd, 0xcc, 0x1b, 0x4f);") +cpp_quote("DEFINE_GUID(CLSID_D3D12Tools, 0xe38216b1, 0x3c8c, 0x4833, 0xaa, 0x09, 0x0a, 0x06, 0xb6, 0x5d, 0x96, 0xc8);") +cpp_quote("DEFINE_GUID(CLSID_D3D12DeviceRemovedExtendedData, 0x4a75bbc4, 0x9ff4, 0x4ad8, 0x9f, 0x18, 0xab, 0xae, 0x84, 0xdc, 0x5f, 0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D3D12SDKConfiguration, 0x7cda6aca, 0xa03e, 0x49c8, 0x94, 0x58, 0x03, 0x34, 0xd2, 0x0e, 0x07, 0xce);") + +typedef enum D3D12_DRED_ENABLEMENT +{ + D3D12_DRED_ENABLEMENT_SYSTEM_CONTROLLED = 0, + D3D12_DRED_ENABLEMENT_FORCED_OFF = 1, + D3D12_DRED_ENABLEMENT_FORCED_ON = 2, +} D3D12_DRED_ENABLEMENT; + +typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); + +[ + uuid(7071e1f0-e84b-4b33-974f-12fa49de65c5), + object, + local, + pointer_default(unique) +] +interface ID3D12Tools : IUnknown +{ + void EnableShaderInstrumentation(BOOL enable); + BOOL ShaderInstrumentationEnabled(); +} + +[ + uuid(82bc481c-6b9b-4030-aedb-7ee3d1df1e63), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings : IUnknown +{ + void SetAutoBreadcrumbsEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetPageFaultEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetWatsonDumpEnablement(D3D12_DRED_ENABLEMENT enablement); +}; + +[ + uuid(e9eb5314-33aa-42b2-a718-d77f58b1f1c7), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration : IUnknown +{ + HRESULT SetSDKVersion(UINT version, const char *path); +}

1 0

Mohamad Al-Jaf : d3d12core: Add stub DLL.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 9acf1bd6a85a02da201a018e1b3e586ac74ec8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9acf1bd6a85a02da201a018e1b3e58… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 26 18:43:05 2023 -0500 d3d12core: Add stub DLL. Forspoken checks for the existence of this DLL. --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/d3d12core/Makefile.in | 1 + dlls/d3d12core/d3d12core.spec | 2 ++ 5 files changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8c30f8c6d1d..50f75e04e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,7 @@ P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ +F: dlls/d3d12core/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ diff --git a/configure b/configure index 25bffe3c8eb..caa0f30a71c 100755 --- a/configure +++ b/configure @@ -1015,6 +1015,7 @@ enable_d3d10_1 enable_d3d10core enable_d3d11 enable_d3d12 +enable_d3d12core enable_d3d8 enable_d3d8thk enable_d3d9 @@ -21062,6 +21063,7 @@ wine_fn_config_makefile dlls/d3d11 enable_d3d11 wine_fn_config_makefile dlls/d3d11/tests enable_tests wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests +wine_fn_config_makefile dlls/d3d12core enable_d3d12core wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk diff --git a/configure.ac b/configure.ac index 8a6d21702cc..09cbf7533c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2432,6 +2432,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d11) WINE_CONFIG_MAKEFILE(dlls/d3d11/tests) WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d12core) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8thk) diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in new file mode 100644 index 00000000000..8778b66138b --- /dev/null +++ b/dlls/d3d12core/Makefile.in @@ -0,0 +1 @@ +MODULE = d3d12core.dll diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec new file mode 100644 index 00000000000..c9c73bd4ee4 --- /dev/null +++ b/dlls/d3d12core/d3d12core.spec @@ -0,0 +1,2 @@ +@ stub D3D12GetInterface +@ stub D3D12SDKVersion

1 0

Zebediah Figura : user32/tests: Add a register_class() helper.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 77efd7ac5a87ff20719c0d011d5b800111ecea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/77efd7ac5a87ff20719c0d011d5b80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:07:04 2023 -0600 user32/tests: Add a register_class() helper. --- dlls/user32/tests/msg.c | 80 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 39 deletions(-)

1 0