November 2021 - Wine-Commits

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 88f0afd9524708ffe712339d4f7b37fcd603a93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88f0afd9524708ffe712339d… Author: Chilung Chan <eason066(a)gmail.com> Date: Sat Oct 30 19:05:52 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 1365 +++++++++++++++++++++++++---------------------------------- 1 file changed, 567 insertions(+), 798 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88f0afd9524708ffe712…

1 0

Eric Pouech : dbghelp/dwarf: Don't skip functions when their inlined flag comes from an abstract origin.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: f83e6475477b06d53c0058a8c2f2d54040e484df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83e6475477b06d53c0058a8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 5 16:51:31 2021 +0100 dbghelp/dwarf: Don't skip functions when their inlined flag comes from an abstract origin. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 269cfadd56c..d812e03f833 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2242,6 +2242,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) * a concrete object that we'll handle */ if (dwarf2_find_attribute(di, DW_AT_inline, &inline_flags) && + inline_flags.gotten_from == attr_direct && inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n",

1 0

Piotr Caban : msvcp100: Export ctype<char>::table function.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 0c42b9e111b8de1dd51b0572a2bf5ed28a7fa3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c42b9e111b8de1dd51b0572… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 5 11:18:21 2021 +0100 msvcp100: Export ctype<char>::table function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51978 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index c0a4910eb4b..39785d9c714 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2739,8 +2739,8 @@ @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio @ cdecl -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ() std_system_category @ cdecl -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ() std_system_category -@ stub -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ thiscall -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ thiscall -arch=win32 ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 33f93c9e8cf..b67bc0bb0ad 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3528,9 +3528,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 9dfe0b186c5..269290bbf90 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3469,9 +3469,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index e9ff7256419..4d91e8c6a17 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3469,9 +3469,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) msvcp120.?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) msvcp120.?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) msvcp120.?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QBAPBFXZ +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QBEPBFXZ +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QEBAPEBFXZ @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB msvcp120.?table_size@?$ctype(a)D@std@@2IB @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB msvcp120.?table_size@?$ctype(a)D@std@@2_KB @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) msvcp120.?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 343571ae401..7c24c963acd 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3426,9 +3426,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)U_Mbstatet@@@2(a)XZ(ptr ptr) basic_istream_char_tellg

1 0

