August 2021 - Wine-devel - list.winehq.org

[PATCH v3 1/2] oleacc: Implement AccessibleObjectFromEvent.
by Connor McAdams 30 Aug '21

30 Aug '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..6f7f9580fc2 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,53 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +static void variant_init_i4( VARIANT *v, int val ) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, + IAccessible **acc_out, VARIANT *child_id_out ) +{ + VARIANT child_id_variant; + IAccessible *acc = NULL; + IDispatch *child = NULL; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out); + + if (!acc_out) + return E_INVALIDARG; + *acc_out = NULL; + VariantInit(child_id_out); + + hr = AccessibleObjectFromWindow(hwnd, object_id, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, child_id); + hr = IAccessible_get_accChild(acc, child_id_variant, &child); + if (FAILED(hr)) + TRACE("get_accChild failed with %#x!\n", hr); + + if (SUCCEEDED(hr) && child) + { + IAccessible_Release(acc); + hr = IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, CHILDID_SELF); + IDispatch_Release(child); + } + + *acc_out = acc; + *child_id_out = child_id_variant; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) -- 2.25.1

2 2

[PATCH 10/10] gdi32: Use ntgdi names for object functions.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi32.spec | 8 ++++---- dlls/gdi32/gdiobj.c | 26 +++++++++++--------------- dlls/gdi32/palette.c | 2 +- include/ntgdi.h | 3 +++ 5 files changed, 20 insertions(+), 21 deletions(-)

2 1

[PATCH 09/10] gdi32: Move more DC stubs to gdidc.c.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 37 ------------------------------------- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 37 deletions(-)

2 1

[PATCH 08/10] gdi32: Use ntgdi names for GetClipBox and GetRandomRgn.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/metafile.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH 07/10] gdi32: Move resource functions wrappers to text.c.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 117 ---------------------------------------------- dlls/gdi32/text.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 117 deletions(-)

2 1

[PATCH 06/10] gdi32: Move EnumFontFamiliesEx wrappers to text.c.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 60 ----------------------------------------------- dlls/gdi32/text.c | 52 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 60 deletions(-)

2 1

[PATCH 05/10] gdi32: Move GdiRealizationInfo to text.c.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 29 ----------------------------- dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 29 deletions(-)

2 1

[PATCH 04/10] gdi32: Use NtGdiGetFontFileData for GetFontFileData.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 9 +++++---- dlls/gdi32/text.c | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-)

2 1

[PATCH 03/10] gdi32: Use ntgdi names for a few more font functions.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 43 +++++++++++++++----------------------- dlls/gdi32/gdi32.spec | 12 +++++------ dlls/gdi32/ntgdi_private.h | 20 ------------------ include/ntgdi.h | 34 ++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 52 deletions(-)

2 1

[PATCH 02/10] gdi32: Move a few font functions to text.c.
by Jacek Caban 30 Aug '21

30 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 62 ----------------------------------------------- dlls/gdi32/text.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 62 deletions(-)

2 1