November 2019 - Wine-commits

Nikolay Sivov : comsvcs: Add Enum() for "new" moniker.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: f1123366d17497dd1d15fdd4ecfe1729e64d5833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1123366d17497dd1d15fdd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:28 2019 +0300 comsvcs: Add Enum() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 9 +++++++-- dlls/comsvcs/tests/comsvcs.c | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index ee75893561..58a5f26823 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -543,9 +543,14 @@ static HRESULT WINAPI new_moniker_ComposeWith(IMoniker *iface, IMoniker *mkRight static HRESULT WINAPI new_moniker_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **enum_moniker) { - FIXME("%p, %d, %p.\n", iface, forward, enum_moniker); + TRACE("%p, %d, %p.\n", iface, forward, enum_moniker); - return E_NOTIMPL; + if (!enum_moniker) + return E_POINTER; + + *enum_moniker = NULL; + + return S_OK; } static HRESULT WINAPI new_moniker_IsEqual(IMoniker *iface, IMoniker *other_moniker) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index bdb817a144..8e59abc52b 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -364,6 +364,14 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + hr = IMoniker_Enum(moniker, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + obj = (IUnknown *)moniker; + hr = IMoniker_Enum(moniker, FALSE, (IEnumMoniker **)&obj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(obj == NULL, "Unexpected return value.\n"); + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs: Implement IPersistStream methods for "new" moniker.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 239055cfc71b241df94150b066e9f3be87102da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239055cfc71b241df94150b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:29 2019 +0300 comsvcs: Implement IPersistStream methods for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 59 ++++++++++++++++++++++++++++++++++++-------- dlls/comsvcs/tests/comsvcs.c | 44 ++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 58a5f26823..c7d6aaa613 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -476,37 +476,76 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) static HRESULT WINAPI new_moniker_GetClassID(IMoniker *iface, CLSID *clsid) { - FIXME("%p, %p.\n", iface, clsid); + TRACE("%p, %p.\n", iface, clsid); - return E_NOTIMPL; + if (!clsid) + return E_POINTER; + + *clsid = CLSID_NewMoniker; + + return S_OK; } static HRESULT WINAPI new_moniker_IsDirty(IMoniker* iface) { - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) { - FIXME("%p, %p.\n", iface, stream); + struct new_moniker *moniker = impl_from_IMoniker(iface); + ULARGE_INTEGER pad; + CLSID clsid; + HRESULT hr; + DWORD len; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, stream); + + hr = IStream_Read(stream, &clsid, sizeof(clsid), &len); + if (FAILED(hr)) + return hr; + + pad.QuadPart = 1; + hr = IStream_Read(stream, &pad, sizeof(pad), &len); + if (FAILED(hr)) + return hr; + + if (pad.QuadPart != 0) + return E_FAIL; + + moniker->clsid = clsid; + + return S_OK; } static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - FIXME("%p, %p, %d.\n", iface, stream, clear_dirty); + struct new_moniker *moniker = impl_from_IMoniker(iface); + static const ULARGE_INTEGER pad; + ULONG written; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + hr = IStream_Write(stream, &moniker->clsid, sizeof(moniker->clsid), &written); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &pad, sizeof(pad), &written); + + return hr; } static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { - FIXME("%p, %p.\n", iface, size); + TRACE("%p, %p.\n", iface, size); - return E_NOTIMPL; + if (!size) + return E_POINTER; + + size->QuadPart = sizeof(CLSID) + 2 * sizeof(DWORD); + + return S_OK; } static HRESULT WINAPI new_moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 8e59abc52b..bdd078da33 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -270,13 +270,17 @@ static void create_dispenser(void) static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; + IUnknown *obj, *obj2; + ULARGE_INTEGER size; DWORD moniker_type; IBindCtx *bindctx; FILETIME filetime; DWORD hash, eaten; - IUnknown *obj, *obj2; + IStream *stream; + HGLOBAL hglobal; CLSID clsid; HRESULT hr; + void *ptr; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); @@ -372,6 +376,44 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(obj == NULL, "Unexpected return value.\n"); + /* Serialization. */ + hr = IMoniker_GetSizeMax(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + size.QuadPart = 0; + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); + ok(size.QuadPart == (sizeof(GUID) + 2 * sizeof(DWORD)), "Unexpected size %s.\n", + wine_dbgstr_longlong(size.QuadPart)); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = IMoniker_Save(moniker, stream, FALSE); + ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); + + ptr = GlobalLock(hglobal); + ok(!!ptr, "Failed to get data pointer.\n"); + + hr = CLSIDFromString(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", &clsid); + ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); + ok(IsEqualGUID((GUID *)ptr, &clsid), "Unexpected buffer content.\n"); + ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID)) == 0, "Unexpected buffer content.\n"); + ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID) + sizeof(DWORD)) == 0, "Unexpected buffer content.\n"); + + GlobalUnlock(hglobal); + + IStream_Release(stream); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetClassID(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs: Accept progid's when creating "new" monikers.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: eab97b206812005efbf74c4f25c444512e07df6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab97b206812005efbf74c4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:30 2019 +0300 comsvcs: Accept progid's when creating "new" monikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 2 +- dlls/comsvcs/tests/comsvcs.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index c7d6aaa613..86ffe2587b 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -790,7 +790,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG if (wcsnicmp(name, L"new:", 4)) return MK_E_SYNTAX; - if (!guid_from_string(name + 4, &guid)) + if (!guid_from_string(name + 4, &guid) && FAILED(CLSIDFromProgID(name + 4, &guid))) return MK_E_SYNTAX; moniker = heap_alloc_zero(sizeof(*moniker)); diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index bdd078da33..d94b99afd1 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -271,6 +271,7 @@ static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; IUnknown *obj, *obj2; + BIND_OPTS2 bind_opts; ULARGE_INTEGER size; DWORD moniker_type; IBindCtx *bindctx; @@ -415,6 +416,18 @@ todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker); + + /* Full path to create new object, using progid. */ + memset(&bind_opts, 0, sizeof(bind_opts)); + bind_opts.cbStruct = sizeof(bind_opts); + bind_opts.dwClassContext = CLSCTX_INPROC_SERVER; + + hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj); +todo_wine + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(obj); + IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : mfreadwrite: Use separate helpers for sync/async ReadSample().
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 0cd9878a407e7f7234dad198125a503720187725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd9878a407e7f7234dad198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:42 2019 +0300 mfreadwrite: Use separate helpers for sync/async ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 114 +++++++++++++++++++++++----------------- dlls/mfreadwrite/tests/mfplat.c | 4 -- 2 files changed, 65 insertions(+), 53 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3467746bb8..6fb00b4d37 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -778,14 +778,17 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st return ret; } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, +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 source_reader *reader = impl_from_IMFSourceReader(iface); + struct media_stream *stream; DWORD stream_index; - HRESULT hr; + HRESULT hr = S_OK; - TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + if (!stream_flags || !sample) + return E_POINTER; + + *sample = NULL; switch (index) { @@ -802,68 +805,81 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, stream_index = index; } - /* FIXME: probably should happen once */ - IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); - - if (reader->async_callback) + if (stream_index >= reader->stream_count) { - FIXME("Async mode is not implemented.\n"); - return E_NOTIMPL; + *stream_flags = MF_SOURCE_READERF_ERROR; + if (actual_index) + *actual_index = index; + return MF_E_INVALIDSTREAMNUMBER; } - else - { - struct media_stream *stream; - if (!stream_flags || !sample) - return E_POINTER; + if (actual_index) + *actual_index = stream_index; - *sample = NULL; + stream = &reader->streams[stream_index]; - if (stream_index >= reader->stream_count) + EnterCriticalSection(&stream->cs); + + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + { + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) { - *stream_flags = MF_SOURCE_READERF_ERROR; - if (actual_index) - *actual_index = index; - return MF_E_INVALIDSTREAMNUMBER; + if (stream->stream) + { + if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + } + SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); } + } - if (actual_index) - *actual_index = stream_index; + *sample = media_stream_pop_sample(stream, stream_flags); - stream = &reader->streams[stream_index]; + LeaveCriticalSection(&stream->cs); - EnterCriticalSection(&stream->cs); + TRACE("Got sample %p.\n", *sample); - if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) - { - while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) - { - if (stream->stream) - { - if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); - } - SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); - } - } + 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); + } - *sample = media_stream_pop_sample(stream, stream_flags); + return hr; +} - LeaveCriticalSection(&stream->cs); +static HRESULT source_reader_read_sample_async(struct source_reader *reader, DWORD index, DWORD flags) +{ + FIXME("Async mode is not implemented.\n"); - TRACE("Got sample %p.\n", *sample); + return E_NOTIMPL; +} - 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); - } +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + /* FIXME: probably should happen once */ + IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); + + if (reader->async_callback) + { + if (actual_index || stream_flags || timestamp || sample) + return E_INVALIDARG; + + hr = source_reader_read_sample_async(reader, index, flags); } + else + hr = source_reader_read_sample(reader, index, flags, actual_index, stream_flags, timestamp, sample); - return S_OK; + return hr; } static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 27ceb0faf1..16bb92b80e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -894,19 +894,15 @@ todo_wine /* Return values are delivered to callback only. */ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader);

