May 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat/sample: Fix use-after-free of a critical section.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 1d7d3f58d6666e2a5793a79ea8a28476f961e9c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7d3f58d6666e2a5793a79e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:13:24 2022 +0300 mfplat/sample: Fix use-after-free of a critical section. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index ed39b5f7297..687ada1a477 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -183,22 +183,25 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); + IRtwqAsyncResult *tracked_result = NULL; HRESULT hr; EnterCriticalSection(&sample->attributes.cs); if (sample->tracked_result && sample->tracked_refcount == refcount) { - IRtwqAsyncResult *tracked_result = sample->tracked_result; + tracked_result = sample->tracked_result; sample->tracked_result = NULL; sample->tracked_refcount = 0; /* Call could fail if queue system is not initialized, it's not critical. */ if (FAILED(hr = RtwqInvokeCallback(tracked_result))) WARN("Failed to invoke tracking callback, hr %#lx.\n", hr); - IRtwqAsyncResult_Release(tracked_result); } LeaveCriticalSection(&sample->attributes.cs); + if (tracked_result) + IRtwqAsyncResult_Release(tracked_result); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount)

1 0

Nikolay Sivov : mf/session: Do not request more samples when SA sample becomes available.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 048e21d22e33fb8187532851dad6ce566592156b URL: https://source.winehq.org/git/wine.git/?a=commit;h=048e21d22e33fb8187532851… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:12:22 2022 +0300 mf/session: Do not request more samples when SA sample becomes available. The issue here is that upstream nodes get their request counters increased while sink hasn't requested any. This causes desync between sink request counters and upstream node counters, potentially causing sample drops and sink waiting forever for samples that will never come. Case like that is easy to reproduce with mfplay-based player, where occasionally end-of-presentation condition does not trigger, but new samples are coming in. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85b63f767fe..a78e7cfc473 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2369,6 +2369,8 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback * return E_NOTIMPL; } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node); + static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); @@ -2411,7 +2413,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) { - session_request_sample_from_node(session, upstream_node, upstream_output); + session_deliver_pending_samples(session, upstream_node); IMFTopologyNode_Release(upstream_node); } } @@ -2952,19 +2954,19 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (sample) + if (topo_node->u.sink.requests) { - if (topo_node->u.sink.requests) + if (sample) { if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample))) WARN("Stream sink failed to process sample, hr %#lx.\n", hr); - topo_node->u.sink.requests--; } - } - else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, - NULL, NULL))) - { - WARN("Failed to place sink marker, hr %#lx.\n", hr); + else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, + NULL, NULL))) + { + WARN("Failed to place sink marker, hr %#lx.\n", hr); + } + topo_node->u.sink.requests--; } break; case MF_TOPOLOGY_TRANSFORM_NODE: @@ -3048,6 +3050,57 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node) +{ + struct sample *sample_entry, *sample_entry2; + IMFTopologyNode *downstream_node; + struct topo_node *topo_node; + MF_TOPOLOGY_TYPE node_type; + DWORD downstream_input; + TOPOID node_id; + unsigned int i; + + IMFTopologyNode_GetNodeType(node, &node_type); + IMFTopologyNode_GetTopoNodeID(node, &node_id); + + topo_node = session_get_node_by_id(session, node_id); + + switch (node_type) + { + case MF_TOPOLOGY_TRANSFORM_NODE: + + transform_node_pull_samples(session, topo_node); + + /* Push down all available output. */ + for (i = 0; i < topo_node->u.transform.output_count; ++i) + { + if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) + { + WARN("Failed to get connected node for output %u.\n", i); + continue; + } + + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, + struct sample, entry) + { + if (!topo_node->u.transform.outputs[i].requests) + break; + + session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); + topo_node->u.transform.outputs[i].requests--; + + transform_release_sample(sample_entry); + } + + IMFTopologyNode_Release(downstream_node); + } + break; + default: + FIXME("Unexpected node type %u.\n", node_type); + } +} + + static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output) { IMFTopologyNode *downstream_node, *upstream_node;

1 0

Nikolay Sivov : evr/sample: Use explicit critical section for release handling.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: d686663d22cb027fae7607acf3bae96ab34018f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d686663d22cb027fae7607ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:16:18 2022 +0300 evr/sample: Use explicit critical section for release handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 738f803fe66..3521e6c4d51 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -923,7 +923,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) ULONG refcount = InterlockedDecrement(&sample->refcount); IMFAsyncResult *tracked_result = NULL; - IMFSample_LockStore(sample->sample); + EnterCriticalSection(&sample->cs); if (sample->tracked_result && sample->tracked_refcount == refcount) { tracked_result = sample->tracked_result; @@ -931,7 +931,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) sample->tracked_result = NULL; sample->tracked_refcount = 0; } - IMFSample_UnlockStore(sample->sample); + LeaveCriticalSection(&sample->cs); if (tracked_result) IMFAsyncResult_Release(tracked_result);

1 0

Alexandre Julliard : Wine release 7.8
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: website Branch: master Commit: 44f2de0497c2a3f9b18ebc3b143a1ec60e072233 URL: https://source.winehq.org/git/website.git/?a=commit;h=44f2de0497c2a3f9b18eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:39:11 2022 +0200 Wine release 7.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022050601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022050601.xml b/news/en/2022050601.xml new file mode 100644 index 00000000..6ca2abdf --- /dev/null +++ b/news/en/2022050601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 6, 2022</date> +<title>Wine 7.8 Released</title> +<body> + The Wine development release 7.8 is now available. + <a href="{$root}/announce/7.8">What's new</a> in this release: +<ul> + <li>X11 and OSS drivers converted to PE.</li> + <li>WoW64 support in the sound drivers.</li> + <li>Number formatting using the new locale database.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.8.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

