March 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.7 to ADSTYPE_BOOLEAN.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 7f988091733286ffd9af3f0906a21f144f7bc885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f988091733286ffd9af3f09… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:01 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.7 to ADSTYPE_BOOLEAN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 13 +++++++++++++ dlls/adsldp/schema.c | 2 ++ 2 files changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e27e641eb0..8fe7bfd18c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1349,6 +1349,19 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, break; } + case ADSTYPE_BOOLEAN: + if (stricmp(values[i]->bv_val, "TRUE")) + col->pADsValues[i].u.Boolean = 1; + else if (stricmp(values[i]->bv_val, "FALSE")) + col->pADsValues[i].u.Boolean = 0; + else + { + FIXME("not recognized boolean value %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + col->pADsValues[i].u.Boolean = 0; + } + TRACE("=> %d\n", col->pADsValues[i].u.Boolean); + break; + case ADSTYPE_INTEGER: col->pADsValues[i].u.Integer = strtol(values[i]->bv_val, NULL, 10); TRACE("%s => %d\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), col->pADsValues[i].u.Integer); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 234a76dfa9..bff754be7a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -58,6 +58,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, type = find_schema_type(name, at, at_count); if (!type || !type->syntax) return ADSTYPE_CASE_IGNORE_STRING; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.7")) + return ADSTYPE_BOOLEAN; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15"))

1 0

