April 2023 - Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore/tests: Add tests for default ProviderType_BaseHwnd clientside provider.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 3a456d51f2a55624d295975488b9b003542c286d URL: https://gitlab.winehq.org/wine/wine/-/commit/3a456d51f2a55624d295975488b9b0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 22 15:57:38 2023 -0400 uiautomationcore/tests: Add tests for default ProviderType_BaseHwnd clientside provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 133 +++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6d2e859a7f6..f3e671526ec 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -20,6 +20,7 @@ #define COBJMACROS +#include <assert.h> #include "windows.h" #include "initguid.h" #include "uiautomation.h" @@ -1291,10 +1292,14 @@ static void flush_method_sequence(void) sequence_cnt = sequence_size = 0; } +static BOOL method_sequences_enabled = TRUE; static void add_method_call(struct Provider *prov, int method) { struct prov_method_sequence prov_method = {0}; + if (!method_sequences_enabled) + return; + if (!sequence) { sequence_size = 10; @@ -1321,6 +1326,7 @@ static void ok_method_sequence_(const struct prov_method_sequence *expected_list const struct prov_method_sequence *actual; unsigned int count = 0; + assert(method_sequences_enabled); add_method_call(NULL, 0); actual = sequence; @@ -12297,6 +12303,132 @@ static void test_CUIAutomation(void) CoUninitialize(); } +static const struct prov_method_sequence default_hwnd_prov_props_seq[] = { + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider_nc, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider_nc, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_NamePropertyId */ + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider_nc, PROV_GET_PROPERTY_VALUE }, /* UIA_NamePropertyId */ + { &Provider_nc, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ClassNamePropertyId */ + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider_nc, PROV_GET_PROPERTY_VALUE }, /* UIA_ClassNamePropertyId */ + { &Provider_nc, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Windows 7. */ + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ProcessIdPropertyId */ + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider_nc, PROV_GET_PROPERTY_VALUE }, /* UIA_ProcessIdPropertyId */ + { &Provider_nc, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { 0 } +}; + +#define test_node_hwnd_provider( node, hwnd ) \ + test_node_hwnd_provider_( (node), (hwnd), __FILE__, __LINE__) +static void test_node_hwnd_provider_(HUIANODE node, HWND hwnd, const char *file, int line) +{ + WCHAR buf[1024] = { 0 }; + HRESULT hr; + VARIANT v; + DWORD pid; + + winetest_push_context("UIA_NativeWindowHandlePropertyId"); + hr = UiaGetPropertyValue(node, UIA_NativeWindowHandlePropertyId, &v); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); + todo_wine ok_(file, line)(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + if (V_VT(&v) == VT_I4) + ok_(file, line)(V_I4(&v) == HandleToUlong(hwnd), "V_I4(&v) = %#lx, expected %#lx\n", V_I4(&v), HandleToUlong(hwnd)); + VariantClear(&v); + winetest_pop_context(); + + winetest_push_context("UIA_NamePropertyId"); + SendMessageW(hwnd, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); + hr = UiaGetPropertyValue(node, UIA_NamePropertyId, &v); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); + todo_wine ok_(file, line)(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); + if (V_VT(&v) == VT_BSTR) + ok(!lstrcmpW(V_BSTR(&v), buf), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + winetest_pop_context(); + + winetest_push_context("UIA_ClassNamePropertyId"); + memset(buf, 0, sizeof(buf)); + GetClassNameW(hwnd, buf, ARRAY_SIZE(buf)); + hr = UiaGetPropertyValue(node, UIA_ClassNamePropertyId, &v); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); + todo_wine ok_(file, line)(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); + if (V_VT(&v) == VT_BSTR) + ok(!lstrcmpW(V_BSTR(&v), buf), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + winetest_pop_context(); + + GetWindowThreadProcessId(hwnd, &pid); + winetest_push_context("UIA_ProcessIdPropertyId"); + hr = UiaGetPropertyValue(node, UIA_ProcessIdPropertyId, &v); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); + todo_wine ok_(file, line)(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + if (V_VT(&v) == VT_I4) + ok_(file, line)(V_I4(&v) == pid, "V_I4(&v) = %#lx, expected %#lx\n", V_I4(&v), pid); + VariantClear(&v); + winetest_pop_context(); +} + +static void test_default_clientside_providers(void) +{ + HUIANODE node; + HRESULT hr; + HWND hwnd; + VARIANT v; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hwnd = create_test_hwnd("test_default_clientside_providers class"); + method_sequences_enabled = FALSE; + + /* + * Test default BaseHwnd provider. Unlike the other default providers, the + * default BaseHwnd IRawElementProviderSimple is not available to test + * directly. To isolate the BaseHwnd provider, we set the node's nonclient + * provider to Provider_nc, and its Main provider to Provider. These + * providers will return nothing so that we can isolate properties coming + * from the BaseHwnd provider. + */ + initialize_provider(&Provider_nc, ProviderOptions_ClientSideProvider | ProviderOptions_NonClientAreaProvider, hwnd, TRUE); + initialize_provider(&Provider, ProviderOptions_ClientSideProvider, hwnd, TRUE); + Provider_nc.ignore_hwnd_prop = Provider.ignore_hwnd_prop = TRUE; + prov_root = &Provider.IRawElementProviderSimple_iface; + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent on Win7. */ + SET_EXPECT(winproc_GETOBJECT_CLIENT); + hr = UiaNodeFromProvider(&Provider_nc.IRawElementProviderSimple_iface, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider_nc.ref == 2, "Unexpected refcnt %ld\n", Provider_nc.ref); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; + + hr = UiaGetPropertyValue(node, UIA_ProviderDescriptionPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + check_node_provider_desc_prefix(V_BSTR(&v), GetCurrentProcessId(), hwnd); + check_node_provider_desc(V_BSTR(&v), L"Nonclient", L"Provider_nc", FALSE); + check_node_provider_desc_todo(V_BSTR(&v), L"Main", L"Provider", FALSE); + check_node_provider_desc_todo(V_BSTR(&v), L"Hwnd", NULL, TRUE); + VariantClear(&v); + + method_sequences_enabled = TRUE; + Provider.ret_invalid_prop_type = Provider_nc.ret_invalid_prop_type = TRUE; + test_node_hwnd_provider(node, hwnd); + ok_method_sequence(default_hwnd_prov_props_seq, "default_hwnd_prov_props_seq"); + + UiaNodeRelease(node); + ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider_nc.ref == 1, "Unexpected refcnt %ld\n", Provider_nc.ref); + + DestroyWindow(hwnd); + UnregisterClassA("test_default_clientside_providers class", NULL); + + CoUninitialize(); +} + /* * Once a process returns a UI Automation provider with * UiaReturnRawElementProvider it ends up in an implicit MTA until exit. This @@ -12364,6 +12496,7 @@ START_TEST(uiautomation) test_UiaNavigate(); test_UiaFind(); test_CUIAutomation(); + test_default_clientside_providers(); if (uia_dll) { pUiaProviderFromIAccessible = (void *)GetProcAddress(uia_dll, "UiaProviderFromIAccessible");