Jacek Caban : win32u: Allow NULL cbtc in NtUserCreateWindowEx.
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: master Commit: 21c8ff873b9657a1b8cb632ab4ec435d6ffdf065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c8ff873b9657a1b8cb632a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 6 03:04:20 2022 +0200 win32u: Allow NULL cbtc in NtUserCreateWindowEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/window.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9231f98539e..94cdd7f7280 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4845,9 +4845,10 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, HWND parent, HMENU menu, HINSTANCE instance, void *params, DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) { - CREATESTRUCTW cs, *client_cs = cbtc->lpcs; + CREATESTRUCTW cs, *client_cs, cs_buf; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; + CBT_CREATEWNDW cbtc_buf; HWND hwnd, owner = 0; INT sw = SW_SHOW; RECT rect; @@ -4855,8 +4856,24 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; + /* FIXME: We should pass a packed struct to client instead of using client_cs */ + if (cbtc) + { + client_cs = cbtc->lpcs; + cs.lpszName = client_cs->lpszName; + cs.lpszClass = client_cs->lpszClass; + cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ + } + else + { + cbtc = &cbtc_buf; + client_cs = cbtc->lpcs = &cs_buf; + cs.lpszName = window_name ? window_name->Buffer : NULL; + cs.lpszClass = class_name->Buffer; + cs.hInstance = instance; + } + cs.lpCreateParams = params; - cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; @@ -4865,10 +4882,6 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, cs.y = y; cs.cx = cx; cs.cy = cy; - /* We use client_cs to pass original class and name pointers, - * that's probably not how native handles it. */ - cs.lpszName = client_cs->lpszName; - cs.lpszClass = client_cs->lpszClass; /* Find the parent window */ if (parent == HWND_MESSAGE)

1 0

Jacek Caban : winex11: Move LoadIcon call to dllmain.
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: master Commit: 2c1b7c8c170224657aa4ccbc79374c543d6b84f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1b7c8c170224657aa4ccbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:31:51 2022 +0200 winex11: Move LoadIcon call to dllmain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 +++++++ dlls/winex11.drv/unixlib.h | 1 + dlls/winex11.drv/window.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 705503dc37c..2a361c477f4 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -151,6 +151,12 @@ static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size ) } +static NTSTATUS x11drv_load_icon( UINT id ) +{ + return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); +} + + typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -162,6 +168,7 @@ static const callback_func callback_funcs[] = x11drv_ime_set_cursor_pos, x11drv_ime_set_open_status, x11drv_ime_update_association, + x11drv_load_icon, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 233a2578b41..f3f6b9b8f06 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -117,6 +117,7 @@ enum client_callback client_ime_set_cursor_pos, client_ime_set_open_status, client_ime_update_association, + client_load_icon, client_funcs_count }; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 161f749a81d..a62a3e84e81 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -627,7 +627,10 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_big) icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); if (!icon_big) - icon_big = get_icon_info( LoadIconW( 0, (LPWSTR)IDI_WINLOGO ), &ii); + { + UINT winlogo = x11drv_client_call( client_load_icon, IDI_WINLOGO ); + icon_big = get_icon_info( UlongToHandle( winlogo ), &ii ); + } } if (!icon_small) {

1 0

Alexandre Julliard : Release 7.8.
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: master Commit: 3ded60bd1654dc689d24a23305f4a93acce3a6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ded60bd1654dc689d24a233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:36:51 2022 +0200 Release 7.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1014 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 586 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ded60bd1654dc689d24…

1 0

Zhiyi Zhang : wintypes: Implement IApiInformationStatics stubs.
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: master Commit: 1c5d218ffb357cdb6b6dd71359740167352e1d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5d218ffb357cdb6b6dd713… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 6 17:29:28 2022 +0800 wintypes: Implement IApiInformationStatics stubs. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wintypes/main.c | 207 +++++++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 437 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5d218ffb357cdb6b6d…

1 0

Tag wine-7.8 : Alexandre Julliard : Release 7.8
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: refs/tags/wine-7.8 Tag: 1c25681084f19b152af765dc4d20ab816b8225d3 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1c25681084f19b152af765dc4d2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:36:51 2022 +0200 Release 7.8

1 0

Jacek Caban : include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs.
by Alexandre Julliard May 6, 2022

May 6, 2022

Module: wine Branch: master Commit: 497f37cf99575191e8a0b4bed40f554c9bb03794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=497f37cf99575191e8a0b4be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 12:23:01 2022 +0200 include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs. Allows win32u.so to expose such functions using unixlib interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dde.h | 2 +- include/ddeml.h | 2 +- include/wingdi.h | 2 +- include/winuser.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dde.h b/include/dde.h index 35623615398..4e0d1176727 100644 --- a/include/dde.h +++ b/include/dde.h @@ -28,7 +28,7 @@ extern "C" { #endif -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/ddeml.h b/include/ddeml.h index b8d7f00631a..dcac04bfb19 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -26,7 +26,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/wingdi.h b/include/wingdi.h index 7220aff089b..6778c60db79 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -24,7 +24,7 @@ extern "C" { #endif -#ifdef _GDI32_ +#if defined(_GDI32_) || defined(WINE_UNIX_LIB) #define WINGDIAPI #else #define WINGDIAPI DECLSPEC_HIDDEN diff --git a/include/winuser.h b/include/winuser.h index 01660e8a8f7..a227b912e0e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -19,7 +19,7 @@ #ifndef _WINUSER_ #define _WINUSER_ -#if !defined(_USER32_) +#if !defined(_USER32_) && !defined(WINE_UNIX_LIB) #define WINUSERAPI DECLSPEC_HIDDEN #else #define WINUSERAPI

1 0