wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Paul Gofman : advapi32: Add stub for PerfOpenQueryHandle().
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: a5921e715c02b5ea649a28d3c9eda8e557ef031e URL: https://gitlab.winehq.org/wine/wine/-/commit/a5921e715c02b5ea649a28d3c9eda8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 12 18:46:29 2022 -0500 advapi32: Add stub for PerfOpenQueryHandle(). --- dlls/advapi32/advapi.c | 10 ++++++++++ dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/tests/perf.c | 38 ++++++++++++++++++++++++++++++++++++++ include/perflib.h | 1 + 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index a1f0385357e..c3d2e2d00e7 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -321,3 +321,13 @@ ULONG WINAPI PerfCloseQueryHandle( HANDLE query ) return ERROR_SUCCESS; } + +ULONG WINAPI PerfOpenQueryHandle( const WCHAR *machine, HANDLE *query ) +{ + FIXME( "machine %s, query %p.\n", debugstr_w(machine), query ); + + if (!query) return ERROR_INVALID_PARAMETER; + *query = (HANDLE)0xdeadbeef; + + return ERROR_SUCCESS; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 21a76675bc5..d80b4d938f6 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -564,7 +564,7 @@ # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue # @ stub PerfIncrementULongLongCounterValue -# @ stub PerfOpenQueryHandle +@ stdcall PerfOpenQueryHandle(wstr ptr) # @ stub PerfQueryCounterData # @ stub PerfQueryCounterInfo # @ stub PerfQueryCounterSetRegistrationInfo diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c index fc07a09d327..2cd2a208677 100644 --- a/dlls/advapi32/tests/perf.c +++ b/dlls/advapi32/tests/perf.c @@ -28,6 +28,21 @@ #include "wine/test.h" +#define DEFINE_FUNCTION(name) static typeof(name) *p##name; +DEFINE_FUNCTION(PerfCloseQueryHandle); +DEFINE_FUNCTION(PerfOpenQueryHandle); +#undef DEFINE_FUNCTION + +static void init_functions(void) +{ + HANDLE hadvapi = GetModuleHandleA("advapi32.dll"); + +#define GET_FUNCTION(name) p##name = (void *)GetProcAddress(hadvapi, #name) + GET_FUNCTION(PerfCloseQueryHandle); + GET_FUNCTION(PerfOpenQueryHandle); +#undef GET_FUNCTION +} + static ULONG WINAPI test_provider_callback(ULONG code, void *buffer, ULONG size) { ok(0, "Provider callback called.\n"); @@ -188,7 +203,30 @@ void test_provider_init(void) ok(!ret, "Got unexpected ret %lu.\n", ret); } +static void test_perf_counters(void) +{ + HANDLE query; + ULONG ret; + + if (!pPerfOpenQueryHandle) + { + win_skip("PerfOpenQueryHandle not found.\n"); + return; + } + + ret = pPerfOpenQueryHandle(NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got ret %lu.\n", ret); + ret = pPerfOpenQueryHandle(NULL, &query); + ok(!ret, "got ret %lu.\n", ret); + + ret = pPerfCloseQueryHandle(query); + ok(!ret, "got ret %lu.\n", ret); +} + START_TEST(perf) { + init_functions(); + test_provider_init(); + test_perf_counters(); } diff --git a/include/perflib.h b/include/perflib.h index 27019bd842c..47b6bdefc84 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -90,6 +90,7 @@ ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); ULONG WINAPI PerfStopProvider(HANDLE); ULONG WINAPI PerfCloseQueryHandle(HANDLE); +ULONG WINAPI PerfOpenQueryHandle(const WCHAR *, HANDLE *); #ifdef __cplusplus } /* extern "C" */

1 0