1 0

Connor McAdams : uiautomationcore: Add a default ProviderType_BaseHwnd clientside provider.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 8070e44f76f59a6c5ae38a74201e15cdfe5a29d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8070e44f76f59a6c5ae38a74201e15… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 22 16:29:01 2023 -0400 uiautomationcore: Add a default ProviderType_BaseHwnd clientside provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 97 +++++++++----------- dlls/uiautomationcore/uia_client.c | 21 ++++- dlls/uiautomationcore/uia_private.h | 1 + dlls/uiautomationcore/uia_provider.c | 141 +++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+), 55 deletions(-)

1 0

Alexandros Frantzis : wineandroid.drv: Set the current mode using gdi_device_manager.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: aa5915ff437707217a2e547ae5fc1fc8ba4b944c URL: https://gitlab.winehq.org/wine/wine/-/commit/aa5915ff437707217a2e547ae5fc1f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 17:29:27 2023 +0300 wineandroid.drv: Set the current mode using gdi_device_manager. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/wineandroid.drv/init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 0ba8a0b3ebb..f2423d96407 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -289,13 +289,14 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }; const DEVMODEW mode = { - .dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION, .dmBitsPerPel = screen_bpp, .dmPelsWidth = screen_width, .dmPelsHeight = screen_height, .dmDisplayFrequency = 60, }; device_manager->add_gpu( &gpu, param ); device_manager->add_adapter( &adapter, param ); device_manager->add_monitor( &gdi_monitor, param ); - device_manager->add_mode( &mode, FALSE, param ); + device_manager->add_mode( &mode, TRUE, param ); force_display_devices_refresh = FALSE; }

