- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Add stub IUIAutomationTreeWalker implementation.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 68f6a73ad2b438229b00ac31e48a815face2dfc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/68f6a73ad2b438229b00ac31e48a81… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 12:13:01 2023 -0500 uiautomationcore: Add stub IUIAutomationTreeWalker implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 38 ++++++ dlls/uiautomationcore/uia_com_client.c | 203 ++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 2a4f87c7b59..4f4ce10d622 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11701,6 +11701,43 @@ static void test_Element_Find(IUIAutomation *uia_iface) UnregisterClassA("test_Element_Find class", NULL); } +static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) +{ + IUIAutomationCondition *cond, *cond2; + IUIAutomationTreeWalker *walker; + HRESULT hr; + + cond = NULL; + hr = IUIAutomation_CreateTrueCondition(uia_iface, &cond); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cond, "cond == NULL\n"); + + /* NULL input argument tests. */ + walker = (void *)0xdeadbeef; + hr = IUIAutomation_CreateTreeWalker(uia_iface, NULL, &walker); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(!walker, "walker != NULL\n"); + + hr = IUIAutomation_CreateTreeWalker(uia_iface, cond, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + /* Actually create TreeWalker. */ + walker = NULL; + hr = IUIAutomation_CreateTreeWalker(uia_iface, cond, &walker); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!walker, "walker == NULL\n"); + + hr = IUIAutomationTreeWalker_get_Condition(walker, &cond2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cond2, "cond2 == NULL\n"); + + ok(iface_cmp((IUnknown *)cond, (IUnknown *)cond2), "cond != cond2\n"); + IUIAutomationCondition_Release(cond); + IUIAutomationCondition_Release(cond2); + + IUIAutomationTreeWalker_Release(walker); +} + struct uia_com_classes { const GUID *clsid; const GUID *iid; @@ -11802,6 +11839,7 @@ static void test_CUIAutomation(void) test_CUIAutomation_condition_ifaces(uia_iface); test_CUIAutomation_value_conversion(uia_iface); test_CUIAutomation_cache_request_iface(uia_iface); + test_CUIAutomation_TreeWalker_ifaces(uia_iface); test_ElementFromHandle(uia_iface, has_cui8); test_Element_GetPropertyValue(uia_iface); test_Element_cache_methods(uia_iface); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 4b2e5cba741..ec634be5e13 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2442,6 +2442,204 @@ exit: return hr; } +/* + * IUIAutomationTreeWalker interface. + */ +struct uia_tree_walker { + IUIAutomationTreeWalker IUIAutomationTreeWalker_iface; + LONG ref; + + IUIAutomationCondition *nav_cond; + struct UiaCondition *cond_struct; +}; + +static inline struct uia_tree_walker *impl_from_IUIAutomationTreeWalker(IUIAutomationTreeWalker *iface) +{ + return CONTAINING_RECORD(iface, struct uia_tree_walker, IUIAutomationTreeWalker_iface); +} + +static HRESULT WINAPI uia_tree_walker_QueryInterface(IUIAutomationTreeWalker *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUIAutomationTreeWalker) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IUIAutomationTreeWalker_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI uia_tree_walker_AddRef(IUIAutomationTreeWalker *iface) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + ULONG ref = InterlockedIncrement(&tree_walker->ref); + + TRACE("%p, refcount %ld\n", tree_walker, ref); + return ref; +} + +static ULONG WINAPI uia_tree_walker_Release(IUIAutomationTreeWalker *iface) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + ULONG ref = InterlockedDecrement(&tree_walker->ref); + + TRACE("%p, refcount %ld\n", tree_walker, ref); + if (!ref) + { + IUIAutomationCondition_Release(tree_walker->nav_cond); + heap_free(tree_walker); + } + + return ref; +} + +static HRESULT WINAPI uia_tree_walker_GetParentElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **parent) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetFirstChildElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **first) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, first); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetLastChildElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **last) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, last); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetNextSiblingElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **next) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, next); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElement(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationElement **prev) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, prev); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_NormalizeElement(IUIAutomationTreeWalker *iface, IUIAutomationElement *elem, + IUIAutomationElement **normalized) +{ + FIXME("%p, %p, %p: stub\n", iface, elem, normalized); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetParentElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **parent) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetFirstChildElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **first) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, first); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetLastChildElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **last) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, last); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetNextSiblingElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **next) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, next); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_GetPreviousSiblingElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **prev) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, prev); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_NormalizeElementBuildCache(IUIAutomationTreeWalker *iface, + IUIAutomationElement *elem, IUIAutomationCacheRequest *cache_req, IUIAutomationElement **normalized) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, elem, cache_req, normalized); + return E_NOTIMPL; +} + +static HRESULT WINAPI uia_tree_walker_get_Condition(IUIAutomationTreeWalker *iface, + IUIAutomationCondition **condition) +{ + struct uia_tree_walker *tree_walker = impl_from_IUIAutomationTreeWalker(iface); + + TRACE("%p, %p\n", iface, condition); + + if (!condition) + return E_POINTER; + + IUIAutomationCondition_AddRef(tree_walker->nav_cond); + *condition = tree_walker->nav_cond; + + return S_OK; +} + +static const IUIAutomationTreeWalkerVtbl uia_tree_walker_vtbl = { + uia_tree_walker_QueryInterface, + uia_tree_walker_AddRef, + uia_tree_walker_Release, + uia_tree_walker_GetParentElement, + uia_tree_walker_GetFirstChildElement, + uia_tree_walker_GetLastChildElement, + uia_tree_walker_GetNextSiblingElement, + uia_tree_walker_GetPreviousSiblingElement, + uia_tree_walker_NormalizeElement, + uia_tree_walker_GetParentElementBuildCache, + uia_tree_walker_GetFirstChildElementBuildCache, + uia_tree_walker_GetLastChildElementBuildCache, + uia_tree_walker_GetNextSiblingElementBuildCache, + uia_tree_walker_GetPreviousSiblingElementBuildCache, + uia_tree_walker_NormalizeElementBuildCache, + uia_tree_walker_get_Condition, +}; + +static HRESULT create_uia_tree_walker(IUIAutomationTreeWalker **out_tree_walker, IUIAutomationCondition *nav_cond) +{ + struct uia_tree_walker *tree_walker; + struct UiaCondition *cond_struct; + HRESULT hr; + + if (!out_tree_walker) + return E_POINTER; + + *out_tree_walker = NULL; + hr = get_uia_condition_struct_from_iface(nav_cond, &cond_struct); + if (FAILED(hr)) + return hr; + + tree_walker = heap_alloc_zero(sizeof(*tree_walker)); + if (!tree_walker) + return E_OUTOFMEMORY; + + tree_walker->IUIAutomationTreeWalker_iface.lpVtbl = &uia_tree_walker_vtbl; + tree_walker->ref = 1; + tree_walker->nav_cond = nav_cond; + IUIAutomationCondition_AddRef(nav_cond); + tree_walker->cond_struct = cond_struct; + + *out_tree_walker = &tree_walker->IUIAutomationTreeWalker_iface; + return S_OK; +} + /* * IUIAutomation interface. */ @@ -2576,8 +2774,9 @@ static HRESULT WINAPI uia_iface_GetFocusedElementBuildCache(IUIAutomation6 *ifac static HRESULT WINAPI uia_iface_CreateTreeWalker(IUIAutomation6 *iface, IUIAutomationCondition *cond, IUIAutomationTreeWalker **out_walker) { - FIXME("%p, %p, %p: stub\n", iface, cond, out_walker); - return E_NOTIMPL; + TRACE("%p, %p, %p\n", iface, cond, out_walker); + + return create_uia_tree_walker(out_walker, cond); } static HRESULT WINAPI uia_iface_get_ControlViewWalker(IUIAutomation6 *iface, IUIAutomationTreeWalker **out_walker)

1 0

Hans Leidekker : adsldp/tests: Fix test failures.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 42fbc50b66d6d0b7e48840e9d30761ef98df8b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/42fbc50b66d6d0b7e48840e9d30761… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Mar 19 21:32:27 2023 +0100 adsldp/tests: Fix test failures. The server is back online now and apparently its contents changed, causing test failures. --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index a5bb4ee971f..7404b62a231 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -310,8 +310,6 @@ static void do_search(const struct search *s) "expected %s, got %s\n", wine_dbgstr_w(res->values[i]), wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); } - ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); - IDirectorySearch_FreeColumn(ds, &col); FreeADsMem(name); res++;

