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

[PATCH] ntdll: Support device paths in LdrGetDllPath.
by Jacek Caban 25 Mar '20

25 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48698 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 18 ++++++++++++++++++ dlls/ntdll/loader.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH] user32: Avoid buffer overflow on long texts in winproc.
by Roman Pišl 25 Mar '20

25 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48559 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/user32/winproc.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 6de650cd1e..14555f5a71 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -517,16 +517,21 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case CB_GETLBTEXT: if (lParam && WINPROC_TestLBForStr( hwnd, msg )) { - WCHAR buffer[512]; /* FIXME: fixed sized buffer */ + WCHAR *ptr, buffer[512]; + UINT msgGetTextLen = (msg == CB_GETLBTEXT) ? CB_GETLBTEXTLEN : LB_GETTEXTLEN; + LRESULT len = 0; - ret = callback( hwnd, msg, wParam, (LPARAM)buffer, result, arg ); + callback( hwnd, msgGetTextLen, wParam, 0, &len, arg ); + if (!(ptr = get_buffer( buffer, sizeof(buffer), (len + 1) * sizeof(WCHAR) ))) break; + ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); if (*result >= 0) { DWORD len; RtlUnicodeToMultiByteN( (LPSTR)lParam, ~0u, &len, - buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + ptr, (strlenW(ptr) + 1) * sizeof(WCHAR) ); *result = len - 1; } + free_buffer( buffer, ptr ); } else ret = callback( hwnd, msg, wParam, lParam, result, arg ); break; @@ -777,15 +782,20 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN case CB_GETLBTEXT: if (lParam && WINPROC_TestLBForStr( hwnd, msg )) { - char buffer[512]; /* FIXME: fixed sized buffer */ + char *ptr, buffer[512]; + UINT msgGetTextLen = (msg == CB_GETLBTEXT) ? CB_GETLBTEXTLEN : LB_GETTEXTLEN; + LRESULT len = 0; + callback( hwnd, msgGetTextLen, wParam, 0, &len, arg ); + if (!(ptr = get_buffer( buffer, sizeof(buffer), len + 1 ))) break; - ret = callback( hwnd, msg, wParam, (LPARAM)buffer, result, arg ); + ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); if (*result >= 0) { DWORD len; - RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, buffer, strlen(buffer) + 1 ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, ptr, strlen(ptr) + 1 ); *result = len / sizeof(WCHAR) - 1; } + free_buffer( buffer, ptr ); } else ret = callback( hwnd, msg, wParam, lParam, result, arg ); break; -- 2.20.1

2 3

[PATCH v5 1/3] kernelbase: Close key only if it was successfully opened.
by Rémi Bernon 25 Mar '20

25 Mar '20

Since b780e5f5b1bd018629bfa31431e216c7579fe9aa, as get_language_sort is now called from init_locale, this raises an unexpected exception at process startup, before the initial breakpoint exception. It was causing some kernel32 debugger test failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/locale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 623cb01280b6..06ad6ad01683 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -658,7 +658,7 @@ static const struct sortguid *get_language_sort( const WCHAR *locale ) const struct sortguid *ret; UNICODE_STRING str; GUID guid; - HKEY key; + HKEY key = INVALID_HANDLE_VALUE; DWORD size, type; if (locale == LOCALE_NAME_USER_DEFAULT) @@ -690,7 +690,8 @@ static const struct sortguid *get_language_sort( const WCHAR *locale ) } ret = find_sortguid( &default_sort_guid ); done: - RegCloseKey( key ); + if (key != INVALID_HANDLE_VALUE) + RegCloseKey( key ); return ret; } -- 2.26.0.rc2

2 4

[PATCH 1/4] mfplat: Add a helper to trace timestamp arguments.
by Nikolay Sivov 25 Mar '20

25 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 6 +++--- dlls/mfplat/main.c | 10 +++++----- dlls/mfplat/mfplat_private.h | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index ea89bcb1f5..4bbb36b683 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -663,7 +663,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO HRESULT hr; GUID major; - TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_longlong(duration), min_length, alignment, buffer); + TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer); if (!media_type) return E_INVALIDARG; @@ -1075,7 +1075,7 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); + TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; @@ -1106,7 +1106,7 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + TRACE("%p, %s.\n", iface, debugstr_time(duration)); EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 3368ab0969..66bdc505f0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8015,7 +8015,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) @@ -8033,7 +8033,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) @@ -8048,7 +8048,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) @@ -8066,7 +8066,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) @@ -8084,7 +8084,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); double intpart; - TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(system_time), rate); + TRACE("%p, %s, %f.\n", iface, debugstr_time(system_time), rate); if (rate == 0.0f) return MF_E_UNSUPPORTED_RATE; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index ad4958465a..0f1c5479e6 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -182,3 +182,23 @@ static inline const char *debugstr_fourcc(DWORD format) return wine_dbgstr_an((char *)&format, 4); } + +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} -- 2.25.1