1 0

Connor McAdams : uiautomationcore: Implement UIA_ProcessIdPropertyId for default HWND provider.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 646d44078cc0b0035ae8f589a490dac80dffa1e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/646d44078cc0b0035ae8f589a490da… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 23 10:55:28 2023 -0500 uiautomationcore: Implement UIA_ProcessIdPropertyId for default HWND provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 5 ++--- dlls/uiautomationcore/uia_provider.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index da9bb6aa5c9..009864d10c7 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -12357,9 +12357,8 @@ static void test_node_hwnd_provider_(HUIANODE node, HWND hwnd, const char *file, winetest_push_context("UIA_ProcessIdPropertyId"); hr = UiaGetPropertyValue(node, UIA_ProcessIdPropertyId, &v); ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); - todo_wine ok_(file, line)(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); - if (V_VT(&v) == VT_I4) - ok_(file, line)(V_I4(&v) == pid, "V_I4(&v) = %#lx, expected %#lx\n", V_I4(&v), pid); + ok_(file, line)(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + ok_(file, line)(V_I4(&v) == pid, "V_I4(&v) = %#lx, expected %#lx\n", V_I4(&v), pid); VariantClear(&v); winetest_pop_context(); } diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 4d081b2c921..afc44fe45ac 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1292,6 +1292,18 @@ static HRESULT WINAPI base_hwnd_provider_GetPropertyValue(IRawElementProviderSim V_I4(ret_val) = HandleToUlong(base_hwnd_prov->hwnd); break; + case UIA_ProcessIdPropertyId: + { + DWORD pid; + + if (!GetWindowThreadProcessId(base_hwnd_prov->hwnd, &pid)) + return UIA_E_ELEMENTNOTAVAILABLE; + + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = pid; + break; + } + default: break; }

1 0

Stefan Dösinger : wined3d: Rotate vk bind masks in wined3d_swapchain_vk_rotate.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: f197125cc0dd5bfd98e19afd025c137925114d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f197125cc0dd5bfd98e19afd025c13… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 18 12:06:44 2023 +0300 wined3d: Rotate vk bind masks in wined3d_swapchain_vk_rotate. --- dlls/wined3d/swapchain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 337c0410d39..bd4472d746a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1163,6 +1163,7 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str struct wined3d_image_vk image0; VkDescriptorImageInfo vk_info0; VkImageLayout vk_layout0; + uint32_t bind_mask0; DWORD locations0; unsigned int i; @@ -1176,6 +1177,7 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str /* Back buffer 0 is already in the draw binding. */ image0 = texture_prev->image; vk_layout0 = texture_prev->layout; + bind_mask0 = texture_prev->bind_mask; vk_info0 = texture_prev->default_image_info; locations0 = texture_prev->t.sub_resources[0].locations; @@ -1189,6 +1191,7 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str texture_prev->image = texture->image; texture_prev->layout = texture->layout; + texture_prev->bind_mask = texture->bind_mask; texture_prev->default_image_info = texture->default_image_info; wined3d_texture_validate_location(&texture_prev->t, 0, sub_resource->locations & supported_locations); @@ -1199,6 +1202,7 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str texture_prev->image = image0; texture_prev->layout = vk_layout0; + texture_prev->bind_mask = bind_mask0; texture_prev->default_image_info = vk_info0; wined3d_texture_validate_location(&texture_prev->t, 0, locations0 & supported_locations);

1 0

