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

[PATCH 1/5] include: Add Windows.Gaming.Input.IGameControllerInputSink interface definition.
by Rémi Bernon March 1, 2022

March 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The Xusb interfaces aren't really required as I don't intend to use them in the implementation, but I'll use the IIDs to check how the providers are supposed to be implemented. include/windows.gaming.input.custom.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index fe20ce3d0cc..93e5866a324 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -34,6 +34,7 @@ namespace Windows.Gaming.Input.Custom { typedef enum XusbDeviceSubtype XusbDeviceSubtype; typedef enum XusbDeviceType XusbDeviceType; typedef struct GameControllerVersionInfo GameControllerVersionInfo; + interface IGameControllerInputSink; interface IGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; @@ -72,6 +73,16 @@ namespace Windows.Gaming.Input.Custom { UINT16 Revision; }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(1ff6f922-c640-4c78-a820-9a715c558bcb) + ] + interface IGameControllerInputSink : IInspectable + { + HRESULT OnInputResumed([in] UINT64 timestamp); + HRESULT OnInputSuspended([in] UINT64 timestamp); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(e6d73982-2996-4559-b16c-3e57d46e58d6) -- 2.34.1

1 4

[PATCH 1/5] include: Add some helpers to define IInspectable forwarded methods.
by Rémi Bernon March 1, 2022

March 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should greatly reduce the burden of implementing WinRT classes. None of the WinRT interfaces are using inheritance, and classes very often implement several interfaces, all deriving from IInspectable, and even if a v2 interface only adds a single method, it doesn't derive from the v1, and instead requires to reimplement the IInspectable methods and forward them to the default interface. In addition, it looks like they also used COM aggregation extensively, and in these cases the forward has to be done to an outer IInspectable pointer. include/inspectable.idl | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/inspectable.idl b/include/inspectable.idl index 847d21da608..8b233e3da94 100644 --- a/include/inspectable.idl +++ b/include/inspectable.idl @@ -39,3 +39,47 @@ interface IInspectable : IUnknown } typedef [unique] IInspectable *LPINSPECTABLE; + +cpp_quote("#ifdef __WINESRC__") +cpp_quote("#define DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \\") +cpp_quote(" static inline impl_type *impl_from( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return CONTAINING_RECORD( iface, impl_type, iface_mem ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_AddRef( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_Release( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_Release( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \\") +cpp_quote(" }") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER_PFX( pfx, impl_pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_pfx##_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_PFX( pfx, impl_pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_pfx##_from_##iface_type( iface )->member )") +cpp_quote("#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_from_##iface_type( iface )->member )") +cpp_quote("#endif") -- 2.34.1

1 4

