wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Dmitry Timoshkov : adsldp: Recognize and skip not supported schema tokens.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 1a27b6e527d0ffd75701f003d8029894a14e5b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a27b6e527d0ffd75701f003… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:39 2020 +0800 adsldp: Recognize and skip not supported schema tokens. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index fa03d63edc..32b11a361a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -143,8 +143,30 @@ static WCHAR *parse_name(WCHAR **str) return name; } +static void skip_token(WCHAR **str) +{ + WCHAR *p = *str; + + while (is_space(*p)) p++; + + if (*p == '\'') + { + p++; + while (*p && *p != '\'') p++; + } + else + { + while (*p && !is_space(*p)) p++; + } + + *str = *p ? p + 1 : p; +} + static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) { + static const WCHAR * const not_supported[] = { L"DESC", L"EQUALITY", + L"ORDERING", L"SUBSTR", L"SUP", L"USAGE", L"X-ORDERED" }; + int i; WCHAR *p = str; at->oid = NULL; @@ -184,9 +206,25 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } else { - FIXME("not supported token at %s\n", debugstr_w(p)); - free_attribute_type(at); - return FALSE; + BOOL recognized = FALSE; + + for (i = 0; i < ARRAY_SIZE(not_supported); i++) + { + if (!wcsnicmp(p, not_supported[i], wcslen(not_supported[i]))) + { + p += wcslen(not_supported[i]); + skip_token(&p); + recognized = TRUE; + break; + } + } + + if (!recognized) + { + FIXME("not supported token at %s\n", debugstr_w(p)); + free_attribute_type(at); + return FALSE; + } } } @@ -251,8 +289,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[i].oid), - debugstr_w(at[i].name), debugstr_w(at[i].syntax), at[i].single_value); + TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); count++; }

1 0

Piotr Caban : msvcr90/tests: Fix swscanf tests compilation on arm.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 05ca9185284757c55926feccde1e3a4bca4d3afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=05ca9185284757c55926fecc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 30 13:46:15 2020 +0200 msvcr90/tests: Fix swscanf tests compilation on arm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48846 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f2549..eb0970f4c1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -135,7 +135,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); -static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (WINAPIV *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t);

1 0

Dmitry Timoshkov : wldap32: Fix compilation without LDAP installed.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 02d266adfd35c5e3550e533c3bd1b1f2cecc6fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d266adfd35c5e3550e533c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 09:55:38 2020 +0800 wldap32: Fix compilation without LDAP installed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48838 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 63d4208eef..46b866fd31 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -179,7 +179,7 @@ exit: return ret; } -#ifdef HAVE_LDAP_H +#ifdef HAVE_LDAP static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) { @@ -219,7 +219,7 @@ static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *intera #endif /* HAVE_SASL_SASL_H */ } -#endif /* HAVE_LDAP_H */ +#endif /* HAVE_LDAP */ /*********************************************************************** * ldap_bind_sW (WLDAP32.@)

1 0