Connor McAdams : uiautomationcore: Implement UIA_ClassNamePropertyId for default HWND provider.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 9bf99d3713500ca05e209863e3914c5d50a9dd94 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bf99d3713500ca05e209863e3914c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 23 11:16:17 2023 -0500 uiautomationcore: Implement UIA_ClassNamePropertyId for default HWND provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 5 ++--- dlls/uiautomationcore/uia_provider.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 009864d10c7..beb34fb400f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -12347,9 +12347,8 @@ static void test_node_hwnd_provider_(HUIANODE node, HWND hwnd, const char *file, GetClassNameW(hwnd, buf, ARRAY_SIZE(buf)); hr = UiaGetPropertyValue(node, UIA_ClassNamePropertyId, &v); ok_(file, line)(hr == S_OK, "Unexpected hr %#lx\n", hr); - todo_wine ok_(file, line)(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); - if (V_VT(&v) == VT_BSTR) - ok(!lstrcmpW(V_BSTR(&v), buf), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok_(file, line)(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), buf), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); winetest_pop_context(); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index afc44fe45ac..9c9ad2a426e 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1202,6 +1202,16 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD return S_OK; } +static HRESULT uia_get_hr_for_last_error(void) +{ + DWORD last_err = GetLastError(); + + if (last_err == ERROR_INVALID_WINDOW_HANDLE) + return UIA_E_ELEMENTNOTAVAILABLE; + + return E_FAIL; +} + /* * Default ProviderType_BaseHwnd IRawElementProviderSimple interface. */ @@ -1304,6 +1314,20 @@ static HRESULT WINAPI base_hwnd_provider_GetPropertyValue(IRawElementProviderSim break; } + case UIA_ClassNamePropertyId: + { + WCHAR buf[256] = { 0 }; + + if (!GetClassNameW(base_hwnd_prov->hwnd, buf, ARRAY_SIZE(buf))) + hr = uia_get_hr_for_last_error(); + else + { + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(buf); + } + break; + } + default: break; }

1 0

