September 2022 - Wine-commits

Zebediah Figura : rpcrt4: Make Ndr64AsyncClientCall() SEH-compatible.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 16713f52456d86c34eb5f0268468e044ada9d162 URL: https://gitlab.winehq.org/wine/wine/-/commit/16713f52456d86c34eb5f0268468e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:04:32 2022 -0500 rpcrt4: Make Ndr64AsyncClientCall() SEH-compatible. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e15c93d2310..3a4bfc72df1 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2306,11 +2306,11 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO #ifdef __x86_64__ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x20(%rsp),%r9\n\t" - "pushq $0\n\t" - "subq $0x20,%rsp\n\t" + "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x48(%rsp),%r9\n\t" + "movq $0,0x20(%rsp)\n\t" "call " __ASM_NAME("ndr64_async_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Zebediah Figura : rpcrt4: Add SEH annotations to Ndr64AsyncClientCall().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 37ae068773677a35342a594448d1bbabf9feb94a URL: https://gitlab.winehq.org/wine/wine/-/commit/37ae068773677a35342a594448d1bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:04:49 2022 -0500 rpcrt4: Add SEH annotations to Ndr64AsyncClientCall(). --- dlls/rpcrt4/ndr_stubless.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 3a4bfc72df1..890b248cfb8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2307,6 +2307,8 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "movq %r9,0x48(%rsp)\n\t" "leaq 0x48(%rsp),%r9\n\t"

1 0

Zebediah Figura : rpcrt4: Make NdrClientCall3() SEH-compatible.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: abe75a5f22d82d0b35d67ae9d531d49a3d67d09f URL: https://gitlab.winehq.org/wine/wine/-/commit/abe75a5f22d82d0b35d67ae9d531d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:06:36 2022 -0500 rpcrt4: Make NdrClientCall3() SEH-compatible. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 890b248cfb8..45f27f9f77d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2246,11 +2246,11 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_client_call( MIDL_STUBLESS_PROXY_INFO *info #ifdef __x86_64__ __ASM_GLOBAL_FUNC( NdrClientCall3, - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x20(%rsp),%r9\n\t" - "pushq $0\n\t" - "subq $0x20,%rsp\n\t" + "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x48(%rsp),%r9\n\t" + "movq $0,0x20(%rsp)\n\t" "call " __ASM_NAME("ndr64_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Zebediah Figura : rpcrt4: Add SEH annotations to NdrClientCall3().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 5d01faed777fadf6cb7882d8c8dc3bdfd26dd2e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d01faed777fadf6cb7882d8c8dc3b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:06:53 2022 -0500 rpcrt4: Add SEH annotations to NdrClientCall3(). --- dlls/rpcrt4/ndr_stubless.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 45f27f9f77d..e3eb8a93c6d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2247,6 +2247,8 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_client_call( MIDL_STUBLESS_PROXY_INFO *info __ASM_GLOBAL_FUNC( NdrClientCall3, "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "movq %r9,0x48(%rsp)\n\t" "leaq 0x48(%rsp),%r9\n\t"

1 0

Zebediah Figura : rpcrt4: Make NdrClientCall2() SEH-compatible.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: a5322fc94fa7333a09456a551d70eb1bf5a8fdbd URL: https://gitlab.winehq.org/wine/wine/-/commit/a5322fc94fa7333a09456a551d70eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:10:13 2022 -0500 rpcrt4: Make NdrClientCall2() SEH-compatible. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e3eb8a93c6d..e61294da07a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1005,12 +1005,12 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM #ifdef __x86_64__ __ASM_GLOBAL_FUNC( NdrClientCall2, - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x18(%rsp),%r8\n\t" - "xorq %r9,%r9\n\t" "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r8,0x40(%rsp)\n\t" + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" + "xorq %r9,%r9\n\t" "call " __ASM_NAME("ndr_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Rémi Bernon : winegstreamer: Rename async reader stream_thread to callback_thread.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: e5bf17d919f1e86bc25bae5ade1f7a7111f0e8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/e5bf17d919f1e86bc25bae5ade1f7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 17:20:14 2022 +0200 winegstreamer: Rename async reader stream_thread to callback_thread. --- dlls/winegstreamer/wm_asyncreader.c | 97 +++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 48 deletions(-)

1 0

Rémi Bernon : winegstreamer: Avoid leaking async ops on release or multiple close.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 31aa91c914a4591ea263456cbdf42769963cecfa URL: https://gitlab.winehq.org/wine/wine/-/commit/31aa91c914a4591ea263456cbdf427… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 22:15:33 2022 +0200 winegstreamer: Avoid leaking async ops on release or multiple close. --- dlls/winegstreamer/wm_asyncreader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 92c6ba88392..6f4aa303d82 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -267,12 +267,20 @@ static HRESULT open_stream(struct async_reader *reader, IWMReaderCallback *callb static void close_stream(struct async_reader *reader) { + struct async_op *op, *next; + if (reader->callback_thread) { WaitForSingleObject(reader->callback_thread, INFINITE); CloseHandle(reader->callback_thread); reader->callback_thread = NULL; } + + LIST_FOR_EACH_ENTRY_SAFE(op, next, &reader->async_ops, struct async_op, entry) + { + list_remove(&op->entry); + free(op); + } } static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context)

1 0