1 0

Henri Verbeet : vkd3d-shader: VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE was introduced in vkd3d 1.7.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: vkd3d Branch: master Commit: 54b0165e328b7d042bcaa0261bd62ffe49d3396b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54b0165e328b7d042bcaa0261bd62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 16:37:22 2023 +0100 vkd3d-shader: VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE was introduced in vkd3d 1.7. --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index bf5e1387..c5baecb5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -159,7 +159,7 @@ enum vkd3d_shader_compile_option_name * This option is supported by vkd3d_shader_compile() for the SPIR-V target * type and Vulkan targets; it should not be enabled otherwise. * - * \since 1.6 + * \since 1.7 */ VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE = 0x00000006,

1 0

Alexandre Julliard : Wine release 8.4
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: website Branch: master Commit: 01e9ac1cf067eed718447654ef08d99ba15c371e URL: https://gitlab.winehq.org/winehq/winehq/-/commit/01e9ac1cf067eed718447654ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:28:08 2023 +0100 Wine release 8.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023031701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023031701.xml b/news/en/2023031701.xml new file mode 100644 index 00000000..08f011cc --- /dev/null +++ b/news/en/2023031701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 17, 2023</date> +<title>Wine 8.4 Released</title> +<body> + The Wine development release 8.4 is now available. + <a href="{$root}/announce/8.4">What's new</a> in this release: +<ul> + <li>Initial step of the Wayland graphics driver.</li> + <li>Cleanups in IME support.</li> + <li>A number of test fixes.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.4 : Alexandre Julliard : Release 8.4
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: refs/tags/wine-8.4 Tag: 298744b0e585c353c3c2a6013fe3ff27cb25f61c URL: https://gitlab.winehq.org/wine/wine/-/tags/298744b0e585c353c3c2a6013fe3ff27… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:25:30 2023 +0100 Release 8.4

