November 2021 - Wine-commits

Giovanni Mascellani : vkd3d-shader/hlsl: Align conditionals and loops in the IR dump.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: vkd3d Branch: master Commit: 427dbf4062c0503ca1181700f9fb6e30cf0eb078 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=427dbf4062c0503ca118170… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Nov 5 19:35:56 2021 +0100 vkd3d-shader/hlsl: Align conditionals and loops in the IR dump. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index da4f10a..c71eac3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1208,11 +1208,11 @@ static void dump_ir_if(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, { vkd3d_string_buffer_printf(buffer, "if ("); dump_src(buffer, &if_node->condition); - vkd3d_string_buffer_printf(buffer, ")\n{\n"); + vkd3d_string_buffer_printf(buffer, ") {\n"); dump_instr_list(ctx, buffer, &if_node->then_instrs.instrs); - vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); + vkd3d_string_buffer_printf(buffer, " %10s } else {\n", ""); dump_instr_list(ctx, buffer, &if_node->else_instrs.instrs); - vkd3d_string_buffer_printf(buffer, "}\n"); + vkd3d_string_buffer_printf(buffer, " %10s }", ""); } static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) @@ -1239,9 +1239,9 @@ static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_i static void dump_ir_loop(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) { - vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); + vkd3d_string_buffer_printf(buffer, "for (;;) {\n"); dump_instr_list(ctx, buffer, &loop->body.instrs); - vkd3d_string_buffer_printf(buffer, "}\n"); + vkd3d_string_buffer_printf(buffer, " %10s }", ""); } static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_resource_load *load)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fix a typo in an error message.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: vkd3d Branch: master Commit: 581d71310fe513495c37252fdf83116cc314d615 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=581d71310fe513495c37252… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Nov 5 19:35:57 2021 +0100 vkd3d-shader/hlsl: Fix a typo in an error message. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3d0a9ce..2120b26 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2190,7 +2190,7 @@ struct_declaration: "Anonymous struct type must declare a variable."); if (modifiers) hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers are not allowed on struct type declataions."); + "Modifiers are not allowed on struct type declarations."); } if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1)))

1 0

Alexandre Julliard : Wine release 6.21
by Alexandre Julliard 05 Nov '21

05 Nov '21

Module: website Branch: master Commit: 979f21a0892b1052fcf759e6e431d6a6e5edff68 URL: https://source.winehq.org/git/website.git/?a=commit;h=979f21a0892b1052fcf75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 5 23:16:09 2021 +0100 Wine release 6.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021110501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021110501.xml b/news/en/2021110501.xml new file mode 100644 index 00000000..1a677e69 --- /dev/null +++ b/news/en/2021110501.xml @@ -0,0 +1,16 @@ +<news> +<date>November 5, 2021</date> +<title>Wine 6.21 Released</title> +<body> + The Wine development release 6.21 is now available. + <a href="{$root}/announce/6.21">What's new</a> in this release: +<ul> + <li>WinSpool, GPhoto, and a few other modules converted to PE.</li> + <li>Better support for inline functions in DbgHelp.</li> + <li>Beginnings of a MSDASQL implementation.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Connor McAdams : uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Alexandre Julliard 05 Nov '21

05 Nov '21

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

Connor McAdams : uiautomationcore: Implement UiaGetReservedMixedAttributeValue.
by Alexandre Julliard 05 Nov '21

05 Nov '21

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/tests: Add tests for ReservedValue COM interfaces.
by Alexandre Julliard 05 Nov '21

05 Nov '21

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

Nikolay Sivov : evr/mixer: Set destination alpha to fully opaque.
by Alexandre Julliard 05 Nov '21

05 Nov '21

Module: wine Branch: master Commit: e0b30bc51a3d6e43651d9aa0a6d3eb103182c58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b30bc51a3d6e43651d9aa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 5 13:17:01 2021 +0300 evr/mixer: Set destination alpha to fully opaque. It's necessary for HW devices, software reference device does not support blending. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fb7fcf79d9c..bb3f938cb64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1326,7 +1326,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) video_mixer_normalize_rect(&dst, &stream_vis, &norm); video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); - samples[sample_count].PlanarAlpha = DXVA2FloatToFixed(1.0f); + samples[sample_count].PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); sample_count++; } @@ -1335,6 +1335,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); params.BackgroundColor = mixer->bkgnd_color.ayuv; + params.Alpha = DXVA2_Fixed32OpaqueAlpha(); if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL)))

1 0

Nikolay Sivov : dxva2: Handle specified background color in VideoProcessBlt().
by Alexandre Julliard 05 Nov '21

05 Nov '21

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

Piotr Caban : msvcp100: Export ctype<char>::table function.
by Alexandre Julliard 05 Nov '21

05 Nov '21

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

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

05 Nov '21

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