wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

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 : 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: 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 : 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 : 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: 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: Add GetTimeOfLastChange() for "new" moniker.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 2ede7a5a742ca1562b926de6393d5638ac0ada12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ede7a5a742ca1562b926de6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:27 2019 +0300 comsvcs: Add GetTimeOfLastChange() 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 | 4 ++-- dlls/comsvcs/tests/comsvcs.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b292844d9..ee75893561 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -577,9 +577,9 @@ static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMon static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *itemtime) { - FIXME("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); - return E_NOTIMPL; + return MK_E_UNAVAILABLE; } static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 37fce3dab4..bdb817a144 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -344,7 +344,6 @@ todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); -todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj);

1 0

Vincent Povirk : msi: Use integers internally for MSIDBOPEN constants.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: cce9a5f124ae6d3fffcc7772cab6523f09a1e3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce9a5f124ae6d3fffcc7772… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 15:05:42 2019 -0600 msi: Use integers internally for MSIDBOPEN constants. This fixes a bug where some verions of mingw and probably gcc assume that the result of pointer subtraction will be non-NULL, causing MSI_OpenDatabaseW to break when given the mode MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 40 ++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++++++++- dlls/msi/msiquery.c | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 776fe53e16..f7c70aeead 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -144,7 +144,8 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) HRESULT r; MSIDATABASE *db = NULL; UINT ret = ERROR_FUNCTION_FAILED; - LPCWSTR szMode, save_path; + LPCWSTR save_path; + UINT mode; STATSTG stat; BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; @@ -154,31 +155,34 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( !pdb ) return ERROR_INVALID_PARAMETER; - if (szPersist - MSIDBOPEN_PATCHFILE <= MSIDBOPEN_CREATEDIRECT) + save_path = szDBPath; + if ( IS_INTMSIDBOPEN(szPersist) ) { - TRACE("Database is a patch\n"); - szPersist -= MSIDBOPEN_PATCHFILE; - patch = TRUE; + mode = LOWORD(szPersist); } - - save_path = szDBPath; - szMode = szPersist; - if( !IS_INTMSIDBOPEN(szPersist) ) + else { if (!CopyFileW( szDBPath, szPersist, FALSE )) return ERROR_OPEN_FAILED; szDBPath = szPersist; - szPersist = MSIDBOPEN_TRANSACT; + mode = MSI_OPEN_TRANSACT; created = TRUE; } - if( szPersist == MSIDBOPEN_READONLY ) + if ((mode & MSI_OPEN_PATCHFILE) == MSI_OPEN_PATCHFILE) + { + TRACE("Database is a patch\n"); + mode &= ~MSI_OPEN_PATCHFILE; + patch = TRUE; + } + + if( mode == MSI_OPEN_READONLY ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_CREATE ) + else if( mode == MSI_OPEN_CREATE ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -187,7 +191,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_CREATEDIRECT ) + else if( mode == MSI_OPEN_CREATEDIRECT ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -196,19 +200,19 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_TRANSACT ) + else if( mode == MSI_OPEN_TRANSACT ) { r = StgOpenStorage( szDBPath, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_DIRECT ) + else if( mode == MSI_OPEN_DIRECT ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); } else { - ERR("unknown flag %p\n",szPersist); + ERR("unknown flag %x\n",mode); return ERROR_INVALID_PARAMETER; } @@ -267,7 +271,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) enum_stream_names( stg ); db->storage = stg; - db->mode = szMode; + db->mode = mode; if (created) db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); @@ -1977,7 +1981,7 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) return MSIDBSTATE_ERROR; - if (db->mode != MSIDBOPEN_READONLY ) + if (db->mode != MSI_OPEN_READONLY ) ret = MSIDBSTATE_WRITE; msiobj_release( &db->hdr ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0732973341..fca2f9e7b4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -95,6 +95,14 @@ typedef struct tagMSITRANSFORM IStorage *stg; } MSITRANSFORM; +/* integer versions of the MSIDBOPEN_* constants */ +#define MSI_OPEN_READONLY 0 +#define MSI_OPEN_TRANSACT 1 +#define MSI_OPEN_DIRECT 2 +#define MSI_OPEN_CREATE 3 +#define MSI_OPEN_CREATEDIRECT 4 +#define MSI_OPEN_PATCHFILE 32 + typedef struct tagMSIDATABASE { MSIOBJECTHDR hdr; @@ -104,7 +112,7 @@ typedef struct tagMSIDATABASE LPWSTR path; LPWSTR deletefile; LPWSTR tempfolder; - LPCWSTR mode; + UINT mode; UINT media_transform_offset; UINT media_transform_disk_id; struct list tables; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index cf8b2b2b4d..526589c320 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -981,7 +981,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_SUCCESS; } - if (db->mode == MSIDBOPEN_READONLY) + if (db->mode == MSI_OPEN_READONLY) { msiobj_release( &db->hdr ); return ERROR_SUCCESS;

1 0

Alexandre Julliard : ntdll: Directly allocate the final process parameters structure.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 3dadd980bfbb2fb05a1a695decd06a429ddda97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dadd980bfbb2fb05a1a695d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 12:39:23 2019 +0100 ntdll: Directly allocate the final process parameters structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 71 +++++++++++++++---------------------------------- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - 3 files changed, 21 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 7a6c8c4dae..87ab9bef62 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1357,19 +1357,31 @@ void init_user_process_params( SIZE_T data_size ) if (!data_size) { - if (RtlCreateProcessParametersEx( &params, &null_str, &null_str, &empty_str, &null_str, NULL, - &null_str, &null_str, &null_str, &null_str, + RTL_USER_PROCESS_PARAMETERS initial_params = {0}; + WCHAR *env, curdir_buffer[MAX_PATH]; + + NtCurrentTeb()->Peb->ProcessParameters = &initial_params; + initial_params.Environment = build_initial_environment( __wine_get_main_environment() ); + curdir.Buffer = curdir_buffer; + curdir.MaximumLength = sizeof(curdir_buffer); + get_current_directory( &curdir ); + initial_params.CurrentDirectory.DosPath = curdir; + get_image_path( __wine_main_argv[0], &initial_params.ImagePathName ); + set_library_wargv( __wine_main_argv, &initial_params.ImagePathName ); + build_command_line( __wine_main_wargv, &cmdline ); + LdrGetDllPath( initial_params.ImagePathName.Buffer, 0, &load_path, &dummy ); + RtlInitUnicodeString( &dllpath, load_path ); + + env = initial_params.Environment; + initial_params.Environment = NULL; /* avoid copying it */ + if (RtlCreateProcessParametersEx( &params, &initial_params.ImagePathName, &dllpath, &curdir, + &cmdline, NULL, &initial_params.ImagePathName, NULL, NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED )) return; + params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; - params->Environment = build_initial_environment( __wine_get_main_environment() ); - get_current_directory( &params->CurrentDirectory.DosPath ); - get_image_path( __wine_main_argv[0], &params->ImagePathName ); - set_library_wargv( __wine_main_argv, &params->ImagePathName ); - build_command_line( __wine_main_wargv, &params->CommandLine ); - LdrGetDllPath( params->ImagePathName.Buffer, 0, &load_path, &dummy ); - RtlCreateUnicodeString( &params->DllPath, load_path ); + RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); if (isatty(0) || isatty(1) || isatty(2)) @@ -1455,44 +1467,3 @@ done: } set_wow64_environment( &params->Environment ); } - - -/*********************************************************************** - * update_user_process_params - * - * Rebuild the RTL_USER_PROCESS_PARAMETERS structure once we have initialized all the fields. - */ -void update_user_process_params( const UNICODE_STRING *image ) -{ - RTL_USER_PROCESS_PARAMETERS *params, *cur_params = NtCurrentTeb()->Peb->ProcessParameters; - UNICODE_STRING title = cur_params->WindowTitle; - WCHAR *env = cur_params->Environment; - - cur_params->Environment = NULL; /* avoid copying it */ - if (!title.Buffer) title = *image; - if (RtlCreateProcessParametersEx( &params, image, &cur_params->DllPath, NULL, - &cur_params->CommandLine, NULL, &title, &cur_params->Desktop, - &cur_params->ShellInfo, &cur_params->RuntimeInfo, - PROCESS_PARAMS_FLAG_NORMALIZED )) - return; - - params->DebugFlags = cur_params->DebugFlags; - params->ConsoleHandle = cur_params->ConsoleHandle; - params->ConsoleFlags = cur_params->ConsoleFlags; - params->hStdInput = cur_params->hStdInput; - params->hStdOutput = cur_params->hStdOutput; - params->hStdError = cur_params->hStdError; - params->dwX = cur_params->dwX; - params->dwY = cur_params->dwY; - params->dwXSize = cur_params->dwXSize; - params->dwYSize = cur_params->dwYSize; - params->dwXCountChars = cur_params->dwXCountChars; - params->dwYCountChars = cur_params->dwYCountChars; - params->dwFillAttribute = cur_params->dwFillAttribute; - params->dwFlags = cur_params->dwFlags; - params->wShowWindow = cur_params->wShowWindow; - params->Environment = env; - - RtlFreeHeap( GetProcessHeap(), 0, cur_params ); - NtCurrentTeb()->Peb->ProcessParameters = params; -} diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 55b341ff3a..cc7bf6900b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,7 +4268,6 @@ void __wine_process_init(void) } NtCurrentTeb()->Peb->LoaderLock = &loader_section; - update_user_process_params( &wm->ldr.FullDllName ); version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c3f7eca61e..e2280dea84 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -86,7 +86,6 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN; extern void fill_cpu_info(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; -extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN; /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : kernel32: Move initialization of the WoW64 environment to ntdll.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: e5354008f46bc0e345c06ac06a7a7780faa9398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5354008f46bc0e345c06ac0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:34:55 2019 +0100 kernel32: Move initialization of the WoW64 environment to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 172 ------------------------------------------------ dlls/ntdll/env.c | 159 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 147 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5354008f46bc0e345c0…

1 0

← Newer
1
...
78
79
80
81
82
83
84
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019