- Wine-devel - list.winehq.org

[PATCH] mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Gabriel Ivăncescu 11 May '22

11 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/es5.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8238e5d..7545ef2 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -150,10 +150,14 @@ sync_test("Number toLocaleString", function() { ]; if(external.isEnglish) { - for(var i = 0; i < tests.length; i++) { - r = Number.prototype.toLocaleString.call(tests[i][0]); - ok(r === tests[i][1], "[" + i + "] got " + r); - } + /* Some recent Win8.1 updates have old jscript behavior */ + if(Number.prototype.toLocaleString.call(0.0) === "0.00") + win_skip("skipping tests due to old behavior"); + else + for(var i = 0; i < tests.length; i++) { + r = Number.prototype.toLocaleString.call(tests[i][0]); + ok(r === tests[i][1], "[" + i + "] got " + r); + } } try { @@ -161,21 +165,21 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on string"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on string threw " + n); + ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on string threw " + n); } try { Number.prototype.toLocaleString.call(undefined); ok(false, "expected exception calling it on undefined"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n); + ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on undefined threw " + n); } try { Number.prototype.toLocaleString.call(external.nullDisp); ok(false, "expected exception calling it on nullDisp"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n); + ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on nullDisp threw " + n); } }); -- 2.34.1

2 1

[PATCH] oleacc: Improve WindowFromAccessibleObject implementation.
by Connor McAdams 11 May '22

11 May '22

Add support for using the accNavigate method to retrieve an HWND for an IAccessible, and also only recursively go up the parent chain if the initial IAccessible didn't have an IOleWindow implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 34 +++++++++-- dlls/oleacc/tests/main.c | 123 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index dced84be7b5..641f4b22419 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -402,20 +402,36 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) { IDispatch *parent; IOleWindow *ow; + VARIANT v, cid; HRESULT hres; TRACE("%p %p\n", acc, phwnd); IAccessible_AddRef(acc); - while(1) { - hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); - if(SUCCEEDED(hres)) { - hres = IOleWindow_GetWindow(ow, phwnd); - IOleWindow_Release(ow); + + ow = NULL; + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + if(*phwnd) { IAccessible_Release(acc); return hres; } + } + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hres = IAccessible_accNavigate(acc, 10, cid, &v); + if(SUCCEEDED(hres) && V_VT(&v) == VT_I4) + *phwnd = ULongToHandle(V_I4(&v)); + + if(ow) { + IAccessible_Release(acc); + return S_OK; + } + while(1) { hres = IAccessible_get_accParent(acc, &parent); IAccessible_Release(acc); if(FAILED(hres)) @@ -429,6 +445,14 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) IDispatch_Release(parent); if(FAILED(hres)) return hres; + + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + IAccessible_Release(acc); + return hres; + } } } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..0bf49056a04 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -59,8 +59,10 @@ DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); DEFINE_EXPECT(Accessible_get_accName); DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -91,7 +93,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +static IAccessible Accessible; static IAccessible Accessible_child; +static IOleWindow OleWindow; +static HWND Accessible_accnav_hwnd = NULL; +static HWND OleWindow_hwnd = NULL; static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) @@ -104,6 +110,12 @@ static HRESULT WINAPI Accessible_QueryInterface( return S_OK; } + if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) { + *ppvObject = &OleWindow; + IAccessible_AddRef(iface); + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; @@ -155,7 +167,12 @@ static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { if(iface == &Accessible_child) + { CHECK_EXPECT(Accessible_child_get_accParent); + if (OleWindow_hwnd) + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, + (void **)ppdispParent); + } else CHECK_EXPECT(Accessible_get_accParent); @@ -295,7 +312,21 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG navDir, VARIANT varStart, VARIANT *pvarEnd) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); + + /* + * Magic number value for retrieving an HWND. Used by DynamicAnnotation + * IAccessible wrapper. + */ + if(navDir == 10) { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = HandleToUlong(Accessible_accnav_hwnd); + return S_OK; + } + return E_NOTIMPL; } @@ -358,8 +389,44 @@ static IAccessibleVtbl AccessibleVtbl = { Accessible_put_accValue }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj) +{ + return IAccessible_QueryInterface(&Accessible, riid, obj); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + return IAccessible_AddRef(&Accessible); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + return IAccessible_Release(&Accessible); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) +{ + *hwnd = OleWindow_hwnd; + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = { + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + static IAccessible Accessible = {&AccessibleVtbl}; static IAccessible Accessible_child = {&AccessibleVtbl}; +static IOleWindow OleWindow = {&OleWindowVtbl}; static void test_getroletext(void) { @@ -1826,6 +1893,59 @@ static void test_default_edit_accessible_object(void) DestroyWindow(hwnd); } +static void test_WindowFromAccessibleObject(void) +{ + HWND hwnd; + HRESULT hr; + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + /* Successfully retrieve an HWND from the IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + + /* Successfully retrieve an HWND from IAccessible::accNavigate. */ + Accessible_accnav_hwnd = (HWND)0xdeadf00d; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_accNavigate); + + /* Return a NULL HWND from both methods, no accParent call. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(!hwnd, "hwnd %p\n", hwnd); + CHECK_CALLED(Accessible_accNavigate); + + /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + hr = WindowFromAccessibleObject(&Accessible_child, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; +} + START_TEST(main) { int argc; @@ -1867,6 +1987,7 @@ START_TEST(main) test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); + test_WindowFromAccessibleObject(); unregister_window_class(); CoUninitialize(); -- 2.25.1

2 2

[PATCH] ntdll/tests: Fix thread test failure on Windows.
by Brendan Shanks 11 May '22

11 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52892 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/tests/thread.c | 42 ++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 7a47486a3b6..3086247d5f4 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -118,16 +118,25 @@ static void test_dbg_hidden_thread_creation(void) CloseHandle( thread ); } +struct unique_teb_thread_args +{ + TEB *teb; + HANDLE running_event; + HANDLE quit_event; +}; + static void CALLBACK test_unique_teb_proc(void *param) { - TEB **teb = param; - *teb = NtCurrentTeb(); + struct unique_teb_thread_args *args = param; + args->teb = NtCurrentTeb(); + SetEvent( args->running_event ); + WaitForSingleObject( args->quit_event, INFINITE ); } static void test_unique_teb(void) { - HANDLE threads[2]; - TEB *teb1, *teb2; + HANDLE threads[2], running_events[2]; + struct unique_teb_thread_args args1, args2; NTSTATUS status; if (!pNtCreateThreadEx) @@ -136,21 +145,36 @@ static void test_unique_teb(void) return; } + args1.running_event = running_events[0] = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( args1.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() ); + + args2.running_event = running_events[1] = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( args2.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() ); + + args1.quit_event = args2.quit_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + ok( args1.quit_event != NULL, "CreateEventW failed %lu.\n", GetLastError() ); + status = pNtCreateThreadEx( &threads[0], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, - &teb1, 0, 0, 0, 0, NULL ); + &args1, 0, 0, 0, 0, NULL ); ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); status = pNtCreateThreadEx( &threads[1], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, - &teb2, 0, 0, 0, 0, NULL ); + &args2, 0, 0, 0, 0, NULL ); ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + WaitForMultipleObjects( 2, running_events, TRUE, INFINITE ); + SetEvent( args1.quit_event ); + WaitForMultipleObjects( 2, threads, TRUE, INFINITE ); CloseHandle( threads[0] ); CloseHandle( threads[1] ); + CloseHandle( args1.running_event ); + CloseHandle( args2.running_event ); + CloseHandle( args1.quit_event ); - ok( NtCurrentTeb() != teb1, "Multiple threads have TEB %p.\n", teb1 ); - ok( NtCurrentTeb() != teb2, "Multiple threads have TEB %p.\n", teb2 ); - ok( teb1 != teb2, "Multiple threads have TEB %p.\n", teb1 ); + ok( NtCurrentTeb() != args1.teb, "Multiple threads have TEB %p.\n", args1.teb ); + ok( NtCurrentTeb() != args2.teb, "Multiple threads have TEB %p.\n", args2.teb ); + ok( args1.teb != args2.teb, "Multiple threads have TEB %p.\n", args1.teb ); } START_TEST(thread) -- 2.35.1

1 0

[PATCH v2 0/2] MR54: winecoreaudio: Enable compilation with long types.
by Huw Davies (＠huw) 11 May '22

11 May '22

-- v2: winecoreaudio: Enable compilation with long types. winecoreaudio: Remove DWORDs from the midi syscall interface. https://gitlab.winehq.org/wine/wine/-/merge_requests/54

4 4

[PATCH 0/2] MR54: winecoreaudio: Enable compilation with long types.
by Huw Davies (＠huw) 11 May '22

11 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/54

4 3

[PATCH 0/2] MR57: winevulkan: Update to VK spec version 1.3.213.
by Georg Lehmann (＠DadSchoorse) 11 May '22

11 May '22

Not a trivial update this time, two extensions are blocked by a Vulkan xml bug. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/57

2 2

[PATCH] msvcr80: Update manifest resource.
by Louis Lenders 11 May '22

11 May '22

v2: Do not add an extra manifest file (Thanks Piotr for hint) https://bugs.winehq.org/show_bug.cgi?id=52975 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/msvcr80/msvcr80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr80/msvcr80.manifest b/dlls/msvcr80/msvcr80.manifest index 5f3daed5827..99b818c2030 100644 --- a/dlls/msvcr80/msvcr80.manifest +++ b/dlls/msvcr80/msvcr80.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.9672" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> <file name="msvcr80.dll"/> <file name="msvcp80.dll"/> <file name="msvcm80.dll"/> -- 2.36.1

2 1

[PATCH] msvcr80: Update manifest resource
by Louis Lenders 11 May '22

11 May '22

https://bugs.winehq.org/show_bug.cgi?id=52975 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/msvcr80/msvcr80.rc | 3 +++ dlls/msvcr80/msvcr80_61.manifest | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 dlls/msvcr80/msvcr80_61.manifest diff --git a/dlls/msvcr80/msvcr80.rc b/dlls/msvcr80/msvcr80.rc index 458c5df6f98..2d9f5457569 100644 --- a/dlls/msvcr80/msvcr80.rc +++ b/dlls/msvcr80/msvcr80.rc @@ -20,3 +20,6 @@ /* @makedep: msvcr80.manifest */ WINE_MANIFEST 24 msvcr80.manifest + +/* @makedep: msvcr80.manifest */ +WINE_MANIFEST61 24 msvcr80_61.manifest diff --git a/dlls/msvcr80/msvcr80_61.manifest b/dlls/msvcr80/msvcr80_61.manifest new file mode 100644 index 00000000000..4298d242046 --- /dev/null +++ b/dlls/msvcr80/msvcr80_61.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr80.dll"/> + <file name="msvcp80.dll"/> + <file name="msvcm80.dll"/> +</assembly> -- 2.36.0

3 4

[PATCH 0/6] Fix LVS_OWNERDATA list view multi select.
by Angelo Haller 11 May '22

11 May '22

From: Angelo Haller <angelo(a)szanni.org> The following patches fix sending of the LVN_ODSTATECHANGED notification for LVS_OWNERDATA list views, adding more refined tests in the process and fixing various bugs. Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 & tests which are NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (6): comctl32/tests: Expand ownerdata listview tests. comctl32/listview: Move LVN_ODSTATECHANGED notification to function. comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists. comctl32/listview: Send LVN_ODSTATECHANGED notification. comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges. comctl32/listview: Fix deselect on LVS_OWNERDATA. dlls/comctl32/listview.c | 71 ++++++++++++++++++++++++++-------- dlls/comctl32/tests/listview.c | 59 ++++++++++++++++++++++++---- 2 files changed, 105 insertions(+), 25 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.36.0

2 10

[PATCH v2 0/6] MR55: ntdll: Factor out heap status handling and locking.
by Rémi Bernon 11 May '22

11 May '22

-- v2: ntdll: Split RtlSizeHeap to a separate heap_size helper. ntdll: Split RtlReAllocateHeap to a separate heap_reallocate helper. ntdll: Split RtlFreeHeap to a separate heap_free helper. ntdll: Split RtlAllocateHeap to a separate heap_allocate helper. ntdll: Split HEAP_IsRealArena to heap_validate and heap_validate_ptr. ntdll: Lock heap critical section outside of HEAP_IsRealArena. https://gitlab.winehq.org/wine/wine/-/merge_requests/55

1 7