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

Re: [PATCH vkd3d v6 5/9] tests: Add a test for multiple render targets.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 9, 2022

Re: [PATCH vkd3d v6 4/9] tests: Add a basic shader test for UAVs.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 9, 2022

Re: [PATCH vkd3d v6 3/9] tests/shader_runner: Make the render target into a resource.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 9, 2022

Re: [PATCH vkd3d v6 1/9] tests/shader_runner: Allow creating UAV resources.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 9, 2022

Re: [PATCH vkd3d v6 2/9] tests/shader_runner: Create the render pass and framebuffer in vulkan_runner_draw().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 9, 2022

Re: [PATCH v2] shell32: Implement SHBindToFolderIDListParent.

by Dmitry Timoshkov

Marvin <testbot(a)winehq.org> wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=116570 > > Your paranoid android. > > > === w1064v1809 (32 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > > === w1064 (32 bit report) === > > shell32: > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) > > === w1064_tsign (32 bit report) === > > shell32: > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) > > === w1064v1809 (64 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) > > === w1064 (64 bit report) === > > shell32: > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) > > === w1064_2qxl (64 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) > > === w1064_adm (64 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) > > === w1064_tsign (64 bit report) === > > shell32: > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) > > === w10pro64_en_AE_u8 (64 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4962: Test failed: MKDIR: expected notification type 8, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > > === w10pro64_ar (64 bit report) === > > shell32: > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4962: Test failed: MKDIR: expected notification type 8, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) > > === w10pro64_ja (64 bit report) === > > shell32: > shlfolder.c:4962: Test failed: RMDIR: expected notification type 10, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) > > === w10pro64_zh_CN (64 bit report) === > > shell32: > shlfolder.c:4962: Test failed: RMDIR: expected notification type 10, got: 40000 > shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) > shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) These are existing failures. -- Dmitry.

June 9, 2022

Re: [PATCH v2] shell32: Implement SHBindToFolderIDListParent.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116570 Your paranoid android. === w1064v1809 (32 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w1064 (32 bit report) === shell32: shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064_tsign (32 bit report) === shell32: shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064v1809 (64 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064 (64 bit report) === shell32: shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064_2qxl (64 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_adm (64 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_tsign (64 bit report) === shell32: shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w10pro64_en_AE_u8 (64 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4962: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_ar (64 bit report) === shell32: shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4962: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4962: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_ja (64 bit report) === shell32: shlfolder.c:4962: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) === w10pro64_zh_CN (64 bit report) === shell32: shlfolder.c:4962: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4969: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4979: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

June 9, 2022

[PATCH v2] shell32: Implement SHBindToFolderIDListParent.

by Dmitry Timoshkov

Based on SHBindToParent and SHBindToObject implementations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 46 +++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..8d42f58acc7 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1364,6 +1364,52 @@ HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *p } +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, + REFIID riid, void **ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s,%p,%p\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + pdump(pidl); + + *ppv = NULL; + if (ppidlLast) + *ppidlLast = NULL; + + if (!pidl) + return E_INVALIDARG; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + else + { + LPITEMIDLIST pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + SHFree(pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, ppidlLast ? *ppidlLast : NULL, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da606a9e707..1c482c06407 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); +static HRESULT (WINAPI *pSHBindToFolderIDListParent)(IShellFolder*,LPCITEMIDLIST,REFIID,void **,LPCITEMIDLIST*); static WCHAR *make_wstr(const char *str) { @@ -89,6 +90,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) + MAKEFUNC(SHBindToFolderIDListParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -5410,6 +5412,56 @@ static void test_SHGetSetFolderCustomSettings(void) RemoveDirectoryW(pathW); } +static void test_SHBindToFolderIDListParent(void) +{ + IShellFolder *psf_desktop; + LPITEMIDLIST pidl; + HRESULT hr; + WCHAR path[MAX_PATH]; + SHITEMID empty_item = { 0, { 0 } }; + LPITEMIDLIST pidl_empty = (LPITEMIDLIST)&empty_item; + LPCITEMIDLIST pidl_last; + IShellFolder *psf; + + if (!pSHBindToFolderIDListParent) + { + win_skip("SHBindToFolderIDListParent not available\n"); + return; + } + + GetTempPathW(ARRAY_SIZE(path), path); + SHGetDesktopFolder(&psf_desktop); + + hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + pidl_last = NULL; + hr = pSHBindToFolderIDListParent(psf_desktop, pidl, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last != NULL, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl_empty, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last == pidl_empty, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, (void **)&psf, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + IShellFolder_Release(psf); + + if (0) /* crashes under Windows */ + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, NULL, NULL); + + ILFree(pidl); + IShellFolder_Release(psf_desktop); + + pidl_last = (LPITEMIDLIST)0xdeadbeef; + hr = pSHBindToFolderIDListParent(NULL, NULL, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(pidl_last == NULL, "got %p\n", pidl_last); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5417,6 +5469,7 @@ START_TEST(shlfolder) CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL); + test_SHBindToFolderIDListParent(); test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject(); -- 2.36.1

June 9, 2022

Re: [PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.

by Connor McAdams (＠cmcadams)

Not sure how this is supposed to work on a Gitlab MR, but I've force pushed a new version of the branch with changes to the accessible comparison function to hopefully make things more clear. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/216#note_1764

June 9, 2022

[PATCH v2 3/3] uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers.

by Connor McAdams

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 57 +++++++ dlls/uiautomationcore/uia_provider.c | 167 ++++++++++++++++++++- 2 files changed, 222 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6ed3c907a40..6c07edcffa8 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -89,6 +89,20 @@ static BOOL check_variant_bool(VARIANT *v, BOOL val) return FALSE; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + BOOL cmp; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + cmp = (unk1 == unk2) ? TRUE : FALSE; + + IUnknown_Release(unk1); + IUnknown_Release(unk2); + return cmp; +} + static struct Accessible { IAccessible IAccessible_iface; @@ -977,13 +991,16 @@ static void test_uia_prov_from_acc_properties(void) static void test_UiaProviderFromIAccessible(void) { + ILegacyIAccessibleProvider *accprov; IRawElementProviderSimple *elprov, *elprov2; enum ProviderOptions prov_opt; IAccessible *acc; + IUnknown *unk; WNDCLASSA cls; HRESULT hr; HWND hwnd; VARIANT v; + INT cid; CoInitializeEx(NULL, COINIT_MULTITHREADED); cls.style = 0; @@ -1084,6 +1101,26 @@ static void test_UiaProviderFromIAccessible(void) ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); VariantClear(&v); + hr = IRawElementProviderSimple_GetPatternProvider(elprov, UIA_LegacyIAccessiblePatternId, &unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!unk, "unk == NULL\n"); + ok(iface_cmp((IUnknown *)elprov, unk), "unk != elprov\n"); + + hr = IUnknown_QueryInterface(unk, &IID_ILegacyIAccessibleProvider, (void **)&accprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!accprov, "accprov == NULL\n"); + + hr = ILegacyIAccessibleProvider_get_ChildId(accprov, &cid); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(cid == CHILDID_SELF, "cid != CHILDID_SELF\n"); + + hr = ILegacyIAccessibleProvider_GetIAccessible(accprov, &acc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(acc == &Accessible.IAccessible_iface, "acc != &Accessible.IAccessible_iface\n"); + IAccessible_Release(acc); + IUnknown_Release(unk); + ILegacyIAccessibleProvider_Release(accprov); + IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); @@ -1101,6 +1138,26 @@ static void test_UiaProviderFromIAccessible(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!elprov2, "elprov != NULL\n"); + hr = IRawElementProviderSimple_GetPatternProvider(elprov, UIA_LegacyIAccessiblePatternId, &unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!unk, "unk == NULL\n"); + ok(iface_cmp((IUnknown *)elprov, unk), "unk != elprov\n"); + + hr = IUnknown_QueryInterface(unk, &IID_ILegacyIAccessibleProvider, (void **)&accprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!accprov, "accprov == NULL\n"); + + hr = ILegacyIAccessibleProvider_get_ChildId(accprov, &cid); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(cid == 1, "cid != CHILDID_SELF\n"); + + hr = ILegacyIAccessibleProvider_GetIAccessible(accprov, &acc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(acc == &Accessible.IAccessible_iface, "acc != &Accessible.IAccessible_iface\n"); + IAccessible_Release(acc); + IUnknown_Release(unk); + ILegacyIAccessibleProvider_Release(accprov); + IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 836ef4c9e9b..c05a5c0204e 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -280,6 +280,7 @@ static LONG msaa_role_to_uia_control_type(LONG role) */ struct msaa_provider { IRawElementProviderSimple IRawElementProviderSimple_iface; + ILegacyIAccessibleProvider ILegacyIAccessibleProvider_iface; LONG refcount; IAccessible *acc; @@ -321,9 +322,13 @@ static inline struct msaa_provider *impl_from_msaa_provider(IRawElementProviderS HRESULT WINAPI msaa_provider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) { + struct msaa_provider *msaa_prov = impl_from_msaa_provider(iface); + *ppv = NULL; if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + else if (IsEqualIID(riid, &IID_ILegacyIAccessibleProvider)) + *ppv = &msaa_prov->ILegacyIAccessibleProvider_iface; else return E_NOINTERFACE; @@ -368,9 +373,20 @@ HRESULT WINAPI msaa_provider_get_ProviderOptions(IRawElementProviderSimple *ifac HRESULT WINAPI msaa_provider_GetPatternProvider(IRawElementProviderSimple *iface, PATTERNID pattern_id, IUnknown **ret_val) { - FIXME("%p, %d, %p: stub!\n", iface, pattern_id, ret_val); + TRACE("%p, %d, %p\n", iface, pattern_id, ret_val); + *ret_val = NULL; - return E_NOTIMPL; + switch (pattern_id) + { + case UIA_LegacyIAccessiblePatternId: + return IRawElementProviderSimple_QueryInterface(iface, &IID_IUnknown, (void **)ret_val); + + default: + FIXME("Unimplemented patternId %d\n", pattern_id); + break; + } + + return S_OK; } HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, @@ -456,6 +472,152 @@ static const IRawElementProviderSimpleVtbl msaa_provider_vtbl = { msaa_provider_get_HostRawElementProvider, }; +/* + * ILegacyIAccessibleProvider interface for UiaProviderFromIAccessible + * providers. + */ +static inline struct msaa_provider *impl_from_msaa_acc_provider(ILegacyIAccessibleProvider *iface) +{ + return CONTAINING_RECORD(iface, struct msaa_provider, ILegacyIAccessibleProvider_iface); +} + +static HRESULT WINAPI msaa_acc_provider_QueryInterface(ILegacyIAccessibleProvider *iface, REFIID riid, void **ppv) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + return IRawElementProviderSimple_QueryInterface(&msaa_prov->IRawElementProviderSimple_iface, riid, ppv); +} + +static ULONG WINAPI msaa_acc_provider_AddRef(ILegacyIAccessibleProvider *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + return IRawElementProviderSimple_AddRef(&msaa_prov->IRawElementProviderSimple_iface); +} + +static ULONG WINAPI msaa_acc_provider_Release(ILegacyIAccessibleProvider *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + return IRawElementProviderSimple_Release(&msaa_prov->IRawElementProviderSimple_iface); +} + +static HRESULT WINAPI msaa_acc_provider_Select(ILegacyIAccessibleProvider *iface, LONG select_flags) +{ + FIXME("%p, %#lx: stub!\n", iface, select_flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_DoDefaultAction(ILegacyIAccessibleProvider *iface) +{ + FIXME("%p: stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_SetValue(ILegacyIAccessibleProvider *iface, LPCWSTR val) +{ + FIXME("%p, %p<%s>: stub!\n", iface, val, debugstr_w(val)); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_GetIAccessible(ILegacyIAccessibleProvider *iface, + IAccessible **out_acc) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + + TRACE("%p, %p\n", iface, out_acc); + + IAccessible_AddRef(msaa_prov->acc); + *out_acc = msaa_prov->acc; + + return S_OK; +} + +static HRESULT WINAPI msaa_acc_provider_get_ChildId(ILegacyIAccessibleProvider *iface, int *out_cid) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_acc_provider(iface); + + TRACE("%p, %p\n", iface, out_cid); + *out_cid = V_I4(&msaa_prov->cid); + + return S_OK; +} + +static HRESULT WINAPI msaa_acc_provider_get_Name(ILegacyIAccessibleProvider *iface, BSTR *out_name) +{ + FIXME("%p, %p: stub!\n", iface, out_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_Value(ILegacyIAccessibleProvider *iface, BSTR *out_value) +{ + FIXME("%p, %p: stub!\n", iface, out_value); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_Description(ILegacyIAccessibleProvider *iface, + BSTR *out_description) +{ + FIXME("%p, %p: stub!\n", iface, out_description); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_Role(ILegacyIAccessibleProvider *iface, DWORD *out_role) +{ + FIXME("%p, %p: stub!\n", iface, out_role); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_State(ILegacyIAccessibleProvider *iface, DWORD *out_state) +{ + FIXME("%p, %p: stub!\n", iface, out_state); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_Help(ILegacyIAccessibleProvider *iface, BSTR *out_help) +{ + FIXME("%p, %p: stub!\n", iface, out_help); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_KeyboardShortcut(ILegacyIAccessibleProvider *iface, + BSTR *out_kbd_shortcut) +{ + FIXME("%p, %p: stub!\n", iface, out_kbd_shortcut); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_GetSelection(ILegacyIAccessibleProvider *iface, + SAFEARRAY **out_selected) +{ + FIXME("%p, %p: stub!\n", iface, out_selected); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_acc_provider_get_DefaultAction(ILegacyIAccessibleProvider *iface, + BSTR *out_default_action) +{ + FIXME("%p, %p: stub!\n", iface, out_default_action); + return E_NOTIMPL; +} + +static const ILegacyIAccessibleProviderVtbl msaa_acc_provider_vtbl = { + msaa_acc_provider_QueryInterface, + msaa_acc_provider_AddRef, + msaa_acc_provider_Release, + msaa_acc_provider_Select, + msaa_acc_provider_DoDefaultAction, + msaa_acc_provider_SetValue, + msaa_acc_provider_GetIAccessible, + msaa_acc_provider_get_ChildId, + msaa_acc_provider_get_Name, + msaa_acc_provider_get_Value, + msaa_acc_provider_get_Description, + msaa_acc_provider_get_Role, + msaa_acc_provider_get_State, + msaa_acc_provider_get_Help, + msaa_acc_provider_get_KeyboardShortcut, + msaa_acc_provider_GetSelection, + msaa_acc_provider_get_DefaultAction, +}; + /*********************************************************************** * UiaProviderFromIAccessible (uiautomationcore.@) */ @@ -511,6 +673,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD return E_OUTOFMEMORY; msaa_prov->IRawElementProviderSimple_iface.lpVtbl = &msaa_provider_vtbl; + msaa_prov->ILegacyIAccessibleProvider_iface.lpVtbl = &msaa_acc_provider_vtbl; msaa_prov->refcount = 1; msaa_prov->hwnd = hwnd; variant_init_i4(&msaa_prov->cid, child_id); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/216

June 9, 2022