1 0

Nikolay Sivov : mfreadwrite: Track source state in reader.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: a095d157699709b270893c1069050f59a49accc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a095d157699709b270893c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:43 2019 +0300 mfreadwrite: Track source state in reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6fb00b4d37..9fa1445a8f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -84,6 +84,12 @@ enum media_stream_state STREAM_STATE_EOS, }; +enum media_source_state +{ + SOURCE_STATE_STOPPED = 0, + SOURCE_STATE_STARTED, +}; + struct media_stream { IMFMediaStream *stream; @@ -107,6 +113,7 @@ struct source_reader DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; BOOL shutdown_on_release; + enum media_source_state source_state; struct media_stream *streams; DWORD stream_count; CRITICAL_SECTION cs; @@ -268,6 +275,30 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM return hr; } +static HRESULT source_reader_source_state_handler(struct source_reader *reader, MediaEventType event_type) +{ + enum media_source_state state; + + switch (event_type) + { + case MESourceStarted: + state = SOURCE_STATE_STARTED; + break; + case MESourceStopped: + state = SOURCE_STATE_STOPPED; + break; + default: + WARN("Unhandled state %d.\n", event_type); + return E_FAIL; + } + + EnterCriticalSection(&reader->cs); + reader->source_state = state; + LeaveCriticalSection(&reader->cs); + + return S_OK; +} + static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); @@ -292,6 +323,11 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba case MENewStream: hr = source_reader_new_stream_handler(reader, event); break; + case MESourceStarted: + case MESourcePaused: + case MESourceStopped: + hr = source_reader_source_state_handler(reader, event_type); + break; default: ; }

1 0

Nikolay Sivov : mfreadwrite: Return earlier on ReadSample() is stream is deselected.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 9cb55ea30d57fe9c775db259733f8b5a58a8e0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb55ea30d57fe9c775db259… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:44 2019 +0300 mfreadwrite: Return earlier on ReadSample() is stream is deselected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 9fa1445a8f..f24de690bc 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -591,10 +591,20 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) return refcount; } +static HRESULT source_reader_get_stream_selection(const struct source_reader *reader, DWORD index, BOOL *selected) +{ + IMFStreamDescriptor *sd; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + IMFStreamDescriptor_Release(sd); + + return S_OK; +} + static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - IMFStreamDescriptor *sd; TRACE("%p, %#x, %p.\n", iface, index, selected); @@ -610,11 +620,7 @@ static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWOR ; } - if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) - return MF_E_INVALIDSTREAMNUMBER; - IMFStreamDescriptor_Release(sd); - - return S_OK; + return source_reader_get_stream_selection(reader, index, selected); } static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) @@ -820,6 +826,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind struct media_stream *stream; DWORD stream_index; HRESULT hr = S_OK; + BOOL selected; if (!stream_flags || !sample) return E_POINTER; @@ -841,12 +848,16 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind stream_index = index; } - if (stream_index >= reader->stream_count) + /* Can't read from deselected streams. */ + if (SUCCEEDED(hr = source_reader_get_stream_selection(reader, stream_index, &selected)) && !selected) + hr = MF_E_INVALIDREQUEST; + + if (FAILED(hr)) { *stream_flags = MF_SOURCE_READERF_ERROR; if (actual_index) *actual_index = index; - return MF_E_INVALIDSTREAMNUMBER; + return hr; } if (actual_index)

1 0

Nikolay Sivov : ole32/tests: Remove Win9x workarounds from moniker tests.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: ef1e187ae214a73d75975bf9ed5c45f803c18ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef1e187ae214a73d75975bf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:33:30 2019 +0300 ole32/tests: Remove Win9x workarounds from moniker tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 18ea4d465b..9e2c23b421 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -708,11 +708,8 @@ static void test_ROT(void) ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); todo_wine { - ok(hr == CO_E_WRONG_SERVER_IDENTITY || - broken(hr == S_OK) /* Win9x */, - "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); + ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } - if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie); hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); @@ -919,8 +916,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -929,8 +926,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1009,8 +1006,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -2054,11 +2051,6 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { - if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT();

1 0

Nikolay Sivov : shell32: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 539644ad63702a71080427a2be3359d6f081019c URL: https://source.winehq.org/git/wine.git/?a=commit;h=539644ad63702a71080427a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:33:47 2019 +0300 shell32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shlview.c | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 54fb818526..e2746deb48 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1105,7 +1105,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAA * pfd; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); if (!psf || !dest) @@ -1163,7 +1163,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAW * pfd = dest; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 956fd50871..3b70a2a94b 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %d) stub\n", debugstr_w(string), len); + TRACE("%s, %u.\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bcb9466315..ff1332087d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -778,13 +778,9 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) TRACE("-- return (menu=%p)\n",hSubMenu); return hSubMenu; } -/********************************************************** -* ShellView_MergeFileMenu() -*/ + static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu); - if (hSubMenu) { static const WCHAR dummyW[] = {'d','u','m','m','y','4','5',0}; @@ -806,8 +802,6 @@ static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) mii.fType = MFT_STRING; InsertMenuItemW(hSubMenu, 0, TRUE, &mii); } - - TRACE("--\n"); } /********************************************************** @@ -989,7 +983,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL LPCONTEXTMENU pContextMenu = NULL; CMINVOKECOMMANDINFO cmi; - TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); + TRACE("%p, %d, %d, %d.\n", This, x, y, bDefault); /* look, what's selected and create a context menu object of it*/ if( ShellView_GetSelections(This) ) @@ -1230,7 +1224,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) { - TRACE("(%p) stub\n",This); + TRACE("%p.\n", This); ShellView_OnActivate(This, SVUIA_ACTIVATE_NOFOCUS); /* Notify the ICommDlgBrowser */ @@ -1870,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView3 *iface, UINT uState) LRESULT lResult; int nPartArray[1] = {-1}; - TRACE("(%p)->(state=%x) stub\n",This, uState); + TRACE("%p, %d.\n", This, uState); /*don't do anything if the state isn't really changing*/ if(This->uState == uState) @@ -2677,7 +2671,7 @@ static ULONG WINAPI FolderView_Release(IFolderView2 *iface) static HRESULT WINAPI FolderView_GetCurrentViewMode(IFolderView2 *iface, UINT *mode) { IShellViewImpl *This = impl_from_IFolderView2(iface); - TRACE("(%p)->(%p), stub\n", This, mode); + TRACE("%p, %p.\n", This, mode); if(!mode) return E_INVALIDARG; @@ -2690,7 +2684,8 @@ static HRESULT WINAPI FolderView_SetCurrentViewMode(IFolderView2 *iface, UINT mo { IShellViewImpl *This = impl_from_IFolderView2(iface); DWORD dwStyle; - TRACE("(%p)->(%u), stub\n", This, mode); + + TRACE("%p, %u.\n", This, mode); if((mode < FVM_FIRST || mode > FVM_LAST) && (mode != FVM_AUTO))

1 0

Nikolay Sivov : ole32: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 4fe18052c552268c1a5c5e8de7c9ac654436a4f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe18052c552268c1a5c5e8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:08 2019 +0300 ole32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 3837a1f74c..07d55e2f94 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -142,7 +142,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ******************************************************************************/ static HRESULT WINAPI ClassMoniker_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p, %p)\n", iface, pClassID); if (pClassID==NULL) return E_POINTER;

1 0

Nikolay Sivov : msxml3: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: be89f936877a3218e5361c2c1efec761045a98ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=be89f936877a3218e5361c2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:18 2019 +0300 msxml3: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/parseerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 438c9eb3c4..2ca0885708 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -224,7 +224,7 @@ static HRESULT WINAPI parseError_get_line( { parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); - TRACE("(%p)->(%p): stub\n", This, line); + TRACE("%p, %p.\n", This, line); if (!line) return E_INVALIDARG;

1 0