[PATCH v2 2/2] winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Support _NET_WM_FULLSCREEN_MONITORS for fullscreen windows spanning multiple monitors. This property is used to hint the window managers which monitors a fullscreen window should cover. Window managers make a fullscreen window spanning multiple monitors cover only the primary monitor when this property is absent. Fix Project Cars 2/3 incorrect game window size when the triple-screen mode is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 +- dlls/winex11.drv/window.c | 38 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 81 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrandr.c | 5 +++ 6 files changed, 129 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63c18cd9948..7642a84ef1e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9295,7 +9295,8 @@ static void test_fullscreen(void) flush_events(TRUE); GetWindowRect(hwnd, &rc); - todo_wine + /* FVWM used by TestBot doesn't support _NET_WM_FULLSCREEN_MONITORS */ + todo_wine_if(!EqualRect(&rc, &virtual_rect)) ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..b6b3507e88f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -965,6 +965,42 @@ void update_user_time( Time time ) XUnlockDisplay( gdi_display ); } +/* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen + * windows spanning multiple monitors */ +static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) +{ + long monitors[4] = {0}; + XEvent xev; + + if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) + return; + + /* No need to set _NET_WM_FULLSCREEN_MONITORS when it covers only the primary monitor */ + xinerama_get_fullscreen_monitors( &data->whole_rect, monitors ); + if (monitors[0] == 0 && monitors[1] == 0 && monitors[2] == 0 && monitors[3] == 0) + return; + + if (!data->mapped) + { + XChangeProperty( data->display, data->whole_window, x11drv_atom(_NET_WM_FULLSCREEN_MONITORS), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)monitors, 4 ); + } + else + { + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_FULLSCREEN_MONITORS); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[4] = 1; + memcpy( xev.xclient.data.l, monitors, sizeof(monitors) ); + XSendEvent( data->display, root_window, False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + } +} + /*********************************************************************** * update_net_wm_states */ @@ -1045,6 +1081,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) } } data->net_wm_state = new_state; + update_net_wm_fullscreen_monitors( data ); } /*********************************************************************** @@ -1137,6 +1174,7 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + update_net_wm_fullscreen_monitors( data ); } release_win_data( data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..363435a2cf6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -490,6 +490,7 @@ enum x11drv_atoms XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, XATOM__NET_SYSTEM_TRAY_VISUAL, + XATOM__NET_WM_FULLSCREEN_MONITORS, XATOM__NET_WM_ICON, XATOM__NET_WM_MOVERESIZE, XATOM__NET_WM_NAME, @@ -704,6 +705,7 @@ extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; +extern void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; #define DEPTH_COUNT 3 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..7896afcb780 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -162,6 +162,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", "_NET_SYSTEM_TRAY_VISUAL", + "_NET_WM_FULLSCREEN_MONITORS", "_NET_WM_ICON", "_NET_WM_MOVERESIZE", "_NET_WM_NAME", diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b707574a0ab..568044e4230 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -42,6 +42,14 @@ static MONITORINFOEXW default_monitor = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 } /* szDevice */ }; +static CRITICAL_SECTION xinerama_section; +static CRITICAL_SECTION_DEBUG xinerama_critsect_debug = +{ + 0, 0, &xinerama_section, + {&xinerama_critsect_debug.ProcessLocksList, &xinerama_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": xinerama_section")} +}; +static CRITICAL_SECTION xinerama_section = {&xinerama_critsect_debug, -1, 0, 0, 0, 0}; static MONITORINFOEXW *monitors; static int nb_monitors; @@ -119,6 +127,64 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ +/* Get xinerama monitor indices required for _NET_WM_FULLSCREEN_MONITORS */ +void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) +{ + RECT window_rect, intersect_rect, monitor_rect; + POINT offset; + INT i; + + EnterCriticalSection( &xinerama_section ); + if (nb_monitors == 1) + { + memset( indices, 0, sizeof(*indices) * 4 ); + goto done; + } + + /* Convert window rectangle to root coordinates */ + offset = virtual_screen_to_root( rect->left, rect->top ); + window_rect.left = offset.x; + window_rect.top = offset.y; + window_rect.right = window_rect.left + rect->right - rect->left; + window_rect.bottom = window_rect.top + rect->bottom - rect->top; + + /* Compare to xinerama monitor rectangles in root coordinates */ + offset.x = INT_MAX; + offset.y = INT_MAX; + for (i = 0; i < nb_monitors; ++i) + { + offset.x = min( offset.x, monitors[i].rcMonitor.left ); + offset.y = min( offset.y, monitors[i].rcMonitor.top ); + } + + indices[0] = -1; + indices[1] = -1; + indices[2] = -1; + indices[3] = -1; + for (i = 0; i < nb_monitors; ++i) + { + SetRect( &monitor_rect, monitors[i].rcMonitor.left - offset.x, + monitors[i].rcMonitor.top - offset.y, monitors[i].rcMonitor.right - offset.x, + monitors[i].rcMonitor.bottom - offset.y ); + IntersectRect( &intersect_rect, &window_rect, &monitor_rect ); + if (EqualRect( &intersect_rect, &monitor_rect )) + { + if (indices[0] == -1 || monitors[i].rcMonitor.top < monitors[indices[0]].rcMonitor.top) + indices[0] = i; + if (indices[1] == -1 || monitors[i].rcMonitor.bottom > monitors[indices[1]].rcMonitor.bottom) + indices[1] = i; + if (indices[2] == -1 || monitors[i].rcMonitor.left < monitors[indices[2]].rcMonitor.left) + indices[2] = i; + if (indices[3] == -1 || monitors[i].rcMonitor.right > monitors[indices[3]].rcMonitor.right) + indices[3] = i; + } + } + +done: + LeaveCriticalSection( &xinerama_section ); + TRACE( "fullsceen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); +} + static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -154,9 +220,13 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad return FALSE; /* Being lazy, actual adapter count may be less */ + EnterCriticalSection( &xinerama_section ); adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); if (!adapters) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } primary_index = primary_monitor; if (primary_index >= nb_monitors) @@ -201,6 +271,7 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad *new_adapters = adapters; *count = index; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -220,6 +291,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne INT index = 0; INT i; + EnterCriticalSection( &xinerama_section ); + for (i = first; i < nb_monitors; i++) { if (i == first @@ -230,7 +303,10 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne monitor = heap_calloc( monitor_count, sizeof(*monitor) ); if (!monitor) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } for (i = first; i < nb_monitors; i++) { @@ -254,6 +330,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne *new_monitors = monitor; *count = monitor_count; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -272,6 +349,8 @@ void xinerama_init( unsigned int width, unsigned int height ) if (is_virtual_desktop()) return; + EnterCriticalSection( &xinerama_section ); + SetRect( &rect, 0, 0, width, height ); if (!query_screens()) { @@ -295,6 +374,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + LeaveCriticalSection( &xinerama_section ); + handler.name = "Xinerama"; handler.priority = 100; handler.get_gpus = xinerama_get_gpus; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fb7a4405a1e..71b76bda0fb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1181,6 +1181,8 @@ static void xrandr14_free_monitors( struct gdi_monitor *monitors, int count ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { + RECT rect; + xrandr14_invalidate_current_mode_cache(); if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) { @@ -1191,6 +1193,9 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) init_registry_display_settings(); } + /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */ + rect = get_host_primary_monitor_rect(); + xinerama_init( rect.right - rect.left, rect.bottom - rect.top ); return FALSE; } -- 2.32.0

2 1

[PATCH v2 1/2] user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 227889 and 227890. Fix a test failure for 2/2. dlls/user32/tests/win.c | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..63c18cd9948 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9126,12 +9126,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9278,6 +9278,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax; -- 2.32.0

2 1

[PATCH 2/2] uxtheme: Search parts of any state in IsThemePartDefined().
by Zhiyi Zhang March 1, 2022

March 1, 2022

Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7d3ee72efe8..9e5a79a1c69 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -452,6 +452,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8333d6b99ce..908451f0fe8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 59631f01fe9..dd118f5ab37 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -300,7 +300,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -311,7 +310,7 @@ static void test_IsThemePartDefined(void) {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, - {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -337,9 +336,7 @@ static void test_IsThemePartDefined(void) SetLastError(0xdeadbeef); ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); error = GetLastError(); - todo_wine_if(tests[i].todo) ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); - todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); if (theme) @@ -589,12 +586,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); } -- 2.32.0