2 4

[PATCH 1/6] mfreadwrite: Make pending response reader structure more generic.
by Nikolay Sivov 25 Mar '20

25 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 104 ++++++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 41 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 8c994273cb..3faa6c6ee0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -72,9 +72,13 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } -struct sample +struct stream_response { struct list entry; + HRESULT status; + DWORD stream_index; + DWORD stream_flags; + LONGLONG timestamp; IMFSample *sample; }; @@ -96,9 +100,10 @@ struct media_stream IMFMediaType *current; IMFTransform *decoder; DWORD id; + unsigned int index; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; - struct list samples; + struct list responses; enum media_stream_state state; BOOL selected; BOOL presented; @@ -366,18 +371,21 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } -static void source_reader_queue_sample(struct media_stream *stream, IMFSample *sample) +static void source_reader_queue_response(struct media_stream *stream, HRESULT status, DWORD stream_index, + DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { - struct sample *pending_sample; - - if (!sample) - return; + struct stream_response *response; - pending_sample = heap_alloc(sizeof(*pending_sample)); - pending_sample->sample = sample; - IMFSample_AddRef(pending_sample->sample); + response = heap_alloc_zero(sizeof(*response)); + response->status = status; + response->stream_index = stream_index; + response->stream_flags = stream_flags; + response->timestamp = timestamp; + response->sample = sample; + if (response->sample) + IMFSample_AddRef(response->sample); - list_add_tail(&stream->samples, &pending_sample->entry); + list_add_tail(&stream->responses, &response->entry); } static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) @@ -385,6 +393,7 @@ static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; IMFMediaBuffer *buffer; + LONGLONG timestamp; DWORD status; HRESULT hr; @@ -420,7 +429,11 @@ static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) break; } - source_reader_queue_sample(stream, out_buffer.pSample); + timestamp = 0; + if (FAILED(IMFSample_GetSampleTime(out_buffer.pSample, &timestamp))) + WARN("Sample time wasn't set.\n"); + + source_reader_queue_response(stream, S_OK /* FIXME */, stream->index, 0, timestamp, out_buffer.pSample); if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); if (out_buffer.pEvents) @@ -432,11 +445,16 @@ static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) static HRESULT source_reader_process_sample(struct media_stream *stream, IMFSample *sample) { + LONGLONG timestamp; HRESULT hr; if (!stream->decoder) { - source_reader_queue_sample(stream, sample); + timestamp = 0; + if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) + WARN("Sample time wasn't set.\n"); + + source_reader_queue_response(stream, S_OK, stream->index, 0, timestamp, sample); return S_OK; } @@ -667,7 +685,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { struct media_stream *stream = &reader->streams[i]; - struct sample *ptr, *next; + struct stream_response *ptr, *next; if (stream->stream) IMFMediaStream_Release(stream->stream); @@ -677,9 +695,10 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFTransform_Release(stream->decoder); DeleteCriticalSection(&stream->cs); - LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->responses, struct stream_response, entry) { - IMFSample_Release(ptr->sample); + if (ptr->sample) + IMFSample_Release(ptr->sample); list_remove(&ptr->entry); heap_free(ptr); } @@ -1089,22 +1108,18 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG return IMFMediaSource_Start(reader->source, reader->descriptor, format, position); } -static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *stream_flags) +static struct stream_response *media_stream_pop_response(struct media_stream *stream) { - IMFSample *ret = NULL; + struct stream_response *response = NULL; struct list *head; - if ((head = list_head(&stream->samples))) + if ((head = list_head(&stream->responses))) { - struct sample *pending_sample = LIST_ENTRY(head, struct sample, entry); - ret = pending_sample->sample; - list_remove(&pending_sample->entry); - heap_free(pending_sample); + response = LIST_ENTRY(head, struct stream_response, entry); + list_remove(&response->entry); } - *stream_flags = (!ret && stream->state == STREAM_STATE_EOS) ? MF_SOURCE_READERF_ENDOFSTREAM : 0; - - return ret; + return response; } static HRESULT source_reader_start_source(struct source_reader *reader) @@ -1145,6 +1160,7 @@ static HRESULT source_reader_start_source(struct source_reader *reader) static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { + struct stream_response *response; struct media_stream *stream; DWORD stream_index; HRESULT hr = S_OK; @@ -1155,6 +1171,9 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind *sample = NULL; + if (timestamp) + *timestamp = 0; + switch (index) { case MF_SOURCE_READER_FIRST_VIDEO_STREAM: @@ -1179,8 +1198,6 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind *stream_flags = MF_SOURCE_READERF_ERROR; if (actual_index) *actual_index = index; - if (timestamp) - *timestamp = 0; return hr; } @@ -1195,7 +1212,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind { if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) { - while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) + while (list_empty(&stream->responses) && stream->state != STREAM_STATE_EOS) { if (stream->stream) { @@ -1206,21 +1223,25 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } } - *sample = media_stream_pop_sample(stream, stream_flags); + if ((response = media_stream_pop_response(stream))) + { + *stream_flags = response->stream_flags; + if (timestamp) + *timestamp = response->timestamp; + *sample = response->sample; + if (*sample) + IMFSample_AddRef(*sample); + } + else + { + *stream_flags = list_empty(&stream->responses) && stream->state == STREAM_STATE_EOS ? + MF_SOURCE_READERF_ENDOFSTREAM : 0; + } } LeaveCriticalSection(&stream->cs); - TRACE("Got sample %p.\n", *sample); - - if (timestamp) - { - /* TODO: it's possible timestamp has to be set for some events. - For MEEndOfStream it's correct to return 0. */ - *timestamp = 0; - if (*sample) - IMFSample_GetSampleTime(*sample, timestamp); - } + TRACE("Got sample %p, flags %#x.\n", *sample, *stream_flags); return hr; } @@ -1466,9 +1487,10 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr)) break; + object->streams[i].index = i; InitializeCriticalSection(&object->streams[i].cs); InitializeConditionVariable(&object->streams[i].sample_event); - list_init(&object->streams[i].samples); + list_init(&object->streams[i].responses); } if (FAILED(hr)) -- 2.25.1