Dmitry Timoshkov : adsldp: Recognize and skip not supported schema tokens.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Dmitry Timoshkov : adsldp: Add support for NAME token with multiple entries.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: fd3ef3f545b61bdec75dbd3ef6026b3ba458f1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3ef3f545b61bdec75dbd3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:47 2020 +0800 adsldp: Add support for NAME token with multiple entries. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp_private.h | 1 + dlls/adsldp/schema.c | 76 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index bf24de2385..a0d3a977a2 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -50,6 +50,7 @@ struct attribute_type { WCHAR *oid; WCHAR *name; + ULONG name_count; WCHAR *syntax; int single_value; }; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 06e61f258a..1f02916496 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -32,10 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); static const struct attribute_type *find_schema_type(const WCHAR *name, const struct attribute_type *at, ULONG count) { - ULONG i; + ULONG i, n, off; for (i = 0; i < count; i++) - if (at[i].name && !wcsicmp(at[i].name, name)) return &at[i]; + { + if (!at[i].name) continue; + + off = 0; + + for (n = 0; n < at[i].name_count; n++) + { + if (!wcsicmp(at[i].name + off, name)) return &at[i]; + off += wcslen(at[i].name + off) + 1; + } + } return NULL; } @@ -114,13 +124,64 @@ static WCHAR *parse_oid(WCHAR **str) return oid; } -static WCHAR *parse_name(WCHAR **str) +static WCHAR *parse_name(WCHAR **str, ULONG *name_count) { WCHAR *name, *p = *str, *end; int count; + *name_count = 0; + while (is_space(*p)) p++; + if (*p == '(') + { + int total_count = 0; + + p++; + name = NULL; + + while (*p) + { + WCHAR *tmp_name, *new_name; + ULONG dummy; + + while (is_space(*p)) p++; + if (*p == ')') + { + *str = p + 1; + return name; + } + + tmp_name = parse_name(&p, &dummy); + if (!tmp_name) break; + + TRACE("NAME[%u] %s\n", *name_count, debugstr_w(tmp_name)); + + count = wcslen(tmp_name); + + if (!name) + new_name = heap_alloc((count + 1) * sizeof(WCHAR)); + else + new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + + if (!new_name) break; + + memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); + + name = new_name; + heap_free(tmp_name); + total_count += count + 1; + + *name_count += 1; + *str = p; + } + + *str = *p ? p + 1 : p; + + heap_free(name); + return NULL; + } + if (*p != '\'') { FIXME("not suported NAME start at %s\n", debugstr_w(p)); @@ -138,6 +199,8 @@ static WCHAR *parse_name(WCHAR **str) memcpy(name, p, count * sizeof(WCHAR)); name[count] = 0; + *name_count = 1; + *str = end + 1; return name; @@ -171,6 +234,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) at->oid = NULL; at->name = NULL; + at->name_count = 0; at->syntax = NULL; at->single_value = 0; @@ -188,7 +252,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) if (!wcsnicmp(p, L"NAME", 4)) { p += 4; - at->name = parse_name(&p); + at->name = parse_name(&p, &at->name_count); } else if (!wcsnicmp(p, L"SYNTAX", 6)) { @@ -292,8 +356,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[count].oid), - debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); + TRACE("oid %s, name %s, name_count %u, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), at[count].name_count, debugstr_w(at[count].syntax), at[count].single_value); count++; }

1 0

Dmitry Timoshkov : wldap32: Fix compilation without LDAP installed.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Nikolay Sivov : mfreadwrite: Do not call async reader callback if source failed to start up.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Alexandre Julliard : ntdll: Avoid using memrchrW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 6fc90887895c0a03b36f69110a7f6ad426f9b2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc90887895c0a03b36f6911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:38 2020 +0200 ntdll: Avoid using memrchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0e2e3f7dd1..4d4d806d45 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3379,8 +3379,8 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if ((p = memrchrW( key->Buffer, '\\', key->Length / sizeof(WCHAR) ))) p++; - else p = key->Buffer; + p = key->Buffer + key->Length / sizeof(WCHAR); + while (p > key->Buffer && p[-1] != '\\') p--; len = key->Length - (p - key->Buffer) * sizeof(WCHAR); name_str.Buffer = path; name_str.Length = sizeof(optionsW) + len;

1 0

Nikolay Sivov : mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Nikolay Sivov : mfplat: Fix PRESENTATION_CURRENT_POSITION handling for system time source.
by Alexandre Julliard March 30, 2020

March 30, 2020

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: Add a warning for buffer method failure (Coverity).
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Alexandre Julliard : ntdll: Avoid using memchrW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 186f189107972b739311f95a4ba3833838349b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186f189107972b739311f95a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:44 2020 +0200 ntdll: Avoid using memchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 15 +++++++++------ dlls/ntdll/directory.c | 9 ++++++--- dlls/ntdll/env.c | 18 ++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index d5f376f224..cd17c6c135 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1272,6 +1272,7 @@ static xmlstr_t find_xmlns( xmlbuf_t *xmlbuf, const xmlstr_t *name ) static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) { const WCHAR* ptr; + WCHAR quote; if (xmlbuf->error) return FALSE; @@ -1319,11 +1320,12 @@ static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return set_error( xmlbuf ); - attr->value.ptr = ++ptr; + quote = *ptr++; + attr->value.ptr = ptr; if (ptr == xmlbuf->end) return set_error( xmlbuf ); - ptr = memchrW(ptr, ptr[-1], xmlbuf->end - ptr); - if (!ptr) + while (ptr < xmlbuf->end && *ptr != quote) ptr++; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; return set_error( xmlbuf ); @@ -1369,8 +1371,8 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct for (;;) { - ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); - if (!ptr) + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; return set_error( xmlbuf ); @@ -1447,7 +1449,8 @@ static BOOL parse_text_content(xmlbuf_t* xmlbuf, xmlstr_t* content) if (xmlbuf->error) return FALSE; - if (!(ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr))) return set_error( xmlbuf ); + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); content->ptr = xmlbuf->ptr; content->len = ptr - xmlbuf->ptr; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 80777da149..d025a37241 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -305,9 +305,12 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned static inline BOOL has_wildcard( const UNICODE_STRING *mask ) { - return (!mask || - memchrW( mask->Buffer, '*', mask->Length / sizeof(WCHAR) ) || - memchrW( mask->Buffer, '?', mask->Length / sizeof(WCHAR) )); + int i; + + if (!mask) return TRUE; + for (i = 0; i < mask->Length / sizeof(WCHAR); i++) + if (mask->Buffer[i] == '*' || mask->Buffer[i] == '?') return TRUE; + return FALSE; } /* get space from the current directory data buffer, allocating a new one if necessary */ diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 833da58f35..28be49d0b1 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1081,7 +1081,7 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE WCHAR *dst, SIZE_T count, SIZE_T *plen ) { SIZE_T len, total_size = 1; /* 1 for terminating '\0' */ - LPCWSTR env, p, var; + LPCWSTR env, var; if (!renv) { @@ -1094,27 +1094,26 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE { if (*src != '%') { - if ((p = memchrW( src, '%', src_len ))) len = p - src; - else len = src_len; + for (len = 0; len < src_len; len++) if (src[len] == '%') break; var = src; src += len; src_len -= len; } else /* we are at the start of a variable */ { - if ((p = memchrW( src + 1, '%', src_len - 1 ))) + for (len = 1; len < src_len; len++) if (src[len] == '%') break; + if (len < src_len) { - len = p - src - 1; /* Length of the variable name */ - if ((var = ENV_FindVariable( env, src + 1, len ))) + if ((var = ENV_FindVariable( env, src + 1, len - 1 ))) { - src += len + 2; /* Skip the variable name */ - src_len -= len + 2; + src += len + 1; /* Skip the variable name */ + src_len -= len + 1; len = strlenW(var); } else { var = src; /* Copy original name instead */ - len += 2; + len++; src += len; src_len -= len; } @@ -1122,7 +1121,6 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE else /* unfinished variable name, ignore it */ { var = src; - len = src_len; /* Copy whole string */ src += len; src_len = 0; }

1 0