Paul Gofman : advapi32: Add stub for PerfCloseQueryHandle().
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: f83181587decc6775dba10a7d5b3a79e79543bf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f83181587decc6775dba10a7d5b3a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 12 18:25:44 2022 -0500 advapi32: Add stub for PerfCloseQueryHandle(). --- dlls/advapi32/advapi.c | 8 ++++++++ dlls/advapi32/advapi32.spec | 2 +- include/perflib.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index cbd4612425d..a1f0385357e 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -31,6 +31,7 @@ #include "winerror.h" #include "wincred.h" #include "wct.h" +#include "perflib.h" #include "wine/debug.h" @@ -313,3 +314,10 @@ BOOL WINAPI GetThreadWaitChain(HWCT handle, DWORD_PTR ctx, DWORD flags, DWORD th SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +ULONG WINAPI PerfCloseQueryHandle( HANDLE query ) +{ + FIXME( "query %p stub.\n", query ); + + return ERROR_SUCCESS; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3cbf5638ae4..21a76675bc5 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -554,7 +554,7 @@ # @ stub OperationEnd # @ stub OperationStart # @ stub PerfAddCounters -# @ stub PerfCloseQueryHandle +@ stdcall PerfCloseQueryHandle(long) @ stdcall -import PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue diff --git a/include/perflib.h b/include/perflib.h index 54ea8ccb614..27019bd842c 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -89,6 +89,8 @@ ULONG WINAPI PerfStartProvider(GUID *, PERFLIBREQUEST, HANDLE *); ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); ULONG WINAPI PerfStopProvider(HANDLE); +ULONG WINAPI PerfCloseQueryHandle(HANDLE); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Rémi Bernon : winegstreamer: Request the wm_reader stream only when necessary.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 7fef747033127eb7083e879dbf4f558e98bd87e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fef747033127eb7083e879dbf4f55… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:19:45 2022 +0200 winegstreamer: Request the wm_reader stream only when necessary. --- dlls/winegstreamer/wm_asyncreader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 488a03bd4d0..b4750592778 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -125,7 +125,6 @@ static void callback_thread_run(struct async_reader *reader) { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; - struct wm_stream *stream; static const DWORD zero; QWORD pts, duration; WORD stream_number; @@ -141,10 +140,10 @@ static void callback_thread_run(struct async_reader *reader) if (hr != S_OK) break; - stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (async_reader_wait_pts(reader, pts)) { + struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); + LeaveCriticalSection(&reader->callback_cs); if (stream->read_compressed) hr = IWMReaderCallbackAdvanced_OnStreamSample(callback_advanced,

1 0

Rémi Bernon : winegstreamer: Introduce a new async_reader_wait_pts helper.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 68cc41babff5d08c5a8b0d93616876da4ceed39a URL: https://gitlab.winehq.org/wine/wine/-/commit/68cc41babff5d08c5a8b0d93616876… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:19:10 2022 +0200 winegstreamer: Introduce a new async_reader_wait_pts helper. --- dlls/winegstreamer/wm_asyncreader.c | 44 ++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 5d987687a84..488a03bd4d0 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -96,6 +96,31 @@ static DWORD async_reader_get_wait_timeout(struct async_reader *reader, QWORD pt return pts > current_time ? timeout : 0; } +static bool async_reader_wait_pts(struct async_reader *reader, QWORD pts) +{ + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; + DWORD timeout; + + TRACE("reader %p, pts %I64d.\n", reader, pts); + + if (reader->user_clock && pts > reader->user_time && callback_advanced) + { + QWORD user_time = reader->user_time; + LeaveCriticalSection(&reader->callback_cs); + IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); + EnterCriticalSection(&reader->callback_cs); + } + + while (reader->running && list_empty(&reader->async_ops)) + { + if (!(timeout = async_reader_get_wait_timeout(reader, pts))) + return true; + SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, timeout); + } + + return false; +} + static void callback_thread_run(struct async_reader *reader) { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; @@ -110,8 +135,6 @@ static void callback_thread_run(struct async_reader *reader) while (reader->running && list_empty(&reader->async_ops)) { - DWORD timeout; - LeaveCriticalSection(&reader->callback_cs); hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); EnterCriticalSection(&reader->callback_cs); @@ -120,22 +143,7 @@ static void callback_thread_run(struct async_reader *reader) stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (reader->user_clock && pts > reader->user_time && callback_advanced) - { - QWORD user_time = reader->user_time; - LeaveCriticalSection(&reader->callback_cs); - IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); - EnterCriticalSection(&reader->callback_cs); - } - - while (reader->running && list_empty(&reader->async_ops)) - { - if (!(timeout = async_reader_get_wait_timeout(reader, pts))) - break; - SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, timeout); - } - - if (reader->running && list_empty(&reader->async_ops)) + if (async_reader_wait_pts(reader, pts)) { LeaveCriticalSection(&reader->callback_cs); if (stream->read_compressed)

1 0

