November 2021 - Wine-Devel - list.winehq.org

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

Nov. 26, 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(-)

3 3

[PATCH 3/3] mshtml: Handle VT_DISPATCH in variant_to_nsstr.
by Jacek Caban Nov. 26, 2021

Nov. 26, 2021

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Some javascript libraries such as prototype.js use this (by setting to an array) to examine setAttribute quirks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +- dlls/mshtml/tests/documentmode.js | 77 +++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-)

2 1

[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

[PATCH v2 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)

2 1

[PATCH v2 8/9] user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Also preserve last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes a pre-existing problem with current code that we start to hit in monitor tests with the next patch. My plan is to get rid of update_monitor_cache and entire monitor cache in user32. This will ultimitely solve the problem, but I don't want to make this series longer. dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH v2 7/9] win32u: Implement NtUserEnumDisplayDevices.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 335 +---------------------------------- dlls/win32u/dc.c | 6 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 71 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 33 +++- dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 112 insertions(+), 349 deletions(-)

1 0

[PATCH v2 6/9] winex11: Use gdi driver types for display device handler.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 18 ++++++------ dlls/winex11.drv/display.c | 24 ++++++++-------- dlls/winex11.drv/x11drv.h | 55 +++++-------------------------------- dlls/winex11.drv/xinerama.c | 20 +++++++------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 102 deletions(-)

1 0

[PATCH v2 5/9] win32u: Implement monitor registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 144 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-)

1 0

[PATCH v2 4/9] win32u: Implement display adapter registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-)

1 0

[PATCH v2 3/9] win32u: Implement GPU registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 459 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 467 insertions(+), 8 deletions(-)

1 0

[PATCH v2 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

1 0

[PATCH 5/9] win32u: Implement monitor registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-)

2 2

[PATCH 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The idea is to provide a way to drivers to do the registration instead of duplicating it in each driver. The new way also allows drivers to set those without SetupAPI, which is problematic for unix libs. dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 37 +++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-)

2 2

[PATCH 4/9] win32u: Implement display adapter registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-)

2 3

[PATCH v7 01/11] jscript: Treat prototype refs as non-existent when deleting.
by Gabriel Ivăncescu Nov. 25, 2021

Nov. 25, 2021

Delete only affects own properties. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/mshtml/tests/documentmode.js | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..df81e1a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1621,6 +1621,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROTREF) { + *ret = TRUE; + return S_OK; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 63aa669..f259c70 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1565,6 +1565,11 @@ ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); +ok(!("test1" in inobj), "test1 is still in inobj after delete"); +ok((delete inobj.test3) === true, "delete inobj.test3 returned false"); +ok("test3" in inobj, "test3 is not in inobj after delete"); + tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5f33dd..041025c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1192,7 +1192,6 @@ sync_test("__proto__", function() { ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); r = (delete x.__proto__); - todo_wine. ok(r, "delete x.__proto__ returned " + r); ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x); -- 2.31.1

3 26

[PATCH 00/12] winecoreaudio: Move the midi out handling to the unixlib.
by Huw Davies Nov. 25, 2021

Nov. 25, 2021

This series moves all of the midi out handling to the unixlib. The idea is that coremidi.c will be the unix-side, midi.c will become PE with audiounit.c being removed in the process. Huw D. M. Davies (12): winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c. winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc. winecoreaudio: Move midi_init and midi_release to the unixlib. winecoreaudio: Move midi_out_open to the unixlib. winecoreaudio: Move midi_out_close to the unixlib. winecoreaudio: Move midi_out_data to the unixlib. winecoreaudio: Move midi_out_long_data to the unixlib. winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib. winecoreaudio: Move midi_out_get_devcaps to the unixlib. winecoreaudio: Move midi_out_get_num_devs to the unixlib. winecoreaudio: Move midi_out_[gs]et_volume to the unixlib. winecoreaudio: Move midi_out_reset to the unixlib. dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/audiounit.c | 197 -------- dlls/winecoreaudio.drv/coreaudio.c | 3 + dlls/winecoreaudio.drv/coremidi.c | 750 +++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/coremidi.h | 30 +- dlls/winecoreaudio.drv/midi.c | 583 ++-------------------- dlls/winecoreaudio.drv/unixlib.h | 40 ++ 7 files changed, 831 insertions(+), 773 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/audiounit.c -- 2.23.0

1 0