1 0

Alexandre Julliard : Release 8.4.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 15aec461174ae2f2568d63fa83f32576ede05a9c URL: https://gitlab.winehq.org/wine/wine/-/commit/15aec461174ae2f2568d63fa83f325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 22:20:03 2023 +0100 Release 8.4. --- ANNOUNCE | 798 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 478 insertions(+), 341 deletions(-)

1 0

Francois Gouget : advapi32/tests: Skip some tests if the EventLog service crashed.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 2078afb9283d2a69b4e4c8b22f8101a15f70d092 URL: https://gitlab.winehq.org/wine/wine/-/commit/2078afb9283d2a69b4e4c8b22f8101… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 14:14:42 2023 +0100 advapi32/tests: Skip some tests if the EventLog service crashed. advapi32:eventlog crashes the EventLog service in some Windows versions so defend against that condition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53461 --- dlls/advapi32/tests/service.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c999255fbcc..da8495da45f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2919,19 +2919,25 @@ static void test_EventLog(void) ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS || status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, "got %#lx\n", status.dwServiceType); - ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState); - todo_wine - ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || - status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || - status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), - "got %#lx\n", status.dwControlsAccepted); - ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode); ok(status.dwServiceSpecificExitCode == 0, "got %#lx\n", status.dwServiceSpecificExitCode); ok(status.dwCheckPoint == 0, "got %#lx\n", status.dwCheckPoint); ok(status.dwWaitHint == 0, "got %#lx\n", status.dwWaitHint); - ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId); ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */, "got %#lx\n", status.dwServiceFlags); + if (status.dwCurrentState == SERVICE_STOPPED && + status.dwWin32ExitCode == ERROR_PROCESS_ABORTED) + win_skip("EventLog crashed!\n"); + else + { + ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState); + todo_wine + ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), + "got %#lx\n", status.dwControlsAccepted); + ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode); + ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId); + } CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle);

