- Wine-Devel - list.winehq.org

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Nov. 26, 2021

Nov. 26, 2021

2 1

[PATCH 1/6] include: Move WIN32_MEMORY_RANGE_ENTRY from winnt.h to winbase.h.
by Jinoh Kang Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winbase.h | 6 ++++++ include/winnt.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..3f987c05fde 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1757,6 +1757,12 @@ typedef struct _WIN32_FIND_STREAM_DATA { WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA; +typedef struct _WIN32_MEMORY_RANGE_ENTRY +{ + PVOID VirtualAddress; + SIZE_T NumberOfBytes; +} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..3a2e93675a3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -776,11 +776,11 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { } DUMMYUNIONNAME; } MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; -typedef struct _WIN32_MEMORY_RANGE_ENTRY +typedef struct _MEMORY_RANGE_ENTRY { PVOID VirtualAddress; SIZE_T NumberOfBytes; -} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; +} MEMORY_RANGE_ENTRY, *PMEMORY_RANGE_ENTRY; #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 -- 2.31.1

2 8

[PATCH v2] oleacc: Add semi-stub and tests for AccessibleObjectFromPoint
by Alex Henrie Nov. 25, 2021

Nov. 25, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48950 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: - Give test window a nonzero size and make it visible - Test hwnd associated with accessibility object with check_acc_hwnd --- dlls/oleacc/main.c | 23 +++++++++++++++----- dlls/oleacc/tests/main.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3ce616ae0c1..eb0429d7afe 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -263,18 +263,29 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return atom; } -HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) -{ - FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); - return E_NOTIMPL; -} - static void variant_init_i4( VARIANT *v, int val ) { V_VT(v) = VT_I4; V_I4(v) = val; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIANT* child_id ) +{ + HRESULT hr; + + FIXME("{%d,%d} %p %p: semi-stub\n", point.x, point.y, acc, child_id); + + if (!acc || !child_id) + return E_INVALIDARG; + + hr = AccessibleObjectFromWindow(WindowFromPoint(point), OBJID_CLIENT, &IID_IAccessible, (void **)acc); + + if (SUCCEEDED(hr)) + variant_init_i4(child_id, CHILDID_SELF); + + return hr; +} + HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, IAccessible **acc_out, VARIANT *child_id_out ) { diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 8c234aee8aa..072a058da66 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1304,6 +1304,52 @@ static void test_default_client_accessible_object(void) IAccessible_Release(acc); } +static void test_AccessibleObjectFromPoint(void) +{ + IAccessible *acc; + VARIANT cid; + HRESULT hr; + HWND hwnd; + RECT rect; + POINT point = {0, 0}; + + VariantInit(&cid); + + hr = AccessibleObjectFromPoint(point, NULL, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromPoint(point, &acc, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromPoint(point, NULL, &cid); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(V_VT(&cid) == VT_EMPTY, "got %#x, expected %#x\n", V_VT(&cid), VT_EMPTY); + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, 0, 0, 400, 300, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + /* test_window_proc doesn't return an IAccessible object for OBJID_CLIENT */ + hr = SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&DefWindowProcA); + ok(hr != 0, "SetWindowLongPtr failed\n"); + + /* AccessibleObjectFromPoint ignores invisible windows */ + ShowWindow(hwnd, SW_SHOW); + + hr = GetWindowRect(hwnd, &rect); + ok(hr, "GetWindowRect failed\n"); + + point.x = (rect.left + rect.right) / 2; + point.y = (rect.top + rect.bottom) / 2; + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + check_acc_hwnd((IUnknown*)acc, hwnd); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + static void test_CAccPropServices(void) { IAccPropServices *acc_prop_services; @@ -1749,6 +1795,7 @@ START_TEST(main) test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); test_AccessibleObjectFromEvent(); + test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); -- 2.34.0

2 2

[PATCH 2/3] jscript: Replace the value_prop in builtin_info with a call method.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 15 +++------------ dlls/jscript/bool.c | 4 ++-- dlls/jscript/date.c | 13 +++---------- dlls/jscript/dispex.c | 6 +++--- dlls/jscript/enumerator.c | 6 +++--- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 6 +++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 3 +-- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 6 +++--- dlls/jscript/math.c | 2 +- dlls/jscript/number.c | 14 ++------------ dlls/jscript/object.c | 20 +++----------------- dlls/jscript/set.c | 8 ++++---- dlls/jscript/string.c | 16 +++------------- dlls/jscript/vbarray.c | 2 +- 18 files changed, 40 insertions(+), 91 deletions(-)

1 0

[PATCH 1/3] jscript: Get rid of the value_prop from jsdisp props.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> The mapping between DISPID and index into props has to be adjusted since the value_prop (props[0]) is now gone. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 220603 - 220605 with minor clean up. dlls/jscript/dispex.c | 89 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 46 deletions(-)

1 0

[PATCH 3/3 v2] oleacc: Add AccessibleObjectFromPoint tests.
by Piotr Caban Nov. 25, 2021

Nov. 25, 2021

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)

1 0

[PATCH 1/3 v2] oleacc: Add partial Window_accHitTest implementation.
by Piotr Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed test failures dlls/oleacc/window.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)

1 0

[PATCH 3/3] oleacc: Add AccessibleObjectFromPoint tests.
by Piotr Caban Nov. 25, 2021

Nov. 25, 2021

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

2 1

[PATCH 2/3] oleacc: Add AccessibleObjectFromPoint implementation.
by Piotr Caban Nov. 25, 2021

Nov. 25, 2021

Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/main.c | 71 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-)

1 0

[PATCH 1/3] oleacc: Add partial Window_accHitTest implementation.
by Piotr Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/window.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)

1 0