1 0

[PATCH 1/2] uxtheme/tests: Add IsThemePartDefined() tests.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 75 +++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c70e6c27361..59631f01fe9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -277,20 +277,80 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; - BOOL bTPDefined; bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); +} - SetLastError(0xdeadbeef); - bTPDefined = IsThemePartDefined(NULL, 0 , 0); - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); +static void test_IsThemePartDefined(void) +{ + BOOL is_theme_active, ret; + HTHEME theme = NULL; + DWORD error; + HWND hwnd; + int i; + + static const struct + { + const WCHAR *class_name; + int part; + int state; + BOOL defined; + DWORD error; + BOOL todo; + } + tests[] = + { + {NULL, 0, 0, FALSE, E_HANDLE}, + {NULL, 0xdeadbeef, 0, FALSE, E_HANDLE}, + {L"Button", 0xdeadbeef, 0, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, 0, TRUE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, + }; + + is_theme_active = IsThemeActive(); + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#x.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!is_theme_active && tests[i].class_name) + continue; + + winetest_push_context("class %s part %d state %d", wine_dbgstr_w(tests[i].class_name), + tests[i].part, tests[i].state); + + if (tests[i].class_name) + { + theme = OpenThemeData(hwnd, tests[i].class_name); + ok(theme != NULL, "OpenThemeData failed, error %#x.\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); + error = GetLastError(); + todo_wine_if(tests[i].todo) + ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); + todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) + ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); + + if (theme) + { + CloseThemeData(theme); + theme = NULL; + } + winetest_pop_context(); + } + + DestroyWindow(hwnd); } static void test_GetWindowTheme(void) @@ -2205,6 +2265,7 @@ START_TEST(system) */ test_IsThemed(); + test_IsThemePartDefined(); test_GetWindowTheme(); test_SetWindowTheme(); test_OpenThemeData(); -- 2.32.0

1 0

[PATCH] light.msstyles: Remove Classic Blue variant.
by Zhiyi Zhang March 1, 2022

March 1, 2022

The Classic Blue theme has only system colors and doesn't contain bitmaps. Such classic themes should be stored in a .theme file instead of a .msstyles file. While it looks mostly alright when using the theme, some applications fail to draw elements because they consider theming active as IsThemeActive() returns TRUE but OpenThemeData() fails. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 52 --------------------------------- dlls/light.msstyles/resources.h | 2 -- 2 files changed, 54 deletions(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 4596f0f0458..fc6d196ad0c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -26,14 +26,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_COLOR_DISPLAY_NAME_BLUE "Blue" - IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" } /* Theme color tooltips */ STRINGTABLE { IDS_COLOR_TOOLTIP_BLUE "Blue" - IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" } /* Theme size display names */ @@ -57,7 +55,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 COLORNAMES { "Blue\0" -"Classic Blue\0" "\0" } @@ -72,7 +69,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 FILERESNAMES { "BLUE_INI\0" -"CLASSIC_BLUE_INI\0" "\0" } @@ -85,54 +81,6 @@ THEMES_INI TEXTFILE } /* Light theme definition */ -/* Classic blue theme, no bitmaps */ -CLASSIC_BLUE_INI TEXTFILE -{ -"[Globals]\r\n" -"EdgeLightColor = 255 255 255\r\n" -"EdgeHighLightColor = 255 255 255\r\n" -"EdgeShadowColor = 189 189 189\r\n" -"EdgeDkShadowColor = 158 158 158\r\n" -"EdgeFillColor = 255 255 255\r\n" - -"\r\n[SysMetrics]\r\n" -"; System colors\r\n" -"Scrollbar = 255 255 255\r\n" -"Background = 37 111 149\r\n" -"ActiveCaption = 50 150 250\r\n" -"InactiveCaption = 245 245 245\r\n" -"Menu = 255 255 255\r\n" -"Window = 255 255 255\r\n" -"WindowFrame = 158 158 158\r\n" -"MenuText = 0 0 0\r\n" -"WindowText = 0 0 0\r\n" -"CaptionText = 0 0 0\r\n" -"ActiveBorder = 255 255 255\r\n" -"InactiveBorder = 255 255 255\r\n" -"AppWorkSpace = 128 128 128\r\n" -"Highlight = 48 150 250\r\n" -"HighlightText = 255 255 255\r\n" -"BtnFace = 245 245 245\r\n" -"BtnShadow = 166 166 166\r\n" -"GrayText = 166 166 166\r\n" -"BtnText = 0 0 0\r\n" -"InactiveCaptionText = 100 100 100\r\n" -"BtnHighlight = 255 255 255\r\n" -"DkShadow3d = 106 106 106\r\n" -"Light3d = 227 227 227\r\n" -"InfoText = 0 0 0\r\n" -"InfoBk = 255 255 255\r\n" -"ButtonAlternateFace = 255 255 255\r\n" -"HotTracking = 224 224 224\r\n" -"GradientActiveCaption = 50 150 250\r\n" -"GradientInactiveCaption = 245 245 245\r\n" -"MenuHilight = 48 150 250\r\n" -"MenuBar = 255 255 255\r\n" - -"\r\n; Flat menus\r\n" -"FlatMenus = true\r\n" -} - /* Blue theme */ BLUE_INI TEXTFILE { diff --git a/dlls/light.msstyles/resources.h b/dlls/light.msstyles/resources.h index c37ef2140f1..8172ce61fa9 100644 --- a/dlls/light.msstyles/resources.h +++ b/dlls/light.msstyles/resources.h @@ -19,8 +19,6 @@ #include <winnt.h> #define IDS_COLOR_DISPLAY_NAME_BLUE 1000 -#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1001 #define IDS_COLOR_TOOLTIP_BLUE 2000 -#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2001 #define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 #define IDS_SIZE_TOOLTIP_NORMAL 4000 -- 2.32.0

1 0

[PATCH] comctl32/tests: Fix a test failure when theming is active.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0443a36718b..cfcdb44019c 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,7 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) + todo_wine_if(type == BS_PUSHBOX) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#lx: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2); -- 2.32.0

1 0

[PATCH v3] combase: Add RoSetErrorReportingFlags stub
by Alistair Leslie-Hughes Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ include/roerrorapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2fafacdea3..b3f4d25b42c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..d764137e512 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -316,3 +316,13 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac return REGDB_E_CLASSNOTREG; } + +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("%x\n", flags); + return S_OK; +} + diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..de23537fd9b 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -26,5 +26,6 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); #endif /* _ROERROR_H */ -- 2.34.1

2 2

ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Saulius Krasuckas Feb. 28, 2022

Feb. 28, 2022

Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem")); -- 2.34.1

2 3