May 2022 - Wine-commits - list.winehq.org

Paul Gofman : iphlpapi: Don't request unused dynamic interface data.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1a782a52153a4b16fba0ce22ee1cc24ebc7b45a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a782a52153a4b16fba0ce22… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 17:22:21 2022 -0500 iphlpapi: Don't request unused dynamic interface data. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0bd7cdc06c8..5a4acdb9c5a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -598,7 +598,6 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) DWORD len, i, uni, fwd; NET_LUID *if_keys = NULL; struct nsi_ndis_ifinfo_rw *if_rw = NULL; - struct nsi_ndis_ifinfo_dynamic *if_dyn = NULL; struct nsi_ndis_ifinfo_static *if_stat = NULL; struct nsi_ipv4_unicast_key *uni_keys = NULL; struct nsi_ip_unicast_rw *uni_rw = NULL; @@ -612,7 +611,8 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&if_keys, sizeof(*if_keys), (void **)&if_rw, sizeof(*if_rw), - (void **)&if_dyn, sizeof(*if_dyn), (void **)&if_stat, sizeof(*if_stat), &if_count, 0 ); + NULL, 0, (void **)&if_stat, sizeof(*if_stat), &if_count, 0 ); + if (err) return err; for (i = 0; i < if_count; i++) { @@ -726,7 +726,7 @@ err: heap_free( wins_servers ); NsiFreeTable( fwd_keys, NULL, NULL, NULL ); NsiFreeTable( uni_keys, uni_rw, NULL, NULL ); - NsiFreeTable( if_keys, if_rw, if_dyn, if_stat ); + NsiFreeTable( if_keys, if_rw, NULL, if_stat ); return err; }

1 0

Zhiyi Zhang : include: Add D3DKMTQueryVideoMemoryInfo() definition.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4cf797d4d8c2b5af5ef8b46f9d7290e5333f8756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cf797d4d8c2b5af5ef8b46f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:30 2022 +0800 include: Add D3DKMTQueryVideoMemoryInfo() definition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/d3dkmthk.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 663a5d31ada..aaebcb39e2e 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -30,6 +30,12 @@ typedef enum _D3DKMT_VIDPNSOURCEOWNER_TYPE D3DKMT_VIDPNSOURCEOWNER_EMULATED = 4 } D3DKMT_VIDPNSOURCEOWNER_TYPE; +typedef enum _D3DKMT_MEMORY_SEGMENT_GROUP +{ + D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL = 0, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1 +} D3DKMT_MEMORY_SEGMENT_GROUP; + typedef struct _D3DKMT_CREATEDEVICEFLAGS { UINT LegacyMode : 1; @@ -603,6 +609,18 @@ typedef struct _D3DKMT_QUERYSTATISTICS } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef struct _D3DKMT_QUERYVIDEOMEMORYINFO +{ + HANDLE hProcess; + D3DKMT_HANDLE hAdapter; + D3DKMT_MEMORY_SEGMENT_GROUP MemorySegmentGroup; + UINT64 Budget; + UINT64 CurrentUsage; + UINT64 CurrentReservation; + UINT64 AvailableForReservation; + UINT PhysicalAdapterIndex; +} D3DKMT_QUERYVIDEOMEMORYINFO; + typedef enum _D3DKMT_QUEUEDLIMIT_TYPE { D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, @@ -664,6 +682,7 @@ NTSTATUS WINAPI D3DKMTEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTQueryVideoMemoryInfo(D3DKMT_QUERYVIDEOMEMORYINFO *desc); NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc);

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 37b74e644a9011e9c79c2540c4bb7152555037a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b74e644a9011e9c79c2540… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:41 2022 +0800 gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3d25eacacd9..5117d34908d 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -48,8 +48,27 @@ static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFRO static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); +static NTSTATUS (WINAPI *pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); static HRESULT (WINAPI *pDwmEnableComposition)(UINT); +static BOOL get_primary_adapter_name(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD adapter_idx; + + dd.cb = sizeof(dd); + for (adapter_idx = 0; EnumDisplayDevicesW(NULL, adapter_idx, &dd, 0); ++adapter_idx) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; @@ -886,6 +905,91 @@ static void test_D3DKMTOpenAdapterFromDeviceName(void) winetest_pop_context(); } +static void test_D3DKMTQueryVideoMemoryInfo(void) +{ + static const D3DKMT_MEMORY_SEGMENT_GROUP groups[] = {D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL}; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + unsigned int i; + BOOL ret; + + if (!pD3DKMTQueryVideoMemoryInfo) + { + skip("D3DKMTQueryVideoMemoryInfo() is unavailable.\n"); + return; + } + + ret = get_primary_adapter_name(open_adapter_desc.DeviceName); + ok(ret, "Failed to get primary adapter name.\n"); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Normal query */ + for (i = 0; i < ARRAY_SIZE(groups); ++i) + { + winetest_push_context("group %d", groups[i]); + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + query_memory_info.PhysicalAdapterIndex = 0; + query_memory_info.MemorySegmentGroup = groups[i]; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + ok(query_memory_info.Budget >= query_memory_info.AvailableForReservation, + "Unexpected budget %I64u and reservation %I64u.\n", query_memory_info.Budget, + query_memory_info.AvailableForReservation); + ok(query_memory_info.CurrentUsage <= query_memory_info.Budget, + "Unexpected current usage %I64u.\n", query_memory_info.CurrentUsage); + ok(query_memory_info.CurrentReservation == 0, + "Unexpected current reservation %I64u.\n", query_memory_info.CurrentReservation); + + winetest_pop_context(); + } + + /* Query using the current process handle */ + query_memory_info.hProcess = GetCurrentProcess(); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Query using a process handle without PROCESS_QUERY_INFORMATION privilege */ + query_memory_info.hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId()); + ok(!!query_memory_info.hProcess, "OpenProcess failed, error %ld.\n", GetLastError()); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_ACCESS_DENIED, "Got unexpected return code %#lx.\n", status); + CloseHandle(query_memory_info.hProcess); + query_memory_info.hProcess = NULL; + + /* Query using an invalid process handle */ + query_memory_info.hProcess = (HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected return code %#lx.\n", status); + query_memory_info.hProcess = NULL; + + /* Query using an invalid adapter handle */ + query_memory_info.hAdapter = (D3DKMT_HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + + /* Query using an invalid adapter index */ + query_memory_info.PhysicalAdapterIndex = 99; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.PhysicalAdapterIndex = 0; + + /* Query using an invalid memory segment group */ + query_memory_info.MemorySegmentGroup = D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -900,6 +1004,7 @@ START_TEST(driver) pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + pD3DKMTQueryVideoMemoryInfo = (void *)GetProcAddress(gdi32, "D3DKMTQueryVideoMemoryInfo"); if (dwmapi) pDwmEnableComposition = (void *)GetProcAddress(dwmapi, "DwmEnableComposition"); @@ -913,6 +1018,7 @@ START_TEST(driver) test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); test_D3DKMTOpenAdapterFromDeviceName(); + test_D3DKMTQueryVideoMemoryInfo(); FreeLibrary(dwmapi); }

1 0

Zhiyi Zhang : winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4a98b07c4bcc35a698448261478ba856c149cbea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a98b07c4bcc35a698448261… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:53 2022 +0800 winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid(). The Vulkan device is used for querying video memory information for implementing D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dibdrv/dc.c | 4 + dlls/win32u/driver.c | 19 ++++ dlls/win32u/emfdrv.c | 2 + dlls/win32u/font.c | 2 + dlls/win32u/gdiobj.c | 3 + dlls/win32u/path.c | 2 + dlls/win32u/syscall.c | 3 - dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 +++ dlls/wineps.drv/init.c | 2 + dlls/winex11.drv/init.c | 2 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 250 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 2 + dlls/wow64win/gdi.c | 34 ------ dlls/wow64win/syscall.h | 3 - include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 2 + 19 files changed, 317 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a98b07c4bcc35a69844…

1 0

Zhiyi Zhang : gdi32: Implement D3DKMTQueryVideoMemoryInfo().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8bc0c8d64604945540ba37b41becf343a2ae4a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc0c8d64604945540ba37b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:18:12 2022 +0800 gdi32: Implement D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/dibdrv/dc.c | 2 ++ dlls/win32u/driver.c | 37 ++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 1 + dlls/win32u/font.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/path.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/ntgdi.h | 1 + include/wine/gdi_driver.h | 1 + 18 files changed, 118 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc0c8d64604945540ba…

1 0

Nikolay Sivov : mfreadwrite/reader: Propagate resource sharing mode to the sample allocator.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 5b04d18945c547144bf692f6418af5ec25315835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b04d18945c547144bf692f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 15:30:47 2022 +0300 mfreadwrite/reader: Propagate resource sharing mode to the sample allocator. Issue found by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 741ef93f367..b1175479dec 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1651,9 +1651,30 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } +static HRESULT source_reader_create_sample_allocator_attributes(const struct source_reader *reader, + IMFAttributes **attributes) +{ + UINT32 shared = 0, shared_without_mutex = 0; + HRESULT hr; + + if (FAILED(hr = MFCreateAttributes(attributes, 1))) + return hr; + + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared); + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex); + + if (shared_without_mutex) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + else if (shared) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED, TRUE); + + return hr; +} + static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; + IMFAttributes *attributes = NULL; GUID major = { 0 }; HRESULT hr; @@ -1680,8 +1701,17 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader return hr; } - if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) + if (FAILED(hr = source_reader_create_sample_allocator_attributes(reader, &attributes))) + WARN("Failed to create allocator attributes, hr %#lx.\n", hr); + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, + attributes, stream->current))) + { WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); + } + + if (attributes) + IMFAttributes_Release(attributes); return hr; }

1 0

Connor McAdams : oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1621a5f42780d356acf485e89fab650e1d352e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1621a5f42780d356acf485e8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 14:38:31 2022 +0200 oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..780919c2ab5 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -62,6 +62,8 @@ DEFINE_EXPECT(Accessible_get_accParent); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); + static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); static BOOL init(void) @@ -684,7 +686,8 @@ static void test_AccessibleObjectFromWindow(void) static void test_AccessibleObjectFromEvent(void) { - IAccessible *acc; + IAccessible *acc, *acc2; + IServiceProvider *sp; VARIANT cid; HRESULT hr; HWND hwnd; @@ -720,6 +723,21 @@ static void test_AccessibleObjectFromEvent(void) CHECK_CALLED(Accessible_get_accChild); ok(hr == S_OK, "got %#lx\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); + /* Get &Accessible out of the Dynamic Annotation IAccessible wrapper. */ + if (!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible)) + { + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&sp); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!sp, "sp == NULL\n"); + + hr = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, &IID_IAccessible, + (void**)&acc2); + ok(hr == S_OK, "got %#lx\n", hr); + ok(iface_cmp((IUnknown*)acc2, (IUnknown*)&Accessible), "acc != &Accessible\n"); + IAccessible_Release(acc2); + IServiceProvider_Release(sp); + } + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); ok(V_I4(&cid) == 1, "got %#lx, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent);

1 0

Connor McAdams : oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 92fe1c3cf02148050cf375283087812498cf776a URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fe1c3cf02148050cf37528… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 14:38:35 2022 +0200 oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 53 ++++++++++++++++--- dlls/oleacc/tests/main.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index dced84be7b5..062884f9bf4 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -30,6 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +#define NAVDIR_INTERNAL_HWND 10 +DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); + extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; @@ -400,35 +403,71 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) { + IServiceProvider *sp; + IAccessible *acc2; IDispatch *parent; IOleWindow *ow; + VARIANT v, cid; HRESULT hres; TRACE("%p %p\n", acc, phwnd); - IAccessible_AddRef(acc); + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + if(SUCCEEDED(hres) && *phwnd) + return S_OK; + } + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hres = IAccessible_accNavigate(acc, NAVDIR_INTERNAL_HWND, cid, &v); + if(SUCCEEDED(hres)) { + if(hres == S_OK && V_VT(&v) == VT_I4 && V_I4(&v)) { + *phwnd = LongToHandle(V_I4(&v)); + return S_OK; + } + /* native leaks v here */ + VariantClear(&v); + } + + hres = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void**)&sp); + if(SUCCEEDED(hres)) { + hres = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, + &IID_IAccessible, (void**)&acc2); + IServiceProvider_Release(sp); + } + if(FAILED(hres)) { + acc2 = acc; + IAccessible_AddRef(acc2); + } + while(1) { - hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + hres = IAccessible_QueryInterface(acc2, &IID_IOleWindow, (void**)&ow); if(SUCCEEDED(hres)) { hres = IOleWindow_GetWindow(ow, phwnd); IOleWindow_Release(ow); - IAccessible_Release(acc); - return hres; + if(SUCCEEDED(hres)) { + IAccessible_Release(acc2); + return hres; + } } hres = IAccessible_get_accParent(acc, &parent); - IAccessible_Release(acc); + IAccessible_Release(acc2); if(FAILED(hres)) return hres; - if(hres!=S_OK || !parent) { + if(!parent) { *phwnd = NULL; return hres; } - hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc2); IDispatch_Release(parent); if(FAILED(hres)) return hres; + acc = acc2; } } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 780919c2ab5..a0ab3eb2fb0 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -59,9 +59,12 @@ DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); DEFINE_EXPECT(Accessible_get_accName); DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); +#define NAVDIR_INTERNAL_HWND 10 DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -93,7 +96,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +static IAccessible Accessible; static IAccessible Accessible_child; +static IOleWindow OleWindow; +static HWND Accessible_hwnd; +static HWND OleWindow_hwnd; static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) @@ -106,6 +113,12 @@ static HRESULT WINAPI Accessible_QueryInterface( return S_OK; } + if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) { + *ppvObject = &OleWindow; + IOleWindow_AddRef(&OleWindow); + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; @@ -157,11 +170,16 @@ static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { if(iface == &Accessible_child) + { CHECK_EXPECT(Accessible_child_get_accParent); + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, + (void **)ppdispParent); + } else CHECK_EXPECT(Accessible_get_accParent); - return E_NOTIMPL; + *ppdispParent = NULL; + return S_FALSE; } static HRESULT WINAPI Accessible_get_accChildCount( @@ -297,7 +315,21 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG navDir, VARIANT varStart, VARIANT *pvarEnd) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); + + /* + * Magic number value for retrieving an HWND. Used by DynamicAnnotation + * IAccessible wrapper. + */ + if(navDir == NAVDIR_INTERNAL_HWND && Accessible_hwnd) { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = HandleToULong(Accessible_hwnd); + return Accessible_hwnd ? S_OK : S_FALSE; + } + return E_NOTIMPL; } @@ -360,8 +392,47 @@ static IAccessibleVtbl AccessibleVtbl = { Accessible_put_accValue }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj) +{ + return IAccessible_QueryInterface(&Accessible, riid, obj); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + return IAccessible_AddRef(&Accessible); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + return IAccessible_Release(&Accessible); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) +{ + if(OleWindow_hwnd) { + *hwnd = OleWindow_hwnd; + return S_OK; + } + return E_FAIL; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = { + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + static IAccessible Accessible = {&AccessibleVtbl}; static IAccessible Accessible_child = {&AccessibleVtbl}; +static IOleWindow OleWindow = {&OleWindowVtbl}; static void test_getroletext(void) { @@ -1844,6 +1915,59 @@ static void test_default_edit_accessible_object(void) DestroyWindow(hwnd); } +static void test_WindowFromAccessibleObject(void) +{ + HRESULT hr; + HWND hwnd; + + /* Successfully retrieve an HWND from the IOleWindow interface. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + + /* Successfully retrieve an HWND from IAccessible::accNavigate. */ + Accessible_hwnd = (HWND)0xdeadf00d; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + /* This value gets sign-extended on 64-bit. */ + ok(hwnd == IntToPtr(0xdeadf00d), "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_accNavigate); + + /* Don't return an HWND from either method. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + SET_EXPECT(Accessible_get_accParent); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + /* Return value from IAccessible::get_accParent. */ + ok(hr == S_FALSE, "got %lx\n", hr); + ok(!hwnd, "hwnd %p\n", hwnd); + CHECK_CALLED(Accessible_accNavigate); + CHECK_CALLED(Accessible_get_accParent); + + /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + hr = WindowFromAccessibleObject(&Accessible_child, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + + Accessible_hwnd = NULL; + OleWindow_hwnd = NULL; +} + START_TEST(main) { int argc; @@ -1885,6 +2009,7 @@ START_TEST(main) test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); + test_WindowFromAccessibleObject(); unregister_window_class(); CoUninitialize();

1 0

Piotr Caban : oleacc: Store test IAccessible data in structure.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 3dbfe812b6f0333c0041fd8ebe736e3947a93ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dbfe812b6f0333c0041fd8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:40 2022 +0200 oleacc: Store test IAccessible data in structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 147 +++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dbfe812b6f0333c0041…

1 0

Piotr Caban : oleacc: Add IAccessible refcount tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 32cd910bde51a23d1263ec99e18a753510b657d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cd910bde51a23d1263ec99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:48 2022 +0200 oleacc: Add IAccessible refcount tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index cbbc98e4742..532c5d71257 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -100,6 +100,7 @@ static struct Accessible { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + LONG ref; IAccessible *parent; HWND acc_hwnd; @@ -140,12 +141,14 @@ static HRESULT WINAPI Accessible_QueryInterface( static ULONG WINAPI Accessible_AddRef(IAccessible *iface) { - return 2; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI Accessible_Release(IAccessible *iface) { - return 1; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedDecrement(&This->ref); } static HRESULT WINAPI Accessible_GetTypeInfoCount( @@ -226,9 +229,11 @@ static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, return S_FALSE; case 3: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_OK; case 4: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_FALSE; default: ok(0, "unexpected call\n"); @@ -464,6 +469,7 @@ static struct Accessible Accessible = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, NULL, 0, 0 }; @@ -471,6 +477,7 @@ static struct Accessible Accessible_child = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, &Accessible.IAccessible_iface, 0, 0 }; @@ -906,6 +913,8 @@ static void test_AccessibleObjectFromEvent(void) IAccessible_Release(acc); DestroyWindow(hwnd); + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } static void test_GetProcessHandleFromHwnd(void) @@ -1014,6 +1023,9 @@ static void test_AccessibleChildren(IAccessible *acc) IDispatch_Release(V_DISPATCH(children+1)); } ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); + + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } #define check_acc_state(acc, state) _check_acc_state(__LINE__, acc, state) @@ -2003,6 +2015,8 @@ static void test_WindowFromAccessibleObject(void) CHECK_CALLED(Accessible_child_get_accParent); Accessible.ow_hwnd = NULL; + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } START_TEST(main)

1 0