winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2023
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
920 discussions
Start a n
N
ew thread
Henri Verbeet : build: Add vkd3d_shader_utils.h to libvkd3d_la_SOURCES.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Henri Verbeet : vkd3d-shader: Slightly tweak the documentation for VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Henri Verbeet : vkd3d-shader: Add a \since 1.9 for VKD3D_SHADER_SV_TARGET.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore: Implement IRawElementProviderFragment::get_FragmentRoot for MSAA providers.
by Alexandre Julliard
19 Sep '23
19 Sep '23
Module: wine Branch: master Commit: 00799933bc277d0b4d8482f81825099e33690d35 URL:
https://gitlab.winehq.org/wine/wine/-/commit/00799933bc277d0b4d8482f8182509…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 11:30:10 2023 -0400 uiautomationcore: Implement IRawElementProviderFragment::get_FragmentRoot for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 247 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 22 ++- 2 files changed, 267 insertions(+), 2 deletions(-)
1
0
0
0
Connor McAdams : uiautomationcore: Add a common helper function for querying IServiceProvider on IAccessible interfaces.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore: Add stub IRawElementProviderFragmentRoot implementation for MSAA providers.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore/tests: Add support for debug printing Provider method calls.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore/tests: Add support for debug printing Accessible method calls.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
Connor McAdams : uiautomationcore/tests: Add method expect definitions for all Accessible test interfaces.
by Alexandre Julliard
19 Sep '23
19 Sep '23
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
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
92
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
Results per page:
10
25
50
100
200