Rémi Bernon : winegstreamer: Factor async_reader waits using async_reader_get_wait_timeout.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 524413cf40c03a5cb45f0a22c9bdeac9034e50c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/524413cf40c03a5cb45f0a22c9bdea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 00:37:55 2022 +0200 winegstreamer: Factor async_reader waits using async_reader_get_wait_timeout. --- dlls/winegstreamer/wm_asyncreader.c | 47 ++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 99d891cec53..5d987687a84 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -82,6 +82,20 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) return (time.QuadPart * 1000) / reader->clock_frequency.QuadPart * 10000; } +static DWORD async_reader_get_wait_timeout(struct async_reader *reader, QWORD pts) +{ + REFERENCE_TIME current_time = reader->user_time; + DWORD timeout = INFINITE; + + if (!reader->user_clock) + { + current_time = get_current_time(reader) - reader->clock_start; + timeout = (pts - current_time) / 10000; + } + + return pts > current_time ? timeout : 0; +} + static void callback_thread_run(struct async_reader *reader) { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; @@ -96,6 +110,8 @@ static void callback_thread_run(struct async_reader *reader) while (reader->running && list_empty(&reader->async_ops)) { + DWORD timeout; + LeaveCriticalSection(&reader->callback_cs); hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); EnterCriticalSection(&reader->callback_cs); @@ -104,32 +120,19 @@ static void callback_thread_run(struct async_reader *reader) stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (reader->user_clock) + if (reader->user_clock && pts > reader->user_time && callback_advanced) { QWORD user_time = reader->user_time; - - if (pts > user_time && callback_advanced) - { - LeaveCriticalSection(&reader->callback_cs); - IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); - EnterCriticalSection(&reader->callback_cs); - } - - while (reader->running && list_empty(&reader->async_ops) && pts > reader->user_time) - SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, INFINITE); + LeaveCriticalSection(&reader->callback_cs); + IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); + EnterCriticalSection(&reader->callback_cs); } - else - { - while (reader->running && list_empty(&reader->async_ops)) - { - REFERENCE_TIME current_time = get_current_time(reader) - reader->clock_start; - - if (pts <= current_time) - break; - SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, - (pts - current_time) / 10000); - } + while (reader->running && list_empty(&reader->async_ops)) + { + if (!(timeout = async_reader_get_wait_timeout(reader, pts))) + break; + SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, timeout); } if (reader->running && list_empty(&reader->async_ops))

1 0

Rémi Bernon : winegstreamer: Check whether the reader is still running before user time.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 0ae64636f667def3f5e1b04c0cb1d0b64d47fbbf URL: https://gitlab.winehq.org/wine/wine/-/commit/0ae64636f667def3f5e1b04c0cb1d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 00:33:05 2022 +0200 winegstreamer: Check whether the reader is still running before user time. --- dlls/winegstreamer/wm_asyncreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b401fd58bc8..99d891cec53 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -115,7 +115,7 @@ static void callback_thread_run(struct async_reader *reader) EnterCriticalSection(&reader->callback_cs); } - while (pts > reader->user_time && reader->running && list_empty(&reader->async_ops)) + while (reader->running && list_empty(&reader->async_ops) && pts > reader->user_time) SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, INFINITE); } else

1 0

Rémi Bernon : winegstreamer: Keep start time in the async_reader struct.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 63f9aaea83836e97ad1420a321719fa0787e118a URL: https://gitlab.winehq.org/wine/wine/-/commit/63f9aaea83836e97ad1420a321719f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 01:04:59 2022 +0200 winegstreamer: Keep start time in the async_reader struct. --- dlls/winegstreamer/wm_asyncreader.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 2215669309e..b401fd58bc8 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -60,6 +60,7 @@ struct async_reader IWMReaderCallback *callback; void *context; + REFERENCE_TIME clock_start; LARGE_INTEGER clock_frequency; HANDLE callback_thread; @@ -85,7 +86,6 @@ static void callback_thread_run(struct async_reader *reader) { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; - REFERENCE_TIME start_time; struct wm_stream *stream; static const DWORD zero; QWORD pts, duration; @@ -94,8 +94,6 @@ static void callback_thread_run(struct async_reader *reader) HRESULT hr = S_OK; DWORD flags; - start_time = get_current_time(reader); - while (reader->running && list_empty(&reader->async_ops)) { LeaveCriticalSection(&reader->callback_cs); @@ -124,13 +122,13 @@ static void callback_thread_run(struct async_reader *reader) { while (reader->running && list_empty(&reader->async_ops)) { - REFERENCE_TIME current_time = get_current_time(reader); + REFERENCE_TIME current_time = get_current_time(reader) - reader->clock_start; - if (pts <= current_time - start_time) + if (pts <= current_time) break; SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, - (pts - (current_time - start_time)) / 10000); + (pts - current_time) / 10000); } } @@ -208,7 +206,10 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) { reader->context = op->u.start.context; if (SUCCEEDED(hr)) + { wm_reader_seek(&reader->reader, op->u.start.start, op->u.start.duration); + reader->clock_start = get_current_time(reader); + } LeaveCriticalSection(&reader->callback_cs); IWMReaderCallback_OnStatus(reader->callback, WMT_STARTED, hr,

1 0