Alexandros Frantzis : winemac.drv: Set the current mode using gdi_device_manager.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: faa0fc828e9fbbef09ff275114adcd5122456753 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa0fc828e9fbbef09ff275114adcd… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 15:39:32 2023 +0300 winemac.drv: Set the current mode using gdi_device_manager. Since setting the current mode also sets the registry settings (if not already set), we also remove the code that manually changes the registry settings. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com --- dlls/winemac.drv/display.c | 111 ++++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b93ebaaa5e7..14c09649211 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1076,45 +1076,6 @@ done: return (err == kCGErrorSuccess); } -/*********************************************************************** - * init_registry_display_settings - * - * Initialize registry display settings when new display devices are added. - */ -static void init_registry_display_settings(void) -{ - DEVMODEW dm = {.dmSize = sizeof(dm)}; - DISPLAY_DEVICEW dd = {sizeof(dd)}; - UNICODE_STRING str; - DWORD i = 0; - int ret; - - while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0)) - { - RtlInitUnicodeString(&str, dd.DeviceName); - - /* Skip if the device already has registry display settings */ - if (NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &dm, 0)) - continue; - - if (!NtUserEnumDisplaySettings(&str, ENUM_CURRENT_SETTINGS, &dm, 0)) - { - ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); - continue; - } - - TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", - wine_dbgstr_w(dd.DeviceName), (unsigned int)dm.dmPelsWidth, (unsigned int)dm.dmPelsHeight, - (unsigned int)dm.dmBitsPerPel, (unsigned int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y); - - ret = NtUserChangeDisplaySettings(&str, &dm, NULL, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); - if (ret != DISP_CHANGE_SUCCESSFUL) - ERR("Failed to save registry display settings for %s, returned %d.\n", - wine_dbgstr_w(dd.DeviceName), ret); - } -} - /*********************************************************************** * macdrv_displays_changed * @@ -1133,25 +1094,63 @@ void macdrv_displays_changed(const macdrv_event *event) NtUserGetWindowThread(hwnd, NULL) == GetCurrentThreadId()) { macdrv_init_display_devices(TRUE); - init_registry_display_settings(); macdrv_resize_desktop(); } } static BOOL force_display_devices_refresh; +static BOOL is_same_devmode(const DEVMODEW *a, const DEVMODEW *b) +{ + return a->dmDisplayOrientation == b->dmDisplayOrientation && + a->dmDisplayFixedOutput == b->dmDisplayFixedOutput && + a->dmBitsPerPel == b->dmBitsPerPel && + a->dmPelsWidth == b->dmPelsWidth && + a->dmPelsHeight == b->dmPelsHeight && + a->dmDisplayFlags == b->dmDisplayFlags && + a->dmDisplayFrequency == b->dmDisplayFrequency; +} + +static const char *debugstr_devmodew(const DEVMODEW *devmode) +{ + char position[32] = {0}; + + if (devmode->dmFields & DM_POSITION) + { + snprintf(position, sizeof(position), " at (%d,%d)", + (int)devmode->dmPosition.x, (int)devmode->dmPosition.y); + } + + return wine_dbg_sprintf("%ux%u %ubits %uHz rotated %u degrees %sstretched %sinterlaced%s", + (unsigned int)devmode->dmPelsWidth, + (unsigned int)devmode->dmPelsHeight, + (unsigned int)devmode->dmBitsPerPel, + (unsigned int)devmode->dmDisplayFrequency, + (unsigned int)devmode->dmDisplayOrientation * 90, + devmode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un", + devmode->dmDisplayFlags & DM_INTERLACED ? "" : "non-", + position); +} + BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { struct macdrv_adapter *adapters, *adapter; struct macdrv_monitor *monitors, *monitor; struct macdrv_gpu *gpus, *gpu; - INT gpu_count, adapter_count, monitor_count, mode_count; + struct macdrv_display *displays, *display; + INT gpu_count, adapter_count, monitor_count, mode_count, display_count; DEVMODEW *mode, *modes; DWORD len; if (!force && !force_display_devices_refresh) return TRUE; force_display_devices_refresh = FALSE; + if (macdrv_get_displays(&displays, &display_count)) + { + displays = NULL; + display_count = 0; + } + /* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) { @@ -1179,6 +1178,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (adapter = adapters; adapter < adapters + adapter_count; adapter++) { + DEVMODEW current_mode = { .dmSize = sizeof(current_mode) }; struct gdi_adapter gdi_adapter = { .id = adapter->id, @@ -1201,17 +1201,35 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage device_manager->add_monitor( &gdi_monitor, param ); } + /* Get the current mode */ + if (displays) + { + for (display = displays; display < displays + display_count; display++) + { + if (display->displayID == adapter->id) + { + display_get_current_mode(display, &current_mode); + break; + } + } + } + if (!(modes = display_get_modes(adapter->id, &mode_count))) break; TRACE("adapter: %#x, mode count: %d\n", adapter->id, mode_count); /* Initialize modes */ for (mode = modes; mode < modes + mode_count; mode++) { - TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight, - (int)mode->dmBitsPerPel, (int)mode->dmDisplayFrequency, - mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un", - mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); - device_manager->add_mode( mode, FALSE, param ); + if (is_same_devmode(mode, &current_mode)) + { + TRACE("current mode: %s\n", debugstr_devmodew(&current_mode)); + device_manager->add_mode( &current_mode, TRUE, param ); + } + else + { + TRACE("mode: %s\n", debugstr_devmodew(mode)); + device_manager->add_mode( mode, FALSE, param ); + } } free(modes); @@ -1222,6 +1240,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage } macdrv_free_gpus(gpus); + macdrv_free_displays(displays); return TRUE; }

1 0

Alexandros Frantzis : winemac.drv: Extract function to get the current mode.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 239f2180cb69731b7192374302c8cc252194268c URL: https://gitlab.winehq.org/wine/wine/-/commit/239f2180cb69731b7192374302c8cc… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 11:22:12 2023 +0300 winemac.drv: Extract function to get the current mode. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winemac.drv/display.c | 50 ++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 438e2bb5390..b93ebaaa5e7 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -864,6 +864,33 @@ static DEVMODEW *display_get_modes(CGDirectDisplayID display_id, int *modes_coun return devmodes; } +static void display_get_current_mode(struct macdrv_display *display, DEVMODEW *devmode) +{ + CGDisplayModeRef display_mode; + CGDirectDisplayID display_id; + + display_id = display->displayID; + display_mode = CGDisplayCopyDisplayMode(display_id); + + devmode->dmPosition.x = CGRectGetMinX(display->frame); + devmode->dmPosition.y = CGRectGetMinY(display->frame); + devmode->dmFields |= DM_POSITION; + + display_mode_to_devmode(display_id, display_mode, devmode); + if (retina_enabled) + { + struct display_mode_descriptor *desc = create_original_display_mode_descriptor(display_id); + if (display_mode_matches_descriptor(display_mode, desc)) + { + devmode->dmPelsWidth *= 2; + devmode->dmPelsHeight *= 2; + } + free_display_mode_descriptor(desc); + } + + CFRelease(display_mode); +} + /*********************************************************************** * GetCurrentDisplaySettings (MACDRV.@) * @@ -872,8 +899,6 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD { struct macdrv_display *displays = NULL; int num_displays, display_idx; - CGDisplayModeRef display_mode; - CGDirectDisplayID display_id; WCHAR *end; TRACE("%s, %u, %p + %hu\n", debugstr_w(devname), is_primary, devmode, devmode->dmSize); @@ -890,26 +915,7 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD return FALSE; } - display_id = displays[display_idx].displayID; - display_mode = CGDisplayCopyDisplayMode(display_id); - - devmode->dmPosition.x = CGRectGetMinX(displays[display_idx].frame); - devmode->dmPosition.y = CGRectGetMinY(displays[display_idx].frame); - devmode->dmFields |= DM_POSITION; - - display_mode_to_devmode(display_id, display_mode, devmode); - if (retina_enabled) - { - struct display_mode_descriptor *desc = create_original_display_mode_descriptor(display_id); - if (display_mode_matches_descriptor(display_mode, desc)) - { - devmode->dmPelsWidth *= 2; - devmode->dmPelsHeight *= 2; - } - free_display_mode_descriptor(desc); - } - - CFRelease(display_mode); + display_get_current_mode(&displays[display_idx], devmode); macdrv_free_displays(displays); TRACE("current mode -- %dx%d-%dx%dx%dbpp @%d Hz",

1 0

Alexandros Frantzis : winex11.drv: Set the current mode using gdi_device_manager.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 4232312dffe1cd115aa6bfd755f5b7c6a403e3fc URL: https://gitlab.winehq.org/wine/wine/-/commit/4232312dffe1cd115aa6bfd755f5b7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 15:10:40 2023 +0300 winex11.drv: Set the current mode using gdi_device_manager. Since setting the current mode also sets the registry settings (if not previously set), we also remove the code that manually changes the registry settings. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winex11.drv/display.c | 69 +++++++++++++++++++++------------------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrandr.c | 1 - 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 5fb027da680..cd36c3c559c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -156,41 +156,6 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_SetHandler(&nores_handler); } -/* Initialize registry display settings when new display devices are added */ -void init_registry_display_settings(void) -{ - DEVMODEW dm = {.dmSize = sizeof(dm)}; - DISPLAY_DEVICEW dd = {sizeof(dd)}; - UNICODE_STRING device_name; - DWORD i = 0; - int ret; - - while (!NtUserEnumDisplayDevices( NULL, i++, &dd, 0 )) - { - RtlInitUnicodeString( &device_name, dd.DeviceName ); - - /* Skip if the device already has registry display settings */ - if (NtUserEnumDisplaySettings( &device_name, ENUM_REGISTRY_SETTINGS, &dm, 0 )) - continue; - - if (!NtUserEnumDisplaySettings( &device_name, ENUM_CURRENT_SETTINGS, &dm, 0 )) - { - ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); - continue; - } - - TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", - wine_dbgstr_w(dd.DeviceName), (int)dm.dmPelsWidth, (int)dm.dmPelsHeight, - (int)dm.dmBitsPerPel, (int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y); - - ret = NtUserChangeDisplaySettings( &device_name, &dm, NULL, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL ); - if (ret != DISP_CHANGE_SUCCESSFUL) - ERR("Failed to save registry display settings for %s, returned %d.\n", - wine_dbgstr_w(dd.DeviceName), ret); - } -} - static void set_display_depth(ULONG_PTR display_id, DWORD depth) { struct x11drv_display_depth *display_depth; @@ -548,6 +513,25 @@ BOOL X11DRV_DisplayDevices_SupportEventHandlers(void) static BOOL force_display_devices_refresh; +static const char *debugstr_devmodew( const DEVMODEW *devmode ) +{ + char position[32] = {0}; + + if (devmode->dmFields & DM_POSITION) + { + snprintf( position, sizeof(position), " at (%d,%d)", + (int)devmode->dmPosition.x, (int)devmode->dmPosition.y ); + } + + return wine_dbg_sprintf( "%ux%u %ubits %uHz rotated %u degrees%s", + (unsigned int)devmode->dmPelsWidth, + (unsigned int)devmode->dmPelsHeight, + (unsigned int)devmode->dmBitsPerPel, + (unsigned int)devmode->dmDisplayFrequency, + (unsigned int)devmode->dmDisplayOrientation * 90, + position ); +} + BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { struct x11drv_display_device_handler *handler; @@ -579,6 +563,8 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (adapter = 0; adapter < adapter_count; adapter++) { + DEVMODEW current_mode = {.dmSize = sizeof(current_mode)}; + device_manager->add_adapter( &adapters[adapter], param ); if (!handler->get_monitors(adapters[adapter].id, &monitors, &monitor_count)) break; @@ -590,13 +576,22 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage handler->free_monitors(monitors, monitor_count); + settings_handler.get_current_mode( adapters[adapter].id, &current_mode ); if (!settings_handler.get_modes( adapters[adapter].id, EDS_ROTATEDMODE, &modes, &mode_count )) continue; for (mode = modes; mode_count; mode_count--) { - TRACE( "mode: %p\n", mode ); - device_manager->add_mode( mode, FALSE, param ); + if (is_same_devmode( mode, &current_mode )) + { + TRACE( "current mode: %s\n", debugstr_devmodew( &current_mode ) ); + device_manager->add_mode( &current_mode, TRUE, param ); + } + else + { + TRACE( "mode: %s\n", debugstr_devmodew( mode ) ); + device_manager->add_mode( mode, FALSE, param ); + } mode = (DEVMODEW *)((char *)mode + sizeof(*modes) + modes[0].dmDriverExtra); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a41eac928ad..893099489e3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -758,7 +758,6 @@ extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *han extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(void) DECLSPEC_HIDDEN; -extern void init_registry_display_settings(void) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 7c32e683c5d..3731ca6b4d0 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1188,7 +1188,6 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) if (hwnd == NtUserGetDesktopWindow() && NtUserGetWindowThread( hwnd, NULL ) == GetCurrentThreadId()) { X11DRV_DisplayDevices_Init( TRUE ); - init_registry_display_settings(); X11DRV_resize_desktop(); } /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */

1 0

Alexandros Frantzis : winewayland.drv: Set the current mode using gdi_device_manager.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: ae2314512c711cdd1a6a5e2ae66b90ea1cb19583 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae2314512c711cdd1a6a5e2ae66b90… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 15:23:30 2023 +0300 winewayland.drv: Set the current mode using gdi_device_manager. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 1d86b2fd4e3..bd99441170e 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -124,9 +124,11 @@ static void wayland_add_device_modes(const struct gdi_device_manager *device_man RB_FOR_EACH_ENTRY(output_mode, &output->modes, struct wayland_output_mode, entry) { - DEVMODEW mode; + DEVMODEW mode = {.dmSize = sizeof(mode)}; + BOOL mode_is_current = output_mode == output->current_mode; populate_devmode(output_mode, &mode); - device_manager->add_mode(&mode, FALSE, param); + if (mode_is_current) mode.dmFields |= DM_POSITION; + device_manager->add_mode(&mode, mode_is_current, param); } }

1 0