Rémi Bernon : winegstreamer: Leave WM reader CS on invalid output format.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 2a321ce324d84a2c143c96548b851375e48253ba URL: https://gitlab.winehq.org/wine/wine/-/commit/2a321ce324d84a2c143c96548b8513… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:41:20 2022 +0200 winegstreamer: Leave WM reader CS on invalid output format. --- dlls/winegstreamer/wm_reader.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 6c15413bba6..156f9d79446 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1764,6 +1764,7 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, struct output_props *props = unsafe_impl_from_IWMOutputMediaProps(props_iface); struct wg_format format, pref_format; struct wm_stream *stream; + HRESULT hr = S_OK; int i; strmbase_dump_media_type(&props->mt); @@ -1786,18 +1787,15 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, if (pref_format.major_type != format.major_type) { /* R.U.S.E sets the type of the wrong stream, apparently by accident. */ - LeaveCriticalSection(&reader->cs); - WARN("Major types don't match; returning NS_E_INCOMPATIBLE_FORMAT.\n"); - return NS_E_INCOMPATIBLE_FORMAT; + hr = NS_E_INCOMPATIBLE_FORMAT; } - - switch (pref_format.major_type) + else switch (pref_format.major_type) { case WG_MAJOR_TYPE_AUDIO: if (format.u.audio.format == WG_AUDIO_FORMAT_UNKNOWN) - return NS_E_AUDIO_CODEC_NOT_INSTALLED; - if (format.u.audio.channels > pref_format.u.audio.channels) - return NS_E_AUDIO_CODEC_NOT_INSTALLED; + hr = NS_E_AUDIO_CODEC_NOT_INSTALLED; + else if (format.u.audio.channels > pref_format.u.audio.channels) + hr = NS_E_AUDIO_CODEC_NOT_INSTALLED; break; case WG_MAJOR_TYPE_VIDEO: @@ -1805,16 +1803,23 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, if (format.u.video.format == video_formats[i]) break; if (i == ARRAY_SIZE(video_formats)) - return NS_E_INVALID_OUTPUT_FORMAT; - - if (pref_format.u.video.width != format.u.video.width) - return NS_E_INVALID_OUTPUT_FORMAT; - if (pref_format.u.video.height != format.u.video.height) - return NS_E_INVALID_OUTPUT_FORMAT; + hr = NS_E_INVALID_OUTPUT_FORMAT; + else if (pref_format.u.video.width != format.u.video.width) + hr = NS_E_INVALID_OUTPUT_FORMAT; + else if (pref_format.u.video.height != format.u.video.height) + hr = NS_E_INVALID_OUTPUT_FORMAT; break; default: - return NS_E_INCOMPATIBLE_FORMAT; + hr = NS_E_INCOMPATIBLE_FORMAT; + break; + } + + if (FAILED(hr)) + { + WARN("Unsupported media type, returning %#lx.\n", hr); + LeaveCriticalSection(&reader->cs); + return hr; } stream->format = format;

1 0

Rémi Bernon : winegstreamer: Leave async reader callback_cs on calloc error.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 5bc7ad1c34dd5115a28e7d96e072b1acd2d9db74 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bc7ad1c34dd5115a28e7d96e072b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 10:53:02 2022 +0200 winegstreamer: Leave async reader callback_cs on calloc error. --- dlls/winegstreamer/wm_asyncreader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6f4aa303d82..1be7e493f99 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -287,15 +287,13 @@ static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_ { struct async_op *op; - EnterCriticalSection(&reader->callback_cs); - if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->type = type; op->new_context = context; + EnterCriticalSection(&reader->callback_cs); list_add_tail(&reader->async_ops, &op->entry); - LeaveCriticalSection(&reader->callback_cs); WakeConditionVariable(&reader->callback_cv);

1 0

Rémi Bernon : winegstreamer: Move open_stream / close_stream helpers around.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: b600c85dae420b36695a02327b45e87747873842 URL: https://gitlab.winehq.org/wine/wine/-/commit/b600c85dae420b36695a02327b45e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 19:19:38 2022 +0200 winegstreamer: Move open_stream / close_stream helpers around. --- dlls/winegstreamer/wm_asyncreader.c | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 1be7e493f99..bd7e58713f4 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -247,25 +247,7 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) return 0; } -static HRESULT open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) -{ - IWMReaderCallback_AddRef((reader->callback = callback)); - reader->context = context; - - reader->running = true; - if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) - { - IWMReaderCallback_Release(reader->callback); - reader->running = false; - reader->callback = NULL; - reader->context = NULL; - return E_OUTOFMEMORY; - } - - return S_OK; -} - -static void close_stream(struct async_reader *reader) +static void async_reader_close(struct async_reader *reader) { struct async_op *op, *next; @@ -283,6 +265,24 @@ static void close_stream(struct async_reader *reader) } } +static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context) +{ + IWMReaderCallback_AddRef((reader->callback = callback)); + reader->context = context; + + reader->running = true; + if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) + { + IWMReaderCallback_Release(reader->callback); + reader->running = false; + reader->callback = NULL; + reader->context = NULL; + return E_OUTOFMEMORY; + } + + return S_OK; +} + static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) { struct async_op *op; @@ -345,7 +345,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, } if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url)) - && FAILED(hr = open_stream(reader, callback, context))) + && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); @@ -362,7 +362,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) EnterCriticalSection(&reader->reader.cs); async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL); - close_stream(reader); + async_reader_close(reader); hr = wm_reader_close(&reader->reader); if (reader->callback) @@ -825,7 +825,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, } if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream)) - && FAILED(hr = open_stream(reader, callback, context))) + && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); @@ -1686,7 +1686,7 @@ static void async_reader_destroy(struct wm_reader *iface) LeaveCriticalSection(&reader->callback_cs); WakeConditionVariable(&reader->callback_cv); - close_stream(reader); + async_reader_close(reader); reader->callback_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&reader->callback_cs);

1 0