1 0

Francois Gouget : advapi32/tests: Enumerate the services using the Unicode API.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 42bd3bb79a10ca01363cd7c883ef5ddeb5472b85 URL: https://gitlab.winehq.org/wine/wine/-/commit/42bd3bb79a10ca01363cd7c883ef5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 14:42:43 2023 +0100 advapi32/tests: Enumerate the services using the Unicode API. The ANSI one is broken in some UTF-8 locales which prevents most of the tests from running. So use the Unicode API for most tests and just confirm that it is consistent with the ANSI one instead of doing the reverse. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52895 --- dlls/advapi32/tests/service.c | 155 ++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 75 deletions(-)

1 0

Francois Gouget : advapi32/tests: Better account for starting and stopping services.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 7b3f804606b2b3864cce6f53e9840482a963cbb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3f804606b2b3864cce6f53e98404… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 18:46:18 2023 +0100 advapi32/tests: Better account for starting and stopping services. The START_PENDING and STOP_PENDING services don't always have a process id. Also trace unusual service states so we can identify which ones behave in unexpected ways. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 60 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2527be27d5f..8a4fdec05ab 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1420,10 +1420,30 @@ static void test_enum_svc(void) */ if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_STOPPED) - servicecountinactive--; - else + switch (status.dwCurrentState) + { + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + case SERVICE_CONTINUE_PENDING: + trace("Got state %lx for service %s\n", status.dwCurrentState, + services[i].lpServiceName); + /* fall through */ + + case SERVICE_RUNNING: servicecountactive--; + break; + + case SERVICE_STOPPED: + servicecountinactive--; + break; + + default: + ok(0, "Got unknown state %lx for service %s\n", + status.dwCurrentState, services[i].lpServiceName); + break; + } } } HeapFree(GetProcessHeap(), 0, services); @@ -1739,21 +1759,45 @@ static void test_enum_svc(void) if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState != SERVICE_STOPPED) + switch (status.dwCurrentState) { + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + trace("Got state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + /* There may or may not be a process id */ + servicecountactive--; + break; + + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + case SERVICE_CONTINUE_PENDING: + trace("Got state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + /* fall through */ + + case SERVICE_RUNNING: /* We expect a process id for every running service */ ok(status.dwProcessId > 0, "Expected a process id for this running service (%s)\n", exservices[i].lpServiceName); - servicecountactive--; - } - else - { + break; + + case SERVICE_STOPPED: /* We shouldn't have a process id for inactive services */ ok(status.dwProcessId == 0, "Service %s state %lu shouldn't have an associated process id\n", exservices[i].lpServiceName, status.dwCurrentState); servicecountinactive--; + break; + + default: + ok(0, "Got unknown state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + break; } } }

1 0

Francois Gouget : advapi32/tests: Take into account service start / stop race conditions.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 81e33a34841a48beb1103bf967586f5a8d3c4e40 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e33a34841a48beb1103bf967586f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 20:18:13 2023 +0100 advapi32/tests: Take into account service start / stop race conditions. Services sometimes start or stop between two EnumServicesStatus() calls. Fortunately this is rare so the tests can just retry to get the expected result. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 149 ++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 34 deletions(-)

1 0