Rémi Bernon : winegstreamer: Implement async reader asynchronous seeking.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: e0045a3181133d57a1e94b2705410a3b9733c35f URL: https://gitlab.winehq.org/wine/wine/-/commit/e0045a3181133d57a1e94b2705410a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 07:55:36 2022 +0200 winegstreamer: Implement async reader asynchronous seeking. --- dlls/winegstreamer/wm_asyncreader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 493075859ad..2215669309e 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -26,6 +26,8 @@ union async_op_data { struct { + QWORD start; + QWORD duration; void *context; } start; }; @@ -205,6 +207,9 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) case ASYNC_OP_START: { reader->context = op->u.start.context; + if (SUCCEEDED(hr)) + wm_reader_seek(&reader->reader, op->u.start.start, op->u.start.duration); + LeaveCriticalSection(&reader->callback_cs); IWMReaderCallback_OnStatus(reader->callback, WMT_STARTED, hr, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -440,7 +445,7 @@ static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { - union async_op_data data = {.start = {.context = context}}; + union async_op_data data = {.start = {.start = start, .duration = duration, .context = context}}; struct async_reader *reader = impl_from_IWMReader(iface); HRESULT hr; @@ -455,10 +460,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, if (!reader->callback_thread) hr = NS_E_INVALID_REQUEST; else - { - wm_reader_seek(&reader->reader, start, duration); hr = async_reader_queue_op(reader, ASYNC_OP_START, &data); - } LeaveCriticalSection(&reader->reader.cs);

1 0

Rémi Bernon : winegstreamer: Unconditionally assign new context for ASYNC_OP_START.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 09aef50a3909802b6c8dc7e4d92aaabb352082e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/09aef50a3909802b6c8dc7e4d92aaa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 01:02:45 2022 +0200 winegstreamer: Unconditionally assign new context for ASYNC_OP_START. --- dlls/winegstreamer/wm_asyncreader.c | 3 +-- dlls/wmvcore/tests/wmvcore.c | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index c280828b616..493075859ad 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -199,13 +199,12 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) struct async_op *op = LIST_ENTRY(entry, struct async_op, entry); list_remove(&op->entry); - if (op->u.start.context) - reader->context = op->u.start.context; hr = list_empty(&reader->async_ops) ? S_OK : E_ABORT; switch (op->type) { case ASYNC_OP_START: { + reader->context = op->u.start.context; LeaveCriticalSection(&reader->callback_cs); IWMReaderCallback_OnStatus(reader->callback, WMT_STARTED, hr, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6883144df6e..06e1852c8c0 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1867,7 +1867,6 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta callback->callback_tid = GetCurrentThreadId(); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_started, 100); ok(!ret, "Wait timed out.\n"); @@ -1881,7 +1880,6 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_stopped, 100); ok(!ret, "Wait timed out.\n"); @@ -1891,7 +1889,6 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); ++callback->closed_count; break; @@ -1900,7 +1897,6 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); ++callback->end_of_streaming_count; break; @@ -1909,7 +1905,6 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); @@ -2014,7 +2009,6 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, ok(callback->output_tid[1 - output] != GetCurrentThreadId(), "got wrong thread\n"); } - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2114,7 +2108,6 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(time == callback->expect_ontime, "Got time %I64u.\n", time); - todo_wine_if(!callback->expect_context) ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); SetEvent(callback->ontime_event); return S_OK;

1 0

Rémi Bernon : winegstreamer: Wrap async reader op new_context in a union.
by Alexandre Julliard 13 Sep '22

13 Sep '22

Module: wine Branch: master Commit: 9808fd97893b0913633c4d27d7b56ac41975fe08 URL: https://gitlab.winehq.org/wine/wine/-/commit/9808fd97893b0913633c4d27d7b56a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 19:07:22 2022 +0200 winegstreamer: Wrap async reader op new_context in a union. --- dlls/winegstreamer/wm_asyncreader.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index f3e2209881a..c280828b616 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -22,6 +22,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +union async_op_data +{ + struct + { + void *context; + } start; +}; + struct async_op { enum async_op_type @@ -30,7 +38,7 @@ struct async_op ASYNC_OP_STOP, ASYNC_OP_CLOSE, } type; - void *new_context; + union async_op_data u; struct list entry; }; @@ -191,8 +199,8 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) struct async_op *op = LIST_ENTRY(entry, struct async_op, entry); list_remove(&op->entry); - if (op->new_context) - reader->context = op->new_context; + if (op->u.start.context) + reader->context = op->u.start.context; hr = list_empty(&reader->async_ops) ? S_OK : E_ABORT; switch (op->type) { @@ -291,14 +299,15 @@ error: return hr; } -static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) +static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, union async_op_data *data) { struct async_op *op; if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->type = type; - op->new_context = context; + if (data) + op->u = *data; EnterCriticalSection(&reader->callback_cs); list_add_tail(&reader->async_ops, &op->entry); @@ -432,6 +441,7 @@ static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { + union async_op_data data = {.start = {.context = context}}; struct async_reader *reader = impl_from_IWMReader(iface); HRESULT hr; @@ -448,7 +458,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, else { wm_reader_seek(&reader->reader, start, duration); - hr = async_reader_queue_op(reader, ASYNC_OP_START, context); + hr = async_reader_queue_op(reader, ASYNC_OP_START, &data); } LeaveCriticalSection(&reader->reader.cs);

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2022