Serge Gautherie : ntdll/tests: Fix 'path' copypastas.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: fc75a22afa880f80c440d6bb44e512f865ddea01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc75a22afa880f80c440d6bb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Mar 30 11:31:01 2020 +0200 ntdll/tests: Fix 'path' copypastas. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 2 +- dlls/ntdll/tests/ntdll_test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4e2ef8222d..48c9ed809e 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -1,5 +1,5 @@ /* - * Unit test suite for ntdll path functions + * Unit test suite for ntdll env functions * * Copyright 2003 Eric Pouech * diff --git a/dlls/ntdll/tests/ntdll_test.h b/dlls/ntdll/tests/ntdll_test.h index d403a744aa..67278358b2 100644 --- a/dlls/ntdll/tests/ntdll_test.h +++ b/dlls/ntdll/tests/ntdll_test.h @@ -1,5 +1,5 @@ /* - * Unit test suite for ntdll path functions + * Unit test suite for ntdll functions * * Copyright 2003 Eric Pouech *

1 0

Nikolay Sivov : mfreadwrite: Do not call async reader callback if source failed to start up.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: c362ce20efd7cc7ee88a8244089c3a7148e02b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c362ce20efd7cc7ee88a8244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:29 2020 +0300 mfreadwrite: Do not call async reader callback if source failed to start up. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 3b024fc80c..9a7c5e5fd7 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -895,7 +895,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m source_reader_release_response(response); } - return request_sample; + return !request_sample; } static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, DWORD index, DWORD *stream_index) @@ -984,8 +984,8 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb struct source_reader_async_command *command; struct stream_response *response; DWORD stream_index, stream_flags; - BOOL request_sample = FALSE; struct media_stream *stream; + BOOL report_sample = FALSE; IMFSample *sample = NULL; LONGLONG timestamp = 0; HRESULT hr, status; @@ -1008,10 +1008,8 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb if (SUCCEEDED(hr = source_reader_start_source(reader))) { - request_sample = source_reader_get_read_result(reader, stream, command->flags, &status, &stream_index, - &stream_flags, &timestamp, &sample); - - if (request_sample) + if (!(report_sample = source_reader_get_read_result(reader, stream, command->flags, &status, &stream_index, + &stream_flags, &timestamp, &sample))) { stream->requests++; source_reader_request_sample(reader, stream); @@ -1021,7 +1019,7 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb LeaveCriticalSection(&stream->cs); - if (!request_sample) + if (report_sample) IMFSourceReaderCallback_OnReadSample(reader->async_callback, status, stream_index, stream_flags, timestamp, sample); @@ -1532,7 +1530,6 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind unsigned int actual_index_tmp; struct media_stream *stream; LONGLONG timestamp_tmp; - BOOL request_sample; DWORD stream_index; HRESULT hr = S_OK; @@ -1563,10 +1560,8 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind if (SUCCEEDED(hr = source_reader_start_source(reader))) { - request_sample = source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, - timestamp, sample); - - if (request_sample) + if (!source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + timestamp, sample)) { while (list_empty(&stream->responses) && stream->state != STREAM_STATE_EOS) {

1 0

Nikolay Sivov : mfplat: Add a warning for buffer method failure (Coverity).
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 910ec21b5ab9b7613e0a1cc8bda108033b5496d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910ec21b5ab9b7613e0a1cc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:28 2020 +0300 mfplat: Add a warning for buffer method failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 4bbb36b683..1a31299d24 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1211,7 +1211,8 @@ static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buff } } - IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + if (FAILED(IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length))) + WARN("Failed to set buffer length.\n"); if (locked) IMFMediaBuffer_Unlock(buffer);

1 0

Nikolay Sivov : mf: Set cancellation object directly (Coverity).
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: cb3517a1bf168e586fdc520f05f3842c2621b8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3517a1bf168e586fdc520f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:27 2020 +0300 mf: Set cancellation object directly (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index ac80c51016..01fe17866c 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -760,17 +760,20 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); IUnknown_Release(&context->IUnknown_iface); - IMFAsyncResult_Release(caller); if (SUCCEEDED(hr)) { if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) { if (cancel_cookie) - IMFAsyncResult_GetState(item, cancel_cookie); + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } } IMFAsyncResult_Release(item); } + IMFAsyncResult_Release(caller); return hr; }

1 0

Nikolay Sivov : mfplat/tests: Link to MFHeap* functions directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: b2885d14d6ffa26247e45ba42355a23c9f3a97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2885d14d6ffa26247e45ba4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:26 2020 +0300 mfplat/tests: Link to MFHeap* functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 185bacdebe..78d73b7580 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -76,8 +76,6 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); -static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); -static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); @@ -678,8 +676,6 @@ static void init_functions(void) X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); - X(MFHeapAlloc); - X(MFHeapFree); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); @@ -2483,16 +2479,10 @@ static void test_MFHeapAlloc(void) { void *res; - if (!pMFHeapAlloc) - { - win_skip("MFHeapAlloc() is not available.\n"); - return; - } - - res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); + res = MFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); ok(res != NULL, "MFHeapAlloc failed.\n"); - pMFHeapFree(res); + MFHeapFree(res); } static void test_scheduled_items(void)

1 0

Nikolay Sivov : mfplat: Fix PRESENTATION_CURRENT_POSITION handling for system time source.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 56ab0d1fea8b624ee037cc4aa3f121818bd1d7c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56ab0d1fea8b624ee037cc4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:25 2020 +0300 mfplat: Fix PRESENTATION_CURRENT_POSITION handling for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 22 ++++++++- dlls/mfplat/tests/mfplat.c | 109 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 889961b8d1..37ea744313 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8058,15 +8058,35 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if LONGLONG start_offset) { struct system_time_source *source = impl_from_IMFClockStateSink(iface); + MFCLOCK_STATE state; HRESULT hr; TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset)); EnterCriticalSection(&source->cs); + state = source->state; if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) { system_time_source_apply_rate(source, &system_time); - source->start_offset = -system_time + start_offset; + if (start_offset == PRESENTATION_CURRENT_POSITION) + { + switch (state) + { + case MFCLOCK_STATE_RUNNING: + break; + case MFCLOCK_STATE_PAUSED: + source->start_offset -= system_time; + break; + default: + source->start_offset = -system_time; + break; + ; + } + } + else + { + source->start_offset = -system_time + start_offset; + } } LeaveCriticalSection(&source->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 497c451f72..185bacdebe 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3127,7 +3127,6 @@ static void test_system_time_source(void) hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); ok(hr == S_OK, "Failed to get time %#x.\n", hr); ok(time == 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); - IMFClockStateSink_Release(statesink); hr = IMFClockStateSink_OnClockStart(statesink, 10, 0); ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); @@ -3172,6 +3171,114 @@ static void test_system_time_source(void) ok(time == -6, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + IMFClockStateSink_Release(statesink); + IMFPresentationTimeSource_Release(time_source); + + /* PRESENTATION_CURRENT_POSITION */ + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&statesink); + ok(hr == S_OK, "Failed to get sink interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(!time && systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* INVALID -> RUNNING */ + hr = IMFClockStateSink_OnClockStart(statesink, 10, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* RUNNING -> RUNNING */ + hr = IMFClockStateSink_OnClockStart(statesink, 20, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 30, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* STOPPED -> RUNNING */ + hr = IMFClockStateSink_OnClockStop(statesink, 567); + ok(hr == S_OK, "Failed to stop source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(!time && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 30, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 30, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* PAUSED -> RUNNING */ + hr = IMFClockStateSink_OnClockPause(statesink, 8); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == (-30 + 8) && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 40, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime + (-30 + 8 - 40), "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 7); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == (-30 + 8 - 40 + 7) && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 50, 7); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime + (-50 + 7), "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + IMFClockStateSink_Release(statesink); IMFPresentationTimeSource_Release(time_source); }

1 0

Nikolay Sivov : mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 22d76e0db05485f5978b21ccb2de9d70fa961f97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d76e0db05485f5978b21cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:24 2020 +0300 mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 5af717419b..31d3777e87 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -136,7 +136,7 @@ @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) rtworkq.RtwqRemovePeriodicCallback @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) -@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) rtworkq.RtwqScheduleWorkItem @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 6ad3977e59..2080a79f84 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -119,16 +119,6 @@ HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, I return hr; } -/*********************************************************************** - * MFScheduleWorkItemEx (mfplat.@) - */ -HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) -{ - TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - - return RtwqScheduleWorkItem((IRtwqAsyncResult *)result, timeout, key); -} - /*********************************************************************** * MFInvokeCallback (mfplat.@) */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
100
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 March 2020