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

Francois Gouget : mscvpdb: Fix a spelling error in a comment.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: b886f6198b058658f99555e46cb1b2e7bd25f39e URL: https://gitlab.winehq.org/wine/wine/-/commit/b886f6198b058658f99555e46cb1b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 8 09:38:19 2022 +0200 mscvpdb: Fix a spelling error in a comment. --- include/wine/mscvpdb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 994165463f3..69dd42f0c09 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1379,7 +1379,7 @@ struct cv_local_varflag unsigned short is_param : 1; unsigned short address_taken : 1; unsigned short from_compiler : 1; /* generated by compiler */ - unsigned short is_aggregate : 1; /* splitted in several variables by compiler */ + unsigned short is_aggregate : 1; /* split in several variables by compiler */ unsigned short from_aggregate : 1; /* marks a temporary from an aggregate */ unsigned short is_aliased : 1; unsigned short from_alias : 1;

1 0

Francois Gouget : dbghelp: Fix a couple of spelling errors in a comment.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: b25b2ed31a53a3eb03200483b32499d21fc8afe2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b25b2ed31a53a3eb03200483b32499… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 8 09:37:48 2022 +0200 dbghelp: Fix a couple of spelling errors in a comment. --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 2fca1f229d1..a51f482cc6f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2579,8 +2579,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, break; case S_LOCAL: /* FIXME: don't store global/static variables accessed through registers... we don't support that - * in locals... anyway, global data record should be present as well (so variable will be avaible - * through global defintion, but potentially not updated) + * in locals... anyway, global data record should be present as well (so the variable will be available + * through the global definition, but potentially not updated) */ if (!sym->local_v3.varflags.enreg_global && !sym->local_v3.varflags.enreg_static) {

1 0

Rémi Bernon : wmvcore/tests: Test that the callback thread is always the same.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: ea6de10f89fff365c65e2ee035e0234dca14ab5e URL: https://gitlab.winehq.org/wine/wine/-/commit/ea6de10f89fff365c65e2ee035e023… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 19 00:36:46 2022 +0200 wmvcore/tests: Test that the callback thread is always the same. --- dlls/wmvcore/tests/wmvcore.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9a8a9634d8d..3feb449c37d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1789,6 +1789,8 @@ struct callback bool read_compressed; DWORD max_stream_sample_size[2]; + DWORD callback_tid; + QWORD expect_ontime; HANDLE ontime_event; }; @@ -1857,6 +1859,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta break; case WMT_STARTED: + callback->callback_tid = GetCurrentThreadId(); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1869,6 +1872,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta break; case WMT_STOPPED: + 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); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1885,6 +1889,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta break; case WMT_END_OF_STREAMING: + 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); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1892,6 +1897,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta break; case WMT_EOF: + 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); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1909,6 +1915,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta /* Not sent when not using IWMReaderAdvanced::DeliverTime(). */ case WMT_END_OF_SEGMENT: + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1978,6 +1985,8 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, trace("%lu: %04lx: IWMReaderCallback::OnSample(output %lu, time %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2031,6 +2040,8 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), stream_number, pts, duration, flags); + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2051,6 +2062,8 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", GetTickCount(), GetCurrentThreadId(), time); + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + ok(time == callback->expect_ontime, "Got time %I64u.\n", time); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); SetEvent(callback->ontime_event); @@ -2082,6 +2095,9 @@ static HRESULT WINAPI callback_advanced_AllocateForStream(IWMReaderCallbackAdvan trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForStream(output %u, size %lu)\n", GetTickCount(), GetCurrentThreadId(), stream_number, size); + todo_wine + ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + ok(callback->read_compressed, "AllocateForStream() should only be called when reading compressed samples.\n"); ok(callback->allocated_samples, "AllocateForStream() should only be called when using a custom allocator.\n"); @@ -2115,6 +2131,9 @@ static HRESULT WINAPI callback_advanced_AllocateForOutput(IWMReaderCallbackAdvan trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForOutput(output %lu, size %lu)\n", GetTickCount(), GetCurrentThreadId(), output, size); + todo_wine + ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + if (!callback->read_compressed) { /* Actually AllocateForOutput() isn't called when reading compressed @@ -2352,6 +2371,7 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st callback->sample_count = 0; callback->end_of_streaming_count = 0; callback->eof_count = 0; + callback->callback_tid = 0; hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Francois Gouget : mshtml/tests: Fix a spelling error in an ok() message.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: a9e28f130d036d57f41569f4bc8c15a586cdedd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9e28f130d036d57f41569f4bc8c15… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 8 09:37:14 2022 +0200 mshtml/tests: Fix a spelling error in an ok() message. --- dlls/mshtml/tests/xhr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index d60a449678b..2b07ee2f188 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -101,7 +101,7 @@ function test_content_types() { if(v < 10 || types === xml_types) ok(xhr.responseXML !== null, "unexpected null responseXML for " + types[i]); else - ok(xhr.responseXML === null, "unexpected non-null responseXML for " + (override ? "overriden " : "") + types[i]); + ok(xhr.responseXML === null, "unexpected non-null responseXML for " + (override ? "overridden " : "") + types[i]); if(("overrideMimeType" in xhr) && !override) { override = true;

1 0

Rémi Bernon : wmvcore/tests: Test async reader DedicatedDeliveryThread setting.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 4d0e202092a954a3af20dc5e5c9e5a1818a4346a URL: https://gitlab.winehq.org/wine/wine/-/commit/4d0e202092a954a3af20dc5e5c9e5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 19 15:26:13 2022 +0200 wmvcore/tests: Test async reader DedicatedDeliveryThread setting. --- dlls/wmvcore/tests/wmvcore.c | 74 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9e38719c244..3635a2ed642 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1789,7 +1789,9 @@ struct callback bool read_compressed; DWORD max_stream_sample_size[2]; + bool dedicated_threads; DWORD callback_tid; + DWORD output_tid[2]; QWORD last_pts; @@ -1987,7 +1989,24 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, trace("%lu: %04lx: IWMReaderCallback::OnSample(output %lu, time %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); - ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + if (callback->dedicated_threads) + { + todo_wine + ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + } + else + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + + if (!callback->output_tid[output]) + callback->output_tid[output] = GetCurrentThreadId(); + else + ok(callback->output_tid[output] == GetCurrentThreadId(), "got wrong thread\n"); + + if (callback->dedicated_threads && callback->output_tid[1 - output]) + { + todo_wine + ok(callback->output_tid[1 - output] != GetCurrentThreadId(), "got wrong thread\n"); + } ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -2042,9 +2061,28 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), stream_number, pts, duration, flags); - ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); - ok(callback->last_pts <= pts, "got pts %I64d\n", pts); - callback->last_pts = pts; + if (callback->dedicated_threads) + { + todo_wine + ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + } + else + { + ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + ok(callback->last_pts <= pts, "got pts %I64d\n", pts); + callback->last_pts = pts; + } + + if (!callback->output_tid[stream_number - 1]) + callback->output_tid[stream_number - 1] = GetCurrentThreadId(); + else + ok(callback->output_tid[stream_number - 1] == GetCurrentThreadId(), "got wrong thread\n"); + + if (callback->dedicated_threads && callback->output_tid[2 - stream_number]) + { + todo_wine + ok(callback->output_tid[2 - stream_number] != GetCurrentThreadId(), "got wrong thread\n"); + } ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -2101,6 +2139,8 @@ static HRESULT WINAPI callback_advanced_AllocateForStream(IWMReaderCallbackAdvan todo_wine ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + todo_wine_if(callback->output_tid[stream_number - 1]) + ok(callback->output_tid[stream_number - 1] != GetCurrentThreadId(), "got wrong thread\n"); ok(callback->read_compressed, "AllocateForStream() should only be called when reading compressed samples.\n"); ok(callback->allocated_samples, "AllocateForStream() should only be called when using a custom allocator.\n"); @@ -2137,6 +2177,8 @@ static HRESULT WINAPI callback_advanced_AllocateForOutput(IWMReaderCallbackAdvan todo_wine ok(callback->callback_tid != GetCurrentThreadId(), "got wrong thread\n"); + todo_wine_if(callback->output_tid[output]) + ok(callback->output_tid[output] != GetCurrentThreadId(), "got wrong thread\n"); if (!callback->read_compressed) { @@ -2377,6 +2419,12 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st callback->eof_count = 0; callback->callback_tid = 0; callback->last_pts = 0; + memset(callback->output_tid, 0, sizeof(callback->output_tid)); + + check_async_set_output_setting(advanced, 0, L"DedicatedDeliveryThread", + WMT_TYPE_BOOL, callback->dedicated_threads, S_OK); + check_async_set_output_setting(advanced, 1, L"DedicatedDeliveryThread", + WMT_TYPE_BOOL, callback->dedicated_threads, S_OK); hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -2954,10 +3002,28 @@ static void test_async_reader_streaming(void) wait_stopped_callback(&callback); test_reader_attributes(profile); + + trace("Checking default settings.\n"); + trace(" with stream selection\n"); + test_async_reader_selection(reader, advanced, &callback); + trace(" with sample allocation\n"); + test_async_reader_allocate(reader, advanced, &callback); + trace(" with compressed sample\n"); + test_async_reader_compressed(reader, advanced, &callback); + trace(" with compressed sample allocation\n"); + test_async_reader_allocate_compressed(reader, advanced, &callback); + + callback.dedicated_threads = TRUE; + trace("Checking DedicatedDeliveryThread.\n"); + trace(" with stream selection\n"); test_async_reader_selection(reader, advanced, &callback); + trace(" with sample allocation\n"); test_async_reader_allocate(reader, advanced, &callback); + trace(" with compressed sample\n"); test_async_reader_compressed(reader, advanced, &callback); + trace(" with compressed sample allocation\n"); test_async_reader_allocate_compressed(reader, advanced, &callback); + callback.dedicated_threads = FALSE; hr = IWMReader_Close(reader); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Rémi Bernon : wmvcore/tests: Test async reader compressed sample monotonic pts.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 18f1e9bd00485aad55c638dcc4374e3e617fae0d URL: https://gitlab.winehq.org/wine/wine/-/commit/18f1e9bd00485aad55c638dcc4374e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 13:46:03 2022 +0200 wmvcore/tests: Test async reader compressed sample monotonic pts. --- dlls/wmvcore/tests/wmvcore.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 3feb449c37d..9e38719c244 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1791,6 +1791,8 @@ struct callback DWORD callback_tid; + QWORD last_pts; + QWORD expect_ontime; HANDLE ontime_event; }; @@ -2041,6 +2043,8 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced GetTickCount(), GetCurrentThreadId(), stream_number, pts, duration, flags); ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); + ok(callback->last_pts <= pts, "got pts %I64d\n", pts); + callback->last_pts = pts; ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -2372,6 +2376,7 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st callback->end_of_streaming_count = 0; callback->eof_count = 0; callback->callback_tid = 0; + callback->last_pts = 0; hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Rémi Bernon : wmvcore/tests: Test async reader output settings read / write.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 161846fb7143d01a68c97927f28a4f55368bb596 URL: https://gitlab.winehq.org/wine/wine/-/commit/161846fb7143d01a68c97927f28a4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 19 00:36:46 2022 +0200 wmvcore/tests: Test async reader output settings read / write. --- dlls/wmvcore/tests/wmvcore.c | 239 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+)

1 0

Rémi Bernon : wmvcore/tests: Test sync reader output settings read / write.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 11fe0d115cbaa75e988fa1cd831356c70fe8b046 URL: https://gitlab.winehq.org/wine/wine/-/commit/11fe0d115cbaa75e988fa1cd831356… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 19 00:36:46 2022 +0200 wmvcore/tests: Test sync reader output settings read / write. --- dlls/wmvcore/tests/wmvcore.c | 233 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+)

1 0

Rémi Bernon : wmvcore/tests: Use a constant for test.wmv duration.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 7cd83c9804d028826a1114d9fa2eb686eb8c916e URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd83c9804d028826a1114d9fa2eb6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 12:59:52 2022 +0200 wmvcore/tests: Use a constant for test.wmv duration. --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 237546ed7a6..098b9addd99 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -30,6 +30,8 @@ #include "wine/test.h" +static const DWORD test_wmv_duration = 20460000; + HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); static BOOL compare_media_types(const WM_MEDIA_TYPE *a, const WM_MEDIA_TYPE *b) @@ -719,7 +721,7 @@ static void test_reader_attributes(IWMProfile *profile) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); - ok(duration == 20460000, "Got duration %I64u.\n", duration); + ok(duration == test_wmv_duration, "Got duration %I64u.\n", duration); ok(stream_number == 0, "Got stream number %u.\n", stream_number); /* Pass a too-small size. */ @@ -2077,7 +2079,7 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + hr = IWMReaderAdvanced2_DeliverTime(advanced, test_wmv_duration * 2); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_eof_callback(callback); @@ -2416,7 +2418,7 @@ static void test_async_reader_streaming(void) /* By default the reader will time itself, and attempt to deliver samples * 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); + hr = IWMReaderAdvanced2_DeliverTime(advanced, test_wmv_duration * 2); ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -2425,13 +2427,13 @@ static void test_async_reader_streaming(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); - callback.expect_ontime = 1000 * 10000; - hr = IWMReaderAdvanced2_DeliverTime(advanced, 1000 * 10000); + callback.expect_ontime = test_wmv_duration / 2; + hr = IWMReaderAdvanced2_DeliverTime(advanced, test_wmv_duration / 2); ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); - callback.expect_ontime = 3000 * 10000; - hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + callback.expect_ontime = test_wmv_duration * 2; + hr = IWMReaderAdvanced2_DeliverTime(advanced, test_wmv_duration * 2); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_eof_callback(&callback); @@ -2443,7 +2445,7 @@ static void test_async_reader_streaming(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_started_callback(&callback); - hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + hr = IWMReaderAdvanced2_DeliverTime(advanced, test_wmv_duration * 2); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_eof_callback(&callback);

1 0

Matteo Bruni : d3dx10/tests: Add a test for D3DX10PreprocessShaderFromMemory().
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: b996a969818685878f1dbe04b773bc4c5f4fd5c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b996a969818685878f1dbe04b773bc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Aug 30 17:58:40 2022 +0200 d3dx10/tests: Add a test for D3DX10PreprocessShaderFromMemory(). --- dlls/d3dx10_43/tests/d3dx10.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index f750d0d3667..b8a9d8cf214 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -3958,6 +3958,40 @@ static void test_create_effect_from_resource(void) ok(!refcount, "Unexpected refcount.\n"); } +static void test_preprocess_shader(void) +{ + static const char shader_source[] = + "float4 main()\n" + "{\n" + " return float4(1.0);\n" + "}\n"; + ID3D10Blob *preprocessed, *errors; + HRESULT hr, hr2; + + hr2 = 0xdeadbeef; + hr = D3DX10PreprocessShaderFromMemory(NULL, 0, NULL, NULL, NULL, + NULL, &preprocessed, &errors, &hr2); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + ok(hr2 == 0xdeadbeef, "Unexpected hr2 %#lx.\n", hr2); + + hr2 = 0xdeadbeef; + hr = D3DX10PreprocessShaderFromMemory(shader_source, strlen(shader_source), NULL, NULL, NULL, + NULL, &preprocessed, &errors, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!preprocessed, "Unexpected preprocessed %p.\n", preprocessed); + ok(!errors, "Unexpected errors %p.\n", errors); + ID3D10Blob_Release(preprocessed); + + hr2 = 0xdeadbeef; + hr = D3DX10PreprocessShaderFromMemory(shader_source, strlen(shader_source), NULL, NULL, NULL, + NULL, &preprocessed, &errors, &hr2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == hr2, "Unexpected hr2 %#lx.\n", hr2); + ok(!!preprocessed, "Unexpected preprocessed %p.\n", preprocessed); + ok(!errors, "Unexpected errors %p.\n", errors); + ID3D10Blob_Release(preprocessed); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -3972,4 +4006,5 @@ START_TEST(d3dx10) test_font(); test_sprite(); test_create_effect_from_resource(); + test_preprocess_shader(); }

1 0