1 5

[PATCH 1/2] dmime: Move finding a track to a help function
by Alistair Leslie-Hughes 25 Mar '20

25 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 98 ++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 0455b6c5dd..cfc67a7757 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -160,53 +160,69 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic return S_OK; } +static LPDMUS_PRIVATE_SEGMENT_TRACK get_track_entry(IDirectMusicSegment8Impl *This, REFGUID type, + DWORD group, DWORD index) +{ + struct list* pEntry = NULL; + LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; + CLSID pIt_clsid; + IPersistStream* pCLSIDStream = NULL; + + LIST_FOR_EACH (pEntry, &This->Tracks) { + pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + if (0xFFFFFFFF != group && 0 == (pIt->dwGroupBits & group)) continue; + if (!IsEqualGUID(&GUID_NULL, type)) { + HRESULT hr; + /** + * it rguidType is not null we must check if CLSIDs are equal + * and the unique way to get it is using IPersistStream Interface + */ + hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); + if (FAILED(hr)) { + ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", + This, pIt->pTrack); + continue; + } + hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); + IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; + if (FAILED(hr)) { + ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); + continue; + } + TRACE(" - %p -> %s\n", pIt, debugstr_dmguid(&pIt_clsid)); + if (!IsEqualGUID(&pIt_clsid, type)) continue; + } + if (0 == index) { + return pIt; + } + --index; + } + + return NULL; +} + static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, IDirectMusicTrack **ppTrack) + REFGUID type, DWORD group, DWORD index, IDirectMusicTrack **track) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - IPersistStream* pCLSIDStream = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LPDMUS_PRIVATE_SEGMENT_TRACK item = NULL; - TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(type), group, index, track); - if (NULL == ppTrack) { - return E_POINTER; - } + if (!track) { + return E_POINTER; + } - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { - /** - * it rguidType is not null we must check if CLSIDs are equal - * and the unique way to get it is using IPersistStream Interface - */ - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - TRACE(" - %p -> %s\n", pIt, debugstr_dmguid(&pIt_clsid)); - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; + item = get_track_entry(This, type, group, index); + if (item) + { + *track = item->pTrack; + IDirectMusicTrack_AddRef(*track); + return S_OK; } - if (0 == dwIndex) { - *ppTrack = pIt->pTrack; - IDirectMusicTrack_AddRef(*ppTrack); - return S_OK; - } - --dwIndex; - } - return DMUS_E_NOT_FOUND; + + return DMUS_E_NOT_FOUND; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment8 *iface, -- 2.25.1

1 0

[PATCH] dmime: Move finding a track to a help function
by Alistair Leslie-Hughes 25 Mar '20

25 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 98 ++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 0455b6c5ddf..cfc67a7757d 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -160,53 +160,69 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic return S_OK; } +static LPDMUS_PRIVATE_SEGMENT_TRACK get_track_entry(IDirectMusicSegment8Impl *This, REFGUID type, + DWORD group, DWORD index) +{ + struct list* pEntry = NULL; + LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; + CLSID pIt_clsid; + IPersistStream* pCLSIDStream = NULL; + + LIST_FOR_EACH (pEntry, &This->Tracks) { + pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + if (0xFFFFFFFF != group && 0 == (pIt->dwGroupBits & group)) continue; + if (!IsEqualGUID(&GUID_NULL, type)) { + HRESULT hr; + /** + * it rguidType is not null we must check if CLSIDs are equal + * and the unique way to get it is using IPersistStream Interface + */ + hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); + if (FAILED(hr)) { + ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", + This, pIt->pTrack); + continue; + } + hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); + IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; + if (FAILED(hr)) { + ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); + continue; + } + TRACE(" - %p -> %s\n", pIt, debugstr_dmguid(&pIt_clsid)); + if (!IsEqualGUID(&pIt_clsid, type)) continue; + } + if (0 == index) { + return pIt; + } + --index; + } + + return NULL; +} + static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, IDirectMusicTrack **ppTrack) + REFGUID type, DWORD group, DWORD index, IDirectMusicTrack **track) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - IPersistStream* pCLSIDStream = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LPDMUS_PRIVATE_SEGMENT_TRACK item = NULL; - TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(type), group, index, track); - if (NULL == ppTrack) { - return E_POINTER; - } + if (!track) { + return E_POINTER; + } - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { - /** - * it rguidType is not null we must check if CLSIDs are equal - * and the unique way to get it is using IPersistStream Interface - */ - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - TRACE(" - %p -> %s\n", pIt, debugstr_dmguid(&pIt_clsid)); - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; + item = get_track_entry(This, type, group, index); + if (item) + { + *track = item->pTrack; + IDirectMusicTrack_AddRef(*track); + return S_OK; } - if (0 == dwIndex) { - *ppTrack = pIt->pTrack; - IDirectMusicTrack_AddRef(*ppTrack); - return S_OK; - } - --dwIndex; - } - return DMUS_E_NOT_FOUND; + + return DMUS_E_NOT_FOUND; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment8 *iface, -- 2.25.1

2 2

[PATCH v2 1/2] mf/tests: Topology node receives stream sink, not media sink.
by Sergio Gómez Del Real 25 Mar '20

25 Mar '20

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/mf/tests/mf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dfbd928f60..ca825ac9a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1246,6 +1246,7 @@ static void test_topology_loader(void) IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; + IMFStreamSink *stream_sink; unsigned int count, value; IMFMediaType *media_type; IMFStreamDescriptor *sd; @@ -1358,7 +1359,10 @@ todo_wine hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink); + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); hr = IMFTopology_GetCount(topology, &count); -- 2.17.1

3 3

[tools] testbot/web: Use shorter field labels.
by Francois Gouget 25 Mar '20

25 Mar '20

This results in shorter column titles which often avoids unnecessary line wrapping. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/StepsTasks.pm | 12 ++++++------ testbot/lib/WineTestBot/Tasks.pm | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6951b98c5b..aeecea0c11 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -446,7 +446,7 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 5), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ae1180c66a..c9ce3439b3 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -233,11 +233,11 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Step no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("No", "Step", 1, 1, "N", 2), CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File", !1, !1, "A", 100), CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patch']), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 463f15078a..a9326bec94 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -178,20 +178,20 @@ sub CreateItem($) # Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("StepNo", "Step", !1, 1, "N", 2), CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task", !1, 1, "N", 2), CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("Started", "Started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); sub CreateStepsTasks(;$$) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index a5125f3420..5a79ff91d1 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -357,15 +357,15 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Task no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("No", "Task", 1, 1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("Started", "Started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), -- 2.20.1

1 0

[PATCH 8/8] adsldp: Add support for multi-valued attributes to IADs::Get().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 47 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7cc23438f1..03f7571afd 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -569,7 +569,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { if (!wcsicmp(name, ldap->attrs[i].name)) { - ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + LONG count = ldap_count_valuesW(ldap->attrs[i].values); if (!count) { V_BSTR(prop) = NULL; @@ -578,12 +578,45 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) } if (count > 1) - FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); - - V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); - if (!V_BSTR(prop)) return E_OUTOFMEMORY; - V_VT(prop) = VT_BSTR; - return S_OK; + { + SAFEARRAY *sa; + VARIANT item; + LONG idx; + + TRACE("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + for (idx = 0; idx < count; idx++) + { + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[idx]); + if (!V_BSTR(&item)) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = SafeArrayPutElement(sa, &idx, &item); + SysFreeString(V_BSTR(&item)); + if (hr != S_OK) goto fail; + } + + V_VT(prop) = VT_ARRAY | VT_VARIANT; + V_ARRAY(prop) = sa; + return S_OK; +fail: + SafeArrayDestroy(sa); + return hr; + } + else + { + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } } } -- 2.25.1

2 1