- Wine-Commits - list.winehq.org

Sven Baars : advapi32/tests: Fix a typo (Coverity).
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 28210162472459d2afe57e638e2f50ee37f2b63f URL: https://gitlab.winehq.org/wine/wine/-/commit/28210162472459d2afe57e638e2f50… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 30 14:12:01 2023 +0100 advapi32/tests: Fix a typo (Coverity). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 29b1aff6b74..30a79368c94 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1179,7 +1179,7 @@ static void test_reg_open_key(void) ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &hkRoot64, NULL); - ok(ret == ERROR_SUCCESS || ERROR_ACCESS_DENIED, + ok(ret == ERROR_SUCCESS || ret == ERROR_ACCESS_DENIED, "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%lu)\n", ret); if (ret == ERROR_ACCESS_DENIED) {

1 0

Esme Povirk : user32/tests: Improve timer measurement method.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 0f0867063d1c5693170fe8770692072b24c77e5c URL: https://gitlab.winehq.org/wine/wine/-/commit/0f0867063d1c5693170fe877069207… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 27 15:28:28 2023 -0500 user32/tests: Improve timer measurement method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55786 --- dlls/user32/tests/msg.c | 106 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90abf9b83a1..68398508fc6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11548,20 +11548,67 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } -#define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 100 -#define TIMER_COUNT_TOLERANCE 10 +#define TIMER_ID 0x19 +#define TIMER_COUNT 500 /* 499 samples */ +#define TIMER_DURATION_EXPECTED 10000 /* 10 ms */ +#define TIMER_DURATION_ALT 15600 /* 15.6 ms */ +#define TIMER_DURATION_TOLERANCE 1000 /* 1 ms */ static int count = 0; -static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +static ULONGLONG timer_ticks[TIMER_COUNT]; +static int timer_duration = 0; + +static int compare_ulonglong(const void *a, const void *b) { + ULONGLONG la, lb; + la = *(ULONGLONG*)a; + lb = *(ULONGLONG*)b; + return (la > lb) - (la < lb); +} + +static void timer_fired(void) +{ + if (count < TIMER_COUNT) + { + LARGE_INTEGER performance_counter; + BOOL ret; + + ret = QueryPerformanceCounter(&performance_counter); + ok(ret, "QueryPerformanceCounter failed\n"); + + timer_ticks[count] = performance_counter.QuadPart; + } + count++; + + if (count == TIMER_COUNT) + { + LARGE_INTEGER performance_frequency; + BOOL ret; + + /* calculate durations */ + for (int i=0; i < TIMER_COUNT-1; i++) + timer_ticks[i] = timer_ticks[i+1] - timer_ticks[i]; + + qsort(timer_ticks, TIMER_COUNT - 1, sizeof(timer_ticks[0]), compare_ulonglong); + + ret = QueryPerformanceFrequency(&performance_frequency); + ok(ret, "QueryPerformanceFrequency failed\n"); + + /* median duration, converted to microseconds */ + timer_duration = (int)(timer_ticks[(TIMER_COUNT - 1) / 2] * 1000000 / performance_frequency.QuadPart); + } +} + +static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + timer_fired(); } static DWORD exception; static void CALLBACK callback_exception(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { - count++; + timer_fired(); RaiseException(exception, 0, 0, NULL); } @@ -11583,7 +11630,6 @@ static DWORD WINAPI timer_thread_proc(LPVOID x) static void test_timers(void) { struct timer_info info; - DWORD start; DWORD id; MSG msg; @@ -11609,44 +11655,37 @@ static void test_timers(void) /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to - * 15.6 ms. Since there is some measurement error between test runs we are allowing for - * ±9 counts (~4 ms) around the expected value. + * 15.6 ms. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); ok(id != 0, "did not get id from SetTimer.\n"); ok(id==TIMER_ID, "SetTimer timer ID different\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - count, TIMER_COUNT_EXPECTED); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE /* xp, win7 */ + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); /* Perform the same check on SetSystemTimer (only available on w2k3 and older) */ if (pSetSystemTimer) { - int syscount = 0; - count = 0; id = pSetSystemTimer(info.hWnd, TIMER_ID, 0, callback_count); ok(id != 0, "did not get id from SetSystemTimer.\n"); ok(id==TIMER_ID, "SetTimer timer ID different\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, info.hWnd, 0, 0)) { if (msg.message == WM_SYSTIMER) - syscount++; + timer_fired(); + ok(msg.message != WM_TIMER, "unexpected WM_TIMER\n"); DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ - || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - syscount, TIMER_COUNT_EXPECTED); - ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", count); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); ok(pKillSystemTimer(info.hWnd, id), "KillSystemTimer failed\n"); } @@ -11679,20 +11718,17 @@ static void test_timers_no_wnd(void) /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to - * 15.6 ms. Since there is some measurement error between test runs we are allowing for - * ±9 counts (~4 ms) around the expected value. + * 15.6 ms. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); ok(id != 0, "did not get id from SetTimer.\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - count, TIMER_COUNT_EXPECTED); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE /* xp */ + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */

1 0

Connor McAdams : uiautomationcore: Return TRUE from UiaClientsAreListening().
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: d81256e7b6728177784d67f3b88d7b8fabb2512d URL: https://gitlab.winehq.org/wine/wine/-/commit/d81256e7b6728177784d67f3b88d7b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:44:31 2023 -0400 uiautomationcore: Return TRUE from UiaClientsAreListening(). This function always returns TRUE on Windows 7 and above, and now that we have stubs for all the event raising functions there should be no harm in doing the same. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++++++++++ dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6cb6e56d99b..67dcb04dadc 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -18607,6 +18607,15 @@ static void test_uia_event_ProxyProviderWinEventHandler(void) UiaRegisterProviderCallback(NULL); } +static void test_UiaClientsAreListening(void) +{ + BOOL ret; + + /* Always returns TRUE on Windows 7 and above. */ + ret = UiaClientsAreListening(); + ok(!!ret, "ret != TRUE\n"); +} + /* * Once a process returns a UI Automation provider with * UiaReturnRawElementProvider it ends up in an implicit MTA until exit. This @@ -18663,6 +18672,7 @@ START_TEST(uiautomation) return; } + test_UiaClientsAreListening(); test_UiaHostProviderFromHwnd(); test_uia_reserved_value_ifaces(); test_UiaLookupId(); diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9ca320b1ba0..8c7a72bb35e 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -264,8 +264,8 @@ static const IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { */ BOOL WINAPI UiaClientsAreListening(void) { - FIXME("()\n"); - return FALSE; + TRACE("()\n"); + return TRUE; } /*********************************************************************** diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0fd942f3f37..fbfbc46b09c 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -559,6 +559,7 @@ HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd); HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd); BOOL WINAPI UiaHasServerSideProvider(HWND hwnd); +BOOL WINAPI UiaClientsAreListening(void); #ifdef __cplusplus }

1 0

Connor McAdams : uiautomationcore: Don't set HRESULT when attempting to advise currently focused HUIANODE.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 0cbca47dae968ecaa720ae0ba0b2ac491e62fa1a URL: https://gitlab.winehq.org/wine/wine/-/commit/0cbca47dae968ecaa720ae0ba0b2ac… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:43:38 2023 -0400 uiautomationcore: Don't set HRESULT when attempting to advise currently focused HUIANODE. create_uia_node_from_hwnd() is expected to fail if the HWND doesn't have a native serverside provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_com_client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 5c0d0cd0b9e..43b16db74f8 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1372,8 +1372,7 @@ static HRESULT uia_event_handlers_add_handler(IUnknown *handler_iface, SAFEARRAY { HUIANODE node = NULL; - hr = create_uia_node_from_hwnd(info.hwndFocus, &node, NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS); - if (SUCCEEDED(hr)) + if (SUCCEEDED(create_uia_node_from_hwnd(info.hwndFocus, &node, NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS))) uia_com_focus_handler_advise_node(event, node, info.hwndFocus); UiaNodeRelease(node); }

1 0

Connor McAdams : uiautomationcore: Don't return failure from ::GetEmbeddedFragmentRoots stub on the default BaseHwnd provider.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 4ed0a496189d2adab5a52d04b6b6443f9188fda6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ed0a496189d2adab5a52d04b6b644… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:42:06 2023 -0400 uiautomationcore: Don't return failure from ::GetEmbeddedFragmentRoots stub on the default BaseHwnd provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 33bed429ec6..2e5f0e6c6ea 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1883,7 +1883,7 @@ static HRESULT WINAPI base_hwnd_fragment_GetEmbeddedFragmentRoots(IRawElementPro { FIXME("%p, %p: stub!\n", iface, ret_val); *ret_val = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI base_hwnd_fragment_SetFocus(IRawElementProviderFragment *iface)

1 0

Louis Lenders : uxtheme: Add stub for SetPreferredAppMode.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 221e88e2ecbfdd8e471fea1b0672dcb77ec6cc63 URL: https://gitlab.winehq.org/wine/wine/-/commit/221e88e2ecbfdd8e471fea1b0672dc… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Oct 26 00:03:40 2023 +0200 uxtheme: Add stub for SetPreferredAppMode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55742 --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index f1a4d0d5566..6b202bb48a7 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1290,3 +1290,13 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) return !light_theme; } + +/********************************************************************** + * SetPreferredAppMode (UXTHEME.135) + * + */ +int WINAPI SetPreferredAppMode(int app_mode) +{ + FIXME("%d: stub\n", app_mode); + return 0; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index d31621e11a7..6bcebffe0a5 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -43,6 +43,7 @@ 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection 132 stdcall -noname ShouldAppsUseDarkMode() +135 stdcall -noname SetPreferredAppMode(long) 138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions

1 0

Nikolay Sivov : include: Correct ID3D10EffectPool interface uuid.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 8935dc73397f6604173979852db99fe552038bdc URL: https://gitlab.winehq.org/wine/wine/-/commit/8935dc73397f6604173979852db99f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 30 12:02:09 2023 +0100 include: Correct ID3D10EffectPool interface uuid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d3d10effect.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d10effect.idl b/include/d3d10effect.idl index d7526927fc5..fe526aaf296 100644 --- a/include/d3d10effect.idl +++ b/include/d3d10effect.idl @@ -448,7 +448,7 @@ interface ID3D10Effect : IUnknown [ local, object, - uuid(95e7ab04-3250-412e-8213-fcd2f8677933), + uuid(9537ab04-3250-412e-8213-fcd2f8677933), ] interface ID3D10EffectPool : IUnknown {

1 0

Connor McAdams : uiautomationcore: Implement IRawElementProviderFragment::GetEmbeddedFragmentRoots for MSAA providers.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: a35c77fd33a5ccd938613c09422e0623d084b36c URL: https://gitlab.winehq.org/wine/wine/-/commit/a35c77fd33a5ccd938613c09422e06… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:40:52 2023 -0400 uiautomationcore: Implement IRawElementProviderFragment::GetEmbeddedFragmentRoots for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 19 +++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 9210583062f..6cb6e56d99b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3836,6 +3836,7 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) IRawElementProviderFragmentRoot *elroot, *elroot2; IRawElementProviderFragment *elfrag, *elfrag2; IRawElementProviderSimple *elprov; + SAFEARRAY *ret_arr; ULONG old_ref; HRESULT hr; @@ -3852,6 +3853,12 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elfrag, "elfrag == NULL\n"); + /* GetEmbeddedFragmentRoots test. */ + ret_arr = (void *)0xdeadbeef; + hr = IRawElementProviderFragment_GetEmbeddedFragmentRoots(elfrag, &ret_arr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!ret_arr, "ret_arr != NULL\n"); + /* * get_FragmentRoot does the equivalent of calling * AccessibleObjectFromWindow with OBJID_CLIENT on the HWND associated @@ -4161,6 +4168,12 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elfrag, "elfrag == NULL\n"); + /* GetEmbeddedFragmentRoots test. */ + ret_arr = (void *)0xdeadbeef; + hr = IRawElementProviderFragment_GetEmbeddedFragmentRoots(elfrag, &ret_arr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!ret_arr, "ret_arr != NULL\n"); + /* * Simple child element queries HWND as well, does not just return its * parent. @@ -4212,6 +4225,12 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elfrag, "elfrag == NULL\n"); + /* GetEmbeddedFragmentRoots test. */ + ret_arr = (void *)0xdeadbeef; + hr = IRawElementProviderFragment_GetEmbeddedFragmentRoots(elfrag, &ret_arr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!ret_arr, "ret_arr != NULL\n"); + /* * Again, same behavior as simple children. It doesn't just retrieve the * parent IAccessible, it queries the HWND. diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 4ecef2a4752..33bed429ec6 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1005,9 +1005,9 @@ static HRESULT WINAPI msaa_fragment_get_BoundingRectangle(IRawElementProviderFra static HRESULT WINAPI msaa_fragment_GetEmbeddedFragmentRoots(IRawElementProviderFragment *iface, SAFEARRAY **ret_val) { - FIXME("%p, %p: stub!\n", iface, ret_val); + TRACE("%p, %p\n", iface, ret_val); *ret_val = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI msaa_fragment_SetFocus(IRawElementProviderFragment *iface)

1 0

Hans Leidekker : win32u: Get rid of a special case for non-scalable fonts in NtGdiGetCharABCWidthsW().
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 863d29ca725e1e149a298fb02d96801e56918620 URL: https://gitlab.winehq.org/wine/wine/-/commit/863d29ca725e1e149a298fb02d9680… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 26 21:15:08 2023 +0200 win32u: Get rid of a special case for non-scalable fonts in NtGdiGetCharABCWidthsW(). --- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/font.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 16bfb40392b..69000c8ca66 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1186,7 +1186,7 @@ static void test_GetCharABCWidths(void) ok(!ret, "GetCharABCWidthsW should have failed\n"); ret = GetCharABCWidthsW(hdc, 'a', 'a', abc); - ok(!ret, "GetCharABCWidthsW should have failed\n"); + ok(ret || broken(!ret) /* < win10 */, "GetCharABCWidthsW should have succeeded\n"); ret = GetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index c21d87c1fbc..85acad68ffa 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6243,7 +6243,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars PHYSDEV dev; unsigned int i, count = last; BOOL ret; - TEXTMETRICW tm; if (!dc) return FALSE; @@ -6260,17 +6259,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars } else { - if (flags & NTGDI_GETCHARABCWIDTHS_INT) - { - /* unlike float variant, this one is supposed to fail on non-scalable fonts */ - dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) - { - release_dc_ptr( dc ); - return FALSE; - } - } - if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); ret = dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer );

1 0

Hans Leidekker : gdi32/tests: Skip broken Noto Color Emoji font in character width test.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 31fd070165215bed3473a6c32d13d1a290076b66 URL: https://gitlab.winehq.org/wine/wine/-/commit/31fd070165215bed3473a6c32d13d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 26 21:00:01 2023 +0200 gdi32/tests: Skip broken Noto Color Emoji font in character width test. --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 711c9ca4a32..16bfb40392b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7573,9 +7573,10 @@ static int CALLBACK get_char_width_proc(const LOGFONTA *lf, ret = GetCharABCWidthsFloatA(dc, c, c, &abcf); ok(ret, "%s: GetCharABCWidths() failed\n", lf->lfFaceName); - if (GetCharABCWidthsA(dc, c, c, &abc)) - ok((float)abc.abcB == abcf.abcfB, "%s: mismatched widths %d/%.8e\n", - lf->lfFaceName, abc.abcB, abcf.abcfB); + if (!strcmp(lf->lfFaceName, "Noto Color Emoji")) + skip("broken Noto Color Emoji font"); + else if (GetCharABCWidthsA(dc, c, c, &abc)) + ok((float)abc.abcB == abcf.abcfB, "%s: mismatched widths %d/%.8e\n", lf->lfFaceName, abc.abcB, abcf.abcfB); ReleaseDC(NULL, dc); DeleteObject(font);

1 0