September 2023 - Wine-Commits

Henri Verbeet : vkd3d-shader: Add a \since 1.9 for VKD3D_SHADER_SV_TARGET.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: vkd3d Branch: master Commit: 0f2dd5f9bed32ef0a730f53c77caf3bddfd862e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f2dd5f9bed32ef0a730f53c77caf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:31:38 2023 +0200 vkd3d-shader: Add a \since 1.9 for VKD3D_SHADER_SV_TARGET. --- 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 e7ac3d62..aa3cca49 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1463,7 +1463,7 @@ enum vkd3d_shader_sysval_semantic VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, - /** Render target; SV_Target in Direct3D shader model 6 shaders. */ + /** Render target; SV_Target in Direct3D shader model 6 shaders. \since 1.9 */ VKD3D_SHADER_SV_TARGET = 0x40, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC),

1 0

Henri Verbeet : vkd3d-shader: Slightly tweak the documentation for VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: vkd3d Branch: master Commit: 054ae10693f30608852a181b70835b9ef26a1d3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/054ae10693f30608852a181b70835… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:34:23 2023 +0200 vkd3d-shader: Slightly tweak the documentation for VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER. --- include/vkd3d_shader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index aa3cca49..fc2c1257 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -144,6 +144,7 @@ enum vkd3d_shader_compile_option_formatting_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FLAGS), }; +/** Determines how matrices are stored. \since 1.9 */ enum vkd3d_shader_compile_option_pack_matrix_order { VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR = 0x00000001, @@ -183,7 +184,7 @@ enum vkd3d_shader_compile_option_name */ VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE = 0x00000006, /** - * This option specifies default matrix packing order. It's only supported for HLSL source type. + * This option specifies default matrix packing order for HLSL sources. * Explicit variable modifiers or pragmas will take precedence. * * \a value is a member of enum vkd3d_shader_compile_option_pack_matrix_order.

1 0

Henri Verbeet : build: Add vkd3d_shader_utils.h to libvkd3d_la_SOURCES.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: vkd3d Branch: master Commit: 46c7f65be8337a108a04a616ccd0c8a773216f3f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46c7f65be8337a108a04a616ccd0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 17:28:19 2023 +0200 build: Add vkd3d_shader_utils.h to libvkd3d_la_SOURCES. --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e869df1f..d20e9272 100644 --- a/Makefile.am +++ b/Makefile.am @@ -310,8 +310,9 @@ libvkd3d_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ - include/private/vkd3d_utf8.h \ + include/private/vkd3d_shader_utils.h \ include/private/vkd3d_test.h \ + include/private/vkd3d_utf8.h \ include/vkd3d_d3d12.idl \ include/vkd3d_d3dcommon.idl \ include/vkd3d_unknown.idl \

1 0

Connor McAdams : uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 46b78c5d6dd0acdca8361815bc45d6e57849f169 URL: https://gitlab.winehq.org/wine/wine/-/commit/46b78c5d6dd0acdca8361815bc45d6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 10:56:52 2023 -0400 uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 7 +++++++ dlls/uiautomationcore/uia_provider.c | 27 ++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index d4da880c038..ec2e7e31d6b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3473,6 +3473,12 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) ok(!!elroot, "elroot == NULL\n"); CHECK_CALLED(winproc_GETOBJECT_CLIENT); + /* + * ILegacyIAccessibleProvider::GetIAccessible returns a NULL + * IAccessible if the provider represents an oleacc proxy. + */ + check_msaa_prov_acc(elroot, NULL, CHILDID_SELF); + /* * Returns a provider from get_HostRawElementProvider without having * to query the HWND. @@ -3494,6 +3500,7 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) IRawElementProviderFragment_Release(elfrag2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elroot2, "elroot2 == NULL\n"); + check_msaa_prov_acc(elroot2, NULL, CHILDID_SELF); CHECK_CALLED(winproc_GETOBJECT_CLIENT); ok(!iface_cmp((IUnknown *)elroot, (IUnknown *)elroot2), "elroot2 == elroot\n"); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index cb945796f50..729dc7ab2c5 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -84,6 +84,21 @@ static IAccessible *msaa_acc_da_unwrap(IAccessible *acc) return acc; } +static BOOL msaa_acc_is_oleacc_proxy(IAccessible *acc) +{ + IUnknown *unk; + HRESULT hr; + + hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + if (SUCCEEDED(hr) && unk) + { + IUnknown_Release(unk); + return TRUE; + } + + return FALSE; +} + /* * Compare role, state, child count, and location properties of the two * IAccessibles. If all four are successfully retrieved and are equal, this is @@ -1103,10 +1118,11 @@ static HRESULT WINAPI msaa_acc_provider_GetIAccessible(ILegacyIAccessibleProvide TRACE("%p, %p\n", iface, out_acc); - IAccessible_AddRef(msaa_prov->acc); - *out_acc = msaa_prov->acc; + *out_acc = NULL; + if (msaa_acc_is_oleacc_proxy(msaa_prov->acc)) + return S_OK; - return S_OK; + return IAccessible_QueryInterface(msaa_prov->acc, &IID_IAccessible, (void **)out_acc); } static HRESULT WINAPI msaa_acc_provider_get_ChildId(ILegacyIAccessibleProvider *iface, int *out_cid) @@ -1252,7 +1268,6 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD IRawElementProviderSimple **elprov) { HWND hwnd = NULL; - IUnknown *unk; HRESULT hr; TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); @@ -1271,11 +1286,9 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD return E_NOTIMPL; } - hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); - if (SUCCEEDED(hr) && unk) + if (msaa_acc_is_oleacc_proxy(acc)) { WARN("Cannot wrap an oleacc proxy IAccessible!\n"); - IUnknown_Release(unk); return E_INVALIDARG; }

1 0

Connor McAdams : uiautomationcore/tests: Add support for debug printing Provider method calls.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: b88365a0acc32875eb47bb3d43fb3e222d047cf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b88365a0acc32875eb47bb3d43fb3e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 6 11:00:01 2023 -0400 uiautomationcore/tests: Add support for debug printing Provider method calls. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 308 +++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+)

1 0

Connor McAdams : uiautomationcore: Add stub IRawElementProviderFragmentRoot implementation for MSAA providers.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 32814b87857b995d824b8a4832e1b114889bbb28 URL: https://gitlab.winehq.org/wine/wine/-/commit/32814b87857b995d824b8a4832e1b1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Aug 29 09:42:55 2023 -0400 uiautomationcore: Add stub IRawElementProviderFragmentRoot implementation for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 25 +++++++++++++ dlls/uiautomationcore/uia_provider.c | 56 ++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 9a13a5bb7a8..408e90c2046 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -431,6 +431,20 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return cmp; } +#define test_implements_interface( unk, iid, exp_implemented ) \ + test_implements_interface_( ((IUnknown *)(unk)), (iid), (exp_implemented), __FILE__, __LINE__) +static void test_implements_interface_(IUnknown *unk, const GUID *iid, BOOL exp_implemented, const char *file, int line) +{ + IUnknown *unk2 = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, iid, (void **)&unk2); + ok_(file, line)(hr == (exp_implemented ? S_OK : E_NOINTERFACE), "Unexpected hr %#lx\n", hr); + ok_(file, line)(!!unk2 == exp_implemented, "Unexpected iface %p\n", unk2); + if (unk2) + IUnknown_Release(unk2); +} + #define DEFINE_ACC_METHOD_EXPECT(method) \ int expect_ ## method , called_ ## method @@ -4435,6 +4449,8 @@ static void test_UiaProviderFromIAccessible(void) broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ "Unexpected provider options %#x\n", prov_opt); + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_ProviderDescriptionPropertyId, &v); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); @@ -4468,6 +4484,9 @@ static void test_UiaProviderFromIAccessible(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); + /* Even simple children implement IRawElementProviderFragmentRoot. */ + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + /* * Simple child element (IAccessible without CHILDID_SELF) cannot be root * IAccessible. No checks against the root HWND IAccessible will be done. @@ -4527,6 +4546,12 @@ static void test_UiaProviderFromIAccessible(void) CHECK_ACC_METHOD_CALLED(&Accessible, accLocation); CHECK_ACC_METHOD_CALLED(&Accessible, get_accName); + /* + * Interface that isn't the HWND root, still implements + * IRawElementProviderFragmentRoot. + */ + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + /* Second call won't send WM_GETOBJECT. */ elprov2 = (void *)0xdeadbeef; hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index b16077b607c..abf97a60f08 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -486,6 +486,7 @@ static LONG msaa_role_to_uia_control_type(LONG role) struct msaa_provider { IRawElementProviderSimple IRawElementProviderSimple_iface; IRawElementProviderFragment IRawElementProviderFragment_iface; + IRawElementProviderFragmentRoot IRawElementProviderFragmentRoot_iface; ILegacyIAccessibleProvider ILegacyIAccessibleProvider_iface; LONG refcount; @@ -539,6 +540,8 @@ HRESULT WINAPI msaa_provider_QueryInterface(IRawElementProviderSimple *iface, RE *ppv = iface; else if (IsEqualIID(riid, &IID_IRawElementProviderFragment)) *ppv = &msaa_prov->IRawElementProviderFragment_iface; + else if (IsEqualIID(riid, &IID_IRawElementProviderFragmentRoot)) + *ppv = &msaa_prov->IRawElementProviderFragmentRoot_iface; else if (IsEqualIID(riid, &IID_ILegacyIAccessibleProvider)) *ppv = &msaa_prov->ILegacyIAccessibleProvider_iface; else @@ -976,6 +979,58 @@ static const IRawElementProviderFragmentVtbl msaa_fragment_vtbl = { msaa_fragment_get_FragmentRoot, }; +/* + * IRawElementProviderFragmentRoot interface for UiaProviderFromIAccessible + * providers. + */ +static inline struct msaa_provider *impl_from_msaa_fragment_root(IRawElementProviderFragmentRoot *iface) +{ + return CONTAINING_RECORD(iface, struct msaa_provider, IRawElementProviderFragmentRoot_iface); +} + +static HRESULT WINAPI msaa_fragment_root_QueryInterface(IRawElementProviderFragmentRoot *iface, REFIID riid, + void **ppv) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_QueryInterface(&msaa_prov->IRawElementProviderSimple_iface, riid, ppv); +} + +static ULONG WINAPI msaa_fragment_root_AddRef(IRawElementProviderFragmentRoot *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_AddRef(&msaa_prov->IRawElementProviderSimple_iface); +} + +static ULONG WINAPI msaa_fragment_root_Release(IRawElementProviderFragmentRoot *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_Release(&msaa_prov->IRawElementProviderSimple_iface); +} + +static HRESULT WINAPI msaa_fragment_root_ElementProviderFromPoint(IRawElementProviderFragmentRoot *iface, + double x, double y, IRawElementProviderFragment **ret_val) +{ + FIXME("%p, %f, %f, %p: stub!\n", iface, x, y, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_root_GetFocus(IRawElementProviderFragmentRoot *iface, + IRawElementProviderFragment **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static const IRawElementProviderFragmentRootVtbl msaa_fragment_root_vtbl = { + msaa_fragment_root_QueryInterface, + msaa_fragment_root_AddRef, + msaa_fragment_root_Release, + msaa_fragment_root_ElementProviderFromPoint, + msaa_fragment_root_GetFocus, +}; + /* * ILegacyIAccessibleProvider interface for UiaProviderFromIAccessible * providers. @@ -1143,6 +1198,7 @@ HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL kn msaa_prov->IRawElementProviderSimple_iface.lpVtbl = &msaa_provider_vtbl; msaa_prov->IRawElementProviderFragment_iface.lpVtbl = &msaa_fragment_vtbl; + msaa_prov->IRawElementProviderFragmentRoot_iface.lpVtbl = &msaa_fragment_root_vtbl; msaa_prov->ILegacyIAccessibleProvider_iface.lpVtbl = &msaa_acc_provider_vtbl; msaa_prov->refcount = 1; variant_init_i4(&msaa_prov->cid, child_id);

1 0

Connor McAdams : uiautomationcore/tests: Add support for debug printing Accessible method calls.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: a065e8e9c79a591b4e843505cdfd3c480e1595d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a065e8e9c79a591b4e843505cdfd3c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Aug 25 12:31:47 2023 -0400 uiautomationcore/tests: Add support for debug printing Accessible method calls. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)

1 0

Connor McAdams : uiautomationcore: Add a common helper function for querying IServiceProvider on IAccessible interfaces.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 008c1c11286ff51c1c0fb2477990311af3ef55ba URL: https://gitlab.winehq.org/wine/wine/-/commit/008c1c11286ff51c1c0fb247799031… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 10:30:32 2023 -0400 uiautomationcore: Add a common helper function for querying IServiceProvider on IAccessible interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 57 ++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index abf97a60f08..b647c545b38 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -40,20 +40,29 @@ static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) return FALSE; } +static HRESULT msaa_acc_get_service(IAccessible *acc, REFGUID sid, REFIID riid, void **service) +{ + IServiceProvider *sp; + HRESULT hr; + + *service = NULL; + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&sp); + if (FAILED(hr)) + return hr; + + hr = IServiceProvider_QueryService(sp, sid, riid, (void **)service); + IServiceProvider_Release(sp); + return hr; +} + static IAccessible2 *msaa_acc_get_ia2(IAccessible *acc) { - IServiceProvider *serv_prov; IAccessible2 *ia2 = NULL; HRESULT hr; - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&serv_prov); - if (SUCCEEDED(hr)) - { - hr = IServiceProvider_QueryService(serv_prov, &IID_IAccessible2, &IID_IAccessible2, (void **)&ia2); - IServiceProvider_Release(serv_prov); - if (SUCCEEDED(hr) && ia2) - return ia2; - } + hr = msaa_acc_get_service(acc, &IID_IAccessible2, &IID_IAccessible2, (void **)&ia2); + if (SUCCEEDED(hr) && ia2) + return ia2; hr = IAccessible_QueryInterface(acc, &IID_IAccessible2, (void **)&ia2); if (SUCCEEDED(hr) && ia2) @@ -64,17 +73,10 @@ static IAccessible2 *msaa_acc_get_ia2(IAccessible *acc) static IAccessible *msaa_acc_da_unwrap(IAccessible *acc) { - IServiceProvider *sp; IAccessible *acc2; HRESULT hr; - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void**)&sp); - if (SUCCEEDED(hr)) - { - hr = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, &IID_IAccessible, (void**)&acc2); - IServiceProvider_Release(sp); - } - + hr = msaa_acc_get_service(acc, &SID_AccFromDAWrapper, &IID_IAccessible, (void **)&acc2); if (SUCCEEDED(hr) && acc2) return acc2; @@ -1231,8 +1233,8 @@ HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL kn HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags, IRawElementProviderSimple **elprov) { - IServiceProvider *serv_prov; HWND hwnd = NULL; + IUnknown *unk; HRESULT hr; TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); @@ -1251,21 +1253,12 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD return E_NOTIMPL; } - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&serv_prov); - if (SUCCEEDED(hr)) + hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + if (SUCCEEDED(hr) && unk) { - IUnknown *unk; - - hr = IServiceProvider_QueryService(serv_prov, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); - if (SUCCEEDED(hr)) - { - WARN("Cannot wrap an oleacc proxy IAccessible!\n"); - IUnknown_Release(unk); - IServiceProvider_Release(serv_prov); - return E_INVALIDARG; - } - - IServiceProvider_Release(serv_prov); + WARN("Cannot wrap an oleacc proxy IAccessible!\n"); + IUnknown_Release(unk); + return E_INVALIDARG; } hr = WindowFromAccessibleObject(acc, &hwnd);

1 0

Connor McAdams : uiautomationcore/tests: Add method expect definitions for all Accessible test interfaces.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 9c091d3edbfecd7029cbd77ef7cb73b4418d7f27 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c091d3edbfecd7029cbd77ef7cb73… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Aug 25 11:38:04 2023 -0400 uiautomationcore/tests: Add method expect definitions for all Accessible test interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 1013 ++++++++++++++-------------- 1 file changed, 518 insertions(+), 495 deletions(-)

1 0

Rémi Bernon : dmime: Use segment_append_track in Clone and parse_track_form.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: a4c1dec89d84ff95f97da8e0dee5f9622d99a42e URL: https://gitlab.winehq.org/wine/wine/-/commit/a4c1dec89d84ff95f97da8e0dee5f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 15 11:14:08 2023 +0200 dmime: Use segment_append_track in Clone and parse_track_form. --- dlls/dmime/segment.c | 46 +++++++++++----------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 8b5f12243d9..a72ec786623 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -407,14 +407,12 @@ static HRESULT WINAPI segment_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME star struct segment *This = impl_from_IDirectMusicSegment8(iface); struct segment *clone; IDirectMusicTrack *track; - struct track_entry *track_item, *cloned_item; - HRESULT hr; - BOOL track_clone_fail = FALSE; + struct track_entry *entry; + HRESULT hr = S_OK; TRACE("(%p, %ld, %ld, %p)\n", This, start, end, segment); - if (!segment) - return E_POINTER; + if (!segment) return E_POINTER; if (!(clone = segment_create())) { @@ -423,32 +421,16 @@ static HRESULT WINAPI segment_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME star } clone->header = This->header; - clone->pGraph = This->pGraph; - if (clone->pGraph) - IDirectMusicGraph_AddRef(clone->pGraph); - - LIST_FOR_EACH_ENTRY(track_item, &This->tracks, struct track_entry, entry) { - if (SUCCEEDED(hr = IDirectMusicTrack_Clone(track_item->pTrack, start, end, &track))) { - if ((cloned_item = malloc(sizeof(*cloned_item)))) - { - cloned_item->dwGroupBits = track_item->dwGroupBits; - cloned_item->flags = track_item->flags; - cloned_item->pTrack = track; - list_add_tail(&clone->tracks, &cloned_item->entry); - continue; - } - else - { - IDirectMusicTrack_Release(track); - } - } - WARN("Failed to clone track %p: %#lx\n", track_item->pTrack, hr); - track_clone_fail = TRUE; + if ((clone->pGraph = This->pGraph)) IDirectMusicGraph_AddRef(clone->pGraph); + + LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry) + { + if (FAILED(hr = IDirectMusicTrack_Clone(entry->pTrack, start, end, &track))) break; + if (FAILED(hr = segment_append_track(clone, track, entry->dwGroupBits, entry->flags))) break; } *segment = (IDirectMusicSegment *)&clone->IDirectMusicSegment8_iface; - - return track_clone_fail ? S_FALSE : S_OK; + return FAILED(hr) ? S_FALSE : S_OK; } static HRESULT WINAPI segment_SetStartPoint(IDirectMusicSegment8 *iface, MUSIC_TIME start) @@ -635,7 +617,6 @@ static HRESULT parse_track_form(struct segment *This, IStream *stream, const str DMUS_IO_TRACK_HEADER thdr; DMUS_IO_TRACK_EXTRAS_HEADER txhdr = {0}; HRESULT hr; - struct track_entry *item; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -691,12 +672,7 @@ static HRESULT parse_track_form(struct segment *This, IStream *stream, const str if (FAILED(hr)) goto done; - hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); - if (FAILED(hr)) - goto done; - - item = LIST_ENTRY(list_tail(&This->tracks), struct track_entry, entry); - item->flags = txhdr.dwFlags; + hr = segment_append_track(This, track, thdr.dwGroup, txhdr.dwFlags); done: if (ps)

1 0