Connor McAdams : uiautomationcore/tests: Add tests for ReservedValue COM interfaces.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 475dce071c5f508aacaa040477d4e29327b232bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=475dce071c5f508aacaa0404… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Nov 4 15:14:13 2021 -0400 uiautomationcore/tests: Add tests for ReservedValue COM interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/tests/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 133 +++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/Makefile.in b/dlls/uiautomationcore/tests/Makefile.in index c39b062b6fd..1d08e19093f 100644 --- a/dlls/uiautomationcore/tests/Makefile.in +++ b/dlls/uiautomationcore/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = uiautomationcore.dll -IMPORTS = uiautomationcore user32 +IMPORTS = uiautomationcore user32 ole32 C_SRCS = \ uiautomation.c diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index cbcba1af294..52a6648dad2 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -86,7 +86,140 @@ if (hr == S_OK) UnregisterClassA("HostProviderFromHwnd class", NULL); } +static DWORD WINAPI uia_reserved_val_iface_marshal_thread(LPVOID param) +{ + IStream **stream = param; + IUnknown *unk_ns, *unk_ns2, *unk_ma, *unk_ma2; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoGetInterfaceAndReleaseStream(stream[0], &IID_IUnknown, (void **)&unk_ns); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoGetInterfaceAndReleaseStream(stream[1], &IID_IUnknown, (void **)&unk_ma); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = UiaGetReservedNotSupportedValue(&unk_ns2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = UiaGetReservedMixedAttributeValue(&unk_ma2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(unk_ns2 == unk_ns, "UiaGetReservedNotSupported pointer mismatch, unk_ns2 %p, unk_ns %p\n", unk_ns2, unk_ns); + ok(unk_ma2 == unk_ma, "UiaGetReservedMixedAttribute pointer mismatch, unk_ma2 %p, unk_ma %p\n", unk_ma2, unk_ma); + + CoUninitialize(); + + return 0; +} + +static void test_uia_reserved_value_ifaces(void) +{ + IUnknown *unk_ns, *unk_ns2, *unk_ma, *unk_ma2; + IStream *stream[2]; + IMarshal *marshal; + HANDLE thread; + ULONG refcnt; + HRESULT hr; + + /* ReservedNotSupportedValue. */ + hr = UiaGetReservedNotSupportedValue(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = UiaGetReservedNotSupportedValue(&unk_ns); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk_ns != NULL, "UiaGetReservedNotSupportedValue returned NULL interface.\n"); + + refcnt = IUnknown_AddRef(unk_ns); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IUnknown_AddRef(unk_ns); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IUnknown_Release(unk_ns); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + hr = UiaGetReservedNotSupportedValue(&unk_ns2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk_ns2 != NULL, "UiaGetReservedNotSupportedValue returned NULL interface."); + ok(unk_ns2 == unk_ns, "UiaGetReservedNotSupported pointer mismatch, unk_ns2 %p, unk_ns %p\n", unk_ns2, unk_ns); + + marshal = NULL; + hr = IUnknown_QueryInterface(unk_ns, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(marshal != NULL, "Failed to get IMarshal interface.\n"); + + refcnt = IMarshal_AddRef(marshal); + ok(refcnt == 2, "Expected refcnt %d, got %d\n", 2, refcnt); + + refcnt = IMarshal_Release(marshal); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IMarshal_Release(marshal); + ok(refcnt == 0, "Expected refcnt %d, got %d\n", 0, refcnt); + + /* ReservedMixedAttributeValue. */ + hr = UiaGetReservedMixedAttributeValue(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = UiaGetReservedMixedAttributeValue(&unk_ma); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk_ma != NULL, "UiaGetReservedMixedAttributeValue returned NULL interface."); + + refcnt = IUnknown_AddRef(unk_ma); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IUnknown_AddRef(unk_ma); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IUnknown_Release(unk_ma); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + hr = UiaGetReservedMixedAttributeValue(&unk_ma2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk_ma2 != NULL, "UiaGetReservedMixedAttributeValue returned NULL interface."); + ok(unk_ma2 == unk_ma, "UiaGetReservedMixedAttribute pointer mismatch, unk_ma2 %p, unk_ma %p\n", unk_ma2, unk_ma); + + marshal = NULL; + hr = IUnknown_QueryInterface(unk_ma, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(marshal != NULL, "Failed to get IMarshal interface.\n"); + + refcnt = IMarshal_AddRef(marshal); + ok(refcnt == 2, "Expected refcnt %d, got %d\n", 2, refcnt); + + refcnt = IMarshal_Release(marshal); + ok(refcnt == 1, "Expected refcnt %d, got %d\n", 1, refcnt); + + refcnt = IMarshal_Release(marshal); + ok(refcnt == 0, "Expected refcnt %d, got %d\n", 0, refcnt); + + /* Test cross-thread marshaling behavior. */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoMarshalInterThreadInterfaceInStream(&IID_IUnknown, unk_ns, &stream[0]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CoMarshalInterThreadInterfaceInStream(&IID_IUnknown, unk_ma, &stream[1]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + thread = CreateThread(NULL, 0, uia_reserved_val_iface_marshal_thread, (void *)stream, 0, NULL); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + { + MSG msg; + while(PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(thread); + + CoUninitialize(); +} + START_TEST(uiautomation) { test_UiaHostProviderFromHwnd(); + test_uia_reserved_value_ifaces(); }

1 0

Connor McAdams : uiautomationcore: Implement UiaGetReservedMixedAttributeValue.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 67add3f22ae12116f21ba5ad47e45c34b2bd2ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67add3f22ae12116f21ba5ad… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Nov 4 15:14:12 2021 -0400 uiautomationcore: Implement UiaGetReservedMixedAttributeValue. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 77cacb7c4a4..174e4756920 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -110,7 +110,7 @@ static HRESULT create_uia_object_wrapper(IUnknown *reserved, void **ppv) } /* - * UiaReservedNotSupportedValue object. + * UiaReservedNotSupportedValue/UiaReservedMixedAttributeValue object. */ static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -143,6 +143,7 @@ static const IUnknownVtbl uia_reserved_obj_vtbl = { }; static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; +static IUnknown uia_reserved_ma_iface = {&uia_reserved_obj_vtbl}; /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) @@ -158,8 +159,13 @@ BOOL WINAPI UiaClientsAreListening(void) */ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ma_iface; + return S_OK; }

1 0

Connor McAdams : uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 2f8c01b0631bd7070c23cb98e3c8669c4b886c73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f8c01b0631bd7070c23cb98… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Nov 4 15:14:11 2021 -0400 uiautomationcore: Implement UiaGetReservedNotSupportedValue. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..77cacb7c4a4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_object_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_object_wrapper *impl_uia_object_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_object_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_object_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_object_wrapper_vtbl = { + uia_object_wrapper_QueryInterface, + uia_object_wrapper_AddRef, + uia_object_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT create_uia_object_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_object_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_object_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return create_uia_object_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; }

1 0

Nikolay Sivov : dxva2: Handle specified background color in VideoProcessBlt().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: d9957dd22792731cd249171c1ca236b7cbaace7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9957dd22792731cd249171c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 5 13:21:14 2021 +0300 dxva2: Handle specified background color in VideoProcessBlt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 46f5a7af485..401b5cc976b 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -258,6 +258,26 @@ static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) return TRUE; } +static D3DCOLOR video_processor_get_background_color(const DXVA2_AYUVSample16 *ayuv) +{ + float y, cb, cr; + BYTE r, g, b; + + y = (ayuv->Y >> 8) - 16; + cb = (ayuv->Cb >> 8) - 128; + cr = (ayuv->Cr >> 8) - 128; + + y = 255.0f * y / 219.0f; + cb = 255.0f * cb / 224.0f; + cr = 255.0f * cr / 224.0f; + + r = y + 1.402 * cr; + g = y - 0.344 * cb - 0.714 * cr; + b = y + 1.772 * cb; + + return D3DCOLOR_XRGB(r, g, b); +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) @@ -269,14 +289,19 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + if (params->BackgroundColor.Alpha != 0xffff) + { + WARN("Unexpected background alpha %#x.\n", params->BackgroundColor.Alpha); + return E_INVALIDARG; + } + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { WARN("Failed to get surface device, hr %#x.\n", hr); return hr; } - /* FIXME: use specified color */ - IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + IDirect3DDevice9_ColorFill(device, rt, &params->TargetRect, video_processor_get_background_color(&params->BackgroundColor)); for (i = 0; i < sample_count; ++i) {

1 0

Gabriel Ivăncescu : mshtml: Hold a ref to the location on the window side.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 0be2db2ecd0460a3a46e18562e58c5838256795d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be2db2ecd0460a3a46e1856… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 4 16:10:51 2021 +0200 mshtml: Hold a ref to the location on the window side. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 5 ++--- dlls/mshtml/tests/dom.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0b25e71063d..635b046ea39 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -68,9 +68,7 @@ static inline BOOL is_outer_window(HTMLWindow *window) static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { - if(This->location) { - IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); - }else { + if(!This->location) { HRESULT hres; hres = HTMLLocation_Create(This, &This->location); @@ -78,6 +76,7 @@ static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) return hres; } + IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); *ret = This->location; return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c0431ea..ea5b2108100 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6015,7 +6015,6 @@ static void test_location(IHTMLDocument2 *doc) IHTMLLocation *location, *location2; IHTMLWindow2 *window; BSTR str; - ULONG ref; HRESULT hres; hres = IHTMLDocument2_get_location(doc, &location); @@ -6051,8 +6050,7 @@ static void test_location(IHTMLDocument2 *doc) ok(!lstrcmpW(str, L"about:blank"), "unexpected href %s\n", wine_dbgstr_w(str)); SysFreeString(str); - ref = IHTMLLocation_Release(location); - ok(!ref, "location should be destroyed here\n"); + IHTMLLocation_Release(location); } static void test_plugins_col(IHTMLDocument2 *doc)

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::Start().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 21dc092b910f80616242761a00d8cdab2f8aa7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dc092b910f80616242761a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 4 15:46:27 2021 -0500 winegstreamer: Implement IWMReader::Start(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 167 ++++++++++++++++++++++++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 25 ++++-- 2 files changed, 178 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21dc092b910f80616242…

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetUserProvidedClock().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 682093d0bdc24a55fcde37ca4f9cc9ed46c3c7df URL: https://source.winehq.org/git/wine.git/?a=commit;h=682093d0bdc24a55fcde37ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 4 15:46:28 2021 -0500 winegstreamer: Implement IWMReaderAdvanced::SetUserProvidedClock(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 67 ++++++++++++++++++++++++++++--------- dlls/wmvcore/tests/wmvcore.c | 47 ++++++++++++-------------- 2 files changed, 74 insertions(+), 40 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index d4bd8914dd6..4193d7d75de 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -41,6 +41,9 @@ struct async_reader CONDITION_VARIABLE stream_cv; bool running; + + bool user_clock; + QWORD user_time; }; static REFERENCE_TIME get_current_time(const struct async_reader *reader) @@ -85,22 +88,35 @@ static DWORD WINAPI stream_thread(void *arg) hr = wm_reader_get_stream_sample(&reader->reader.streams[i], &sample, &pts, &duration, &flags); if (hr == S_OK) { - for (;;) + if (reader->user_clock) { - REFERENCE_TIME current_time = get_current_time(reader); - - if (pts <= current_time - start_time) - break; - - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, - (pts - (current_time - start_time)) / 10000); - + while (pts > reader->user_time && reader->running) + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); if (!reader->running) { INSSBuffer_Release(sample); goto out; } } + else + { + for (;;) + { + REFERENCE_TIME current_time = get_current_time(reader); + + if (pts <= current_time - start_time) + break; + + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, + (pts - (current_time - start_time)) / 10000); + + if (!reader->running) + { + INSSBuffer_Release(sample); + goto out; + } + } + } IWMReaderCallback_OnSample(callback, i, pts, duration, flags, sample, reader->context); INSSBuffer_Release(sample); @@ -276,6 +292,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, wm_reader_seek(&reader->reader, start, duration); reader->running = true; + reader->user_time = 0; if (!(reader->stream_thread = CreateThread(NULL, 0, stream_thread, reader, 0, NULL))) { @@ -360,9 +377,14 @@ static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface) static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, user_clock); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, user_clock %d.\n", reader, user_clock); + + EnterCriticalSection(&reader->stream_cs); + reader->user_clock = !!user_clock; + LeaveCriticalSection(&reader->stream_cs); + return S_OK; } static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock) @@ -374,9 +396,24 @@ static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 * static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time)); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, time %s.\n", reader, debugstr_time(time)); + + EnterCriticalSection(&reader->stream_cs); + + if (!reader->user_clock) + { + LeaveCriticalSection(&reader->stream_cs); + WARN("Not using a user-provided clock; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + + reader->user_time = time; + + LeaveCriticalSection(&reader->stream_cs); + WakeConditionVariable(&reader->stream_cv); + return S_OK; } static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4cc285c2c73..0e7c6380c92 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1288,38 +1288,35 @@ static void test_async_reader_streaming(void) * according to their presentation time. Call DeliverTime with the file * duration in order to request all samples as fast as possible. */ hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = WaitForSingleObject(callback.eof_event, 1000); - ok(!ret, "Wait timed out.\n"); - ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); + ret = WaitForSingleObject(callback.eof_event, 1000); + ok(!ret, "Wait timed out.\n"); + ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); - hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = WaitForSingleObject(callback.eof_event, 1000); - ok(!ret, "Wait timed out.\n"); - ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); + ret = WaitForSingleObject(callback.eof_event, 1000); + ok(!ret, "Wait timed out.\n"); + ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); - hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = WaitForSingleObject(callback.got_stopped, 1000); - ok(!ret, "Wait timed out.\n"); + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 1000); + ok(!ret, "Wait timed out.\n"); - hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = WaitForSingleObject(callback.got_stopped, 1000); - ok(!ret, "Wait timed out.\n"); - } + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 1000); + ok(!ret, "Wait timed out.\n"); test_reader_attributes(profile);

1 0