November 2019 - wine-commits

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

Alexandre Julliard : kernel32: Move support for running wineboot to ntdll.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 461b5e56f95eb095d97e4af1cb1c5fd64bb2862a URL: https://source.winehq.org/git/wine.git/?a=commit;h=461b5e56f95eb095d97e4af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:05:07 2019 +0100 kernel32: Move support for running wineboot to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 296 +------------------------------------------ dlls/ntdll/env.c | 100 +++++++++++++-- programs/wineboot/wineboot.c | 14 +- 3 files changed, 97 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=461b5e56f95eb095d97e…

1 0

Alexandre Julliard : ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess().
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 326df4c18042bdb6243a75a0843a71f85927dc71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=326df4c18042bdb6243a75a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:03:54 2019 +0100 ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c7e2cdb1b7..7c108f2896 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1135,6 +1135,32 @@ static NTSTATUS spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int soc } +/*************************************************************************** + * is_builtin_path + */ +static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) +{ + static const WCHAR systemW[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\'}; + static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','w','o','w','6','4'}; + + *is_64bit = is_win64; + if (path->Length > sizeof(systemW) && !strncmpiW( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + { + if (is_wow64 && !ntdll_get_thread_data()->wow64_redir) *is_64bit = TRUE; + return TRUE; + } + if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && + !strncmpiW( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) + { + *is_64bit = FALSE; + return TRUE; + } + return FALSE; +} + + /*********************************************************************** * get_pe_file_info */ @@ -1148,7 +1174,29 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, InitializeObjectAttributes( &attr, path, attributes, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) return status; + FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) + { + BOOL is_64bit; + + if (is_builtin_path( path, &is_64bit )) + { + TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); + memset( info, 0, sizeof(*info) ); + /* assume current arch */ +#if defined(__i386__) || defined(__x86_64__) + info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; +#elif defined(__powerpc__) + info->cpu = CPU_POWERPC; +#elif defined(__arm__) + info->cpu = CPU_ARM; +#elif defined(__aarch64__) + info->cpu = CPU_ARM64; +#endif + *handle = 0; + return STATUS_SUCCESS; + } + return status; + } if (!(status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, @@ -1355,10 +1403,10 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, process_handle = thread_handle = 0; status = STATUS_SUCCESS; } - else status = err ? err : ERROR_INTERNAL_ERROR; + else status = err ? err : STATUS_INTERNAL_ERROR; done: - NtClose( file_handle ); + if (file_handle) NtClose( file_handle ); if (process_info) NtClose( process_info ); if (process_handle) NtClose( process_handle ); if (thread_handle) NtClose( thread_handle );

1 0

Zebediah Figura : d3d8/tests: Flush events after sending SC_MAXIMIZE.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b29d02aa5ba65465b4adc01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 1 10:52:03 2019 -0500 d3d8/tests: Flush events after sending SC_MAXIMIZE. For some reason, on fvwm2 sometimes focus_window will be restored and activated between the subsequent call to SetForegroundWindow() and the next call to ShowWindow(SW_RESTORE), causing the next test to fail. Flushing first seems to reliably work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 819c1cd944..9fc06c3c9d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3151,6 +3151,7 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; + flush_events(); SetForegroundWindow(GetDesktopWindow()); flush_events();

1 0

Zebediah Figura : d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b2165875771a3a2f9173ccddc8f36d17829f3519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2165875771a3a2f9173ccdd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:44:07 2019 -0600 d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe. llvmpipe is extraordinarily slow to execute glBeginQuery() [as much as 10ms per call] when the regression test for bug 45932 is run after the previous test drawing a 33-bit number of samples. Swap the two tests to work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ca639001..75cddbb6db 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6007,6 +6007,26 @@ static void test_occlusion_query(void) if (broken_occlusion) goto done; + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < 50000; ++i) + { + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Failed to end scene, hr %#x.\n", hr); + + wait_query(query); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0 && data.dword[1] == 0, + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -6062,26 +6082,6 @@ static void test_occlusion_query(void) || broken(data.dword[0] < 0xffffffff && !data.dword[1]), "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - for (i = 0; i < 50000; ++i) - { - hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - wait_query(query); - - memset(&data, 0xff, sizeof(data)); - hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == 0 && data.dword[1] == 0, - "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - IDirect3DSurface9_Release(rt); done:

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for "any"-stream requests.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 9d14077e29eb12546dd70c078b03d6f9c386fe51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d14077e29eb12546dd70c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 23:02:45 2019 +0300 mfreadwrite/tests: Add some tests for "any"-stream requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 511 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d14077e29eb12546dd7…

1 0

Vincent Povirk : Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.".
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1fddf230ffff2b0946f6b9ae13648b454785e23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fddf230ffff2b0946f6b9ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:30 2019 -0600 Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.". This reverts commit d10f2c0723585da66a7b1e822e852ce54d56c5f1. The bug we were working around has been fixed in upstream Mono and in Wine Mono 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 -- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b72af709c0..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,8 +1544,6 @@ __int32 WINAPI _CorExeMain(void) if (domain) { - int dummy; - mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 575d6ce1d3..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,7 +124,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -225,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5847126b3e..d5f78b61f0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,7 +177,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.4.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b06d272d635d30f570b440da2308b53fcc43c7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06d272d635d30f570b440da… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:29 2019 -0600 mscoree: Update Wine Mono to 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e501054e16..350c25ef90 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.3" -#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" +#define MONO_VERSION "4.9.4" +#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 250bd24ad1..5847126b3e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.3" +#define WINE_MONO_VERSION "4.9.4" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Jacek Caban : vbscript: Allow arbitrary number of arguments in builtin functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2dceea6f35ae607c781a6452aa020244ac3a6cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dceea6f35ae607c781a6452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:57 2019 +0100 vbscript: Allow arbitrary number of arguments in builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 16 +++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4171df3915..e4ff572412 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -172,8 +172,9 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L { BuiltinDisp *This = impl_from_IDispatch(iface); const builtin_prop_t *prop; - VARIANT args[8]; + VARIANT args_buf[8], *args; unsigned argn, i; + HRESULT hres; TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err); @@ -248,7 +249,13 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH); } - assert(argn < ARRAY_SIZE(args)); + if(argn <= ARRAY_SIZE(args_buf)) { + args = args_buf; + }else { + args = heap_alloc(argn * sizeof(*args)); + if(!args) + return E_OUTOFMEMORY; + } for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -257,7 +264,10 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L args[i] = dp->rgvarg[dp->cArgs-i-1]; } - return prop->proc(This, args, dp->cArgs, res); + hres = prop->proc(This, args, dp->cArgs, res); + if(args != args_buf) + heap_free(args); + return hres; } static const IDispatchVtbl BuiltinDispVtbl = { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index afa0c2bb1f..d4f3eeaa47 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -243,6 +243,11 @@ Call ok(UBound(x) = 2, "UBound(x) = " & UBound(x)) Call ok(getVT(UBound(x, 1)) = "VT_I4", "getVT(UBound(x, 1)) = " & getVT(UBound(x, 1))) Call ok(UBound(x, 1) = 2, "UBound(x) = " & UBound(x, 1)) +x = Array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33) +ok x(1) = 2, "x(1) = " & x(1) +ok x(32) = 33, "x(32) = " & x(32) +ok ubound(x) = 32, "ubound(x) = " & ubound(x) + Dim arr2(2, 4) Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x))

1 0

Jacek Caban : vbscript: Replace existing function for duplicated functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 52bbac0a3661d1437b22cce40d4a7980c3efeaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bbac0a3661d1437b22cce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:42 2019 +0100 vbscript: Replace existing function for duplicated functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 24 +++++++++++++----------- dlls/vbscript/tests/lang.vbs | 15 +++++++++++++++ dlls/vbscript/tests/run.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index dae8a97c83..6b0e113bef 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1571,7 +1571,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi function_t *func; HRESULT hres; - if(lookup_dim_decls(ctx, decl->name) || lookup_funcs_name(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { + if(lookup_dim_decls(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { FIXME("%s: redefinition\n", debugstr_w(decl->name)); return E_FAIL; } @@ -1826,7 +1826,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { class_desc_t *class; dynamic_var_t *var; - function_t *func; for(var = ctx->global_vars; var; var = var->next) { if(lookup_script_identifier(script, var->name)) { @@ -1835,13 +1834,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) } } - for(func = ctx->funcs; func; func = func->next) { - if(lookup_script_identifier(script, func->name)) { - FIXME("%s: redefined\n", debugstr_w(func->name)); - return E_FAIL; - } - } - for(class = ctx->classes; class; class = class->next) { if(lookup_script_identifier(script, class->name)) { FIXME("%s: redefined\n", debugstr_w(class->name)); @@ -1997,8 +1989,18 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs = new_funcs; script->global_funcs_size = cnt; } - for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) - script->global_funcs[script->global_funcs_cnt++] = func_iter; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { + unsigned i; + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, func_iter->name)) { + /* global function already exists, replace it */ + script->global_funcs[i] = func_iter; + break; + } + } + if(i == script->global_funcs_cnt) + script->global_funcs[script->global_funcs_cnt++] = func_iter; + } if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4623a08e2b..8a6f0ecd45 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -886,6 +886,21 @@ Public Function TestSepFunc(ByVal a) : : End Function Call ok(TestSepFunc(1) = 1, "Function did not return 1") +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() + +function duplicatedfunc + ok false, "duplicatedfunc called" +end function + +sub duplicatedfunc + ok false, "duplicatedfunc called" +end sub + +function duplicatedfunc + duplicatedfunc = 2 +end function + +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() ' Stop has an effect only in debugging mode Stop diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d3d41a80d2..9ed1096a4d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2688,6 +2688,47 @@ static void test_isexpression(void) close_script(engine); } +static void test_multiple_parse(void) +{ + IActiveScriptParse *parser; + IActiveScript *script; + HRESULT hres; + + script = create_and_init_script(SCRIPTITEM_GLOBALMEMBERS, TRUE); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"sub duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end sub\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" duplicatedfunc = 2\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"ok duplicatedfunc() = 2, \"duplicatedfunc = \" & duplicatedfunc()\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + IActiveScriptParse_Release(parser); + close_script(script); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -3037,6 +3078,7 @@ static void run_tests(void) test_parse_errors(); test_parse_context(); test_callbacks(); + test_multiple_parse(); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Store global functions in an array.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ea7a3953fcc495aba23c7c638effed6085bb0c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7a3953fcc495aba23c7c63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:24 2019 +0100 vbscript: Store global functions in an array. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 31 +++++++++++++++++++++---------- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/vbdisp.c | 5 +++-- dlls/vbscript/vbscript.c | 5 +++++ dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 90b0cf5342..dae8a97c83 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1802,15 +1802,15 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi { class_desc_t *class; dynamic_var_t *var; - function_t *func; + unsigned i; for(var = script->global_vars; var; var = var->next) { if(!wcsicmp(var->name, identifier)) return TRUE; } - for(func = script->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, identifier)) + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, identifier)) return TRUE; } @@ -1914,11 +1914,12 @@ static void release_compiler(compile_ctx_t *ctx) HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { - function_t *new_func; + function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; compile_ctx_t ctx; vbscode_t *code; + size_t cnt; HRESULT hres; if (!src) src = L""; @@ -1982,12 +1983,22 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_vars = ctx.global_vars; } - if(ctx.funcs) { - for(new_func = ctx.funcs; new_func->next; new_func = new_func->next); - - new_func->next = script->global_funcs; - script->global_funcs = ctx.funcs; - } + cnt = script->global_funcs_cnt; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + cnt++; + if(cnt > script->global_funcs_size) { + function_t **new_funcs; + if(script->global_funcs) + new_funcs = heap_realloc(script->global_funcs, cnt * sizeof(*new_funcs)); + else + new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); + if(!new_funcs) + return compile_error(script, E_OUTOFMEMORY); + script->global_funcs = new_funcs; + script->global_funcs_size = cnt; + } + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + script->global_funcs[script->global_funcs_cnt++] = func_iter; if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 191622e8e7..4800ae7ce6 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -98,7 +98,6 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; - function_t *func; IDispatch *disp; unsigned i; DISPID id; @@ -164,7 +163,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; - for(func = ctx->script->global_funcs; func; func = func->next) { + for(i = 0; i < ctx->script->global_funcs_cnt; i++) { + function_t *func = ctx->script->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 25a80fc89d..a5ae40d098 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -677,7 +677,7 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); dynamic_var_t *var; ident_map_t *ident; - function_t *func; + unsigned i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -704,7 +704,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(func = This->ctx->global_funcs; func; func = func->next) { + for(i = 0; i < This->ctx->global_funcs_cnt; i++) { + function_t *func = This->ctx->global_funcs[i]; if(!wcsicmp(func->name, bstrName)) { ident = add_ident(This, func->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4015..59ec577846 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -138,6 +138,11 @@ static void release_script(script_ctx_t *ctx) release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; + heap_free(ctx->global_funcs); + ctx->global_funcs = NULL; + ctx->global_funcs_cnt = 0; + ctx->global_funcs_size = 0; + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d9647eb2e..8543813c49 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -187,8 +187,11 @@ struct _script_ctx_t { EXCEPINFO ei; + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + dynamic_var_t *global_vars; - function_t *global_funcs; class_desc_t *classes; class_desc_t *procs;

1 0

Jacek Caban : vbscript: Support assigning to object default value.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 8f1e633874bbf1512436f4bbb50812d214259d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1e633874bbf1512436f4bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:36:58 2019 +0100 vbscript: Support assigning to object default value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++++ dlls/vbscript/tests/run.c | 64 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7339f42aba..191622e8e7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -779,6 +779,11 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * if(arg_cnt(dp)) { SAFEARRAY *array; + if(V_VT(v) == VT_DISPATCH) { + hres = disp_propput(ctx->script, V_DISPATCH(v), DISPID_VALUE, flags, dp); + break; + } + if(!(V_VT(v) & VT_ARRAY)) { FIXME("array assign on type %d\n", V_VT(v)); return E_FAIL; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 208d647d46..d3d41a80d2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); DEFINE_EXPECT(testobj_value_i); +DEFINE_EXPECT(testobj_valueput_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -872,29 +873,49 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { - case DISPID_VALUE: { - VARIANT *arg; - int i; + case DISPID_VALUE: + if(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + VARIANT *arg; + int i; - CHECK_EXPECT(testobj_value_i); + CHECK_EXPECT(testobj_value_i); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); - ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(pei != NULL, "pei == NULL\n"); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } - for(i=0; i<pdp->cArgs; i++) { - arg = pdp->rgvarg+pdp->cArgs-i-1; - ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); - ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; } + if(wFlags == DISPATCH_PROPERTYPUT) { + CHECK_EXPECT(testobj_valueput_i); - V_VT(pvarRes) = VT_I2; - V_I2(pvarRes) = pdp->cArgs; - return S_OK; - } + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(args[0]) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(args[0]) = %d\n", V_I2(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(args[1]) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 2, "V_I2(args[1]) = %d\n", V_I2(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+2) == VT_I2, "V_VT(args[2]) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(args[2]) = %d\n", V_I2(pdp->rgvarg+2)); + + return S_OK; + } + ok(0, "wFlags = %x\n", wFlags); + break; case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -1419,7 +1440,6 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); - todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); @@ -2881,6 +2901,12 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + SET_EXPECT(testobj_valueput_i); + parse_script_a("dim x\n" + "set x = testObj\n" + "x(counter(), counter()) = counter\n"); + CHECK_CALLED(testobj_valueput_i); + parse_htmlscript_a(""); parse_htmlscript_a("\n");

1 0

Jeff Smith : msrle32: Return expected flags from GetInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: a9928379b1159ea82f8087418461147dcfd7dcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9928379b1159ea82f808741… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Nov 2 16:43:05 2019 -0500 msrle32: Return expected flags from GetInfo. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 2 +- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5b17b25a0b..b68a50514f 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1179,7 +1179,7 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwSize = sizeof(ICINFO); icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); - icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; + icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH; icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 4a442a0b90..84c5c21510 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -65,7 +65,7 @@ static void test_encode(void) ok(res == sizeof(info), "res = %ld\n", res); ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); quality = 0xdeadbeef;

1 0

Biswapriyo Nath : include/netfw: Add INetFwRule2 and INetFwRule3 interfaces.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 718d9cb9d47aab08c0cd251f6d303f2b50befd54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718d9cb9d47aab08c0cd251f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Nov 3 00:39:37 2019 +0530 include/netfw: Add INetFwRule2 and INetFwRule3 interfaces. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netfw.idl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/include/netfw.idl b/include/netfw.idl index 7c5d3d40bb..013f2bfb0f 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -431,6 +431,59 @@ interface INetFwRule : IDispatch HRESULT Action( [in] NET_FW_ACTION action ); } +[ + local, + object, + uuid(9C27C8DA-189B-4DDE-89F7-8B39A316782C), + dual +] +interface INetFwRule2 : INetFwRule +{ + [id(19), propget] + HRESULT EdgeTraversalOptions( [out, retval] long* lOptions ); + [id(19), propput] + HRESULT EdgeTraversalOptions( [in] long lOptions ); +} + +[ + local, + object, + uuid(B21563FF-D696-4222-AB46-4E89B73AB34A), + dual +] +interface INetFwRule3 : INetFwRule2 +{ + [id(20), propget] + HRESULT LocalAppPackageId( [out, retval] BSTR* wszPackageId ); + [id(20), propput] + HRESULT LocalAppPackageId( [in] BSTR wszPackageId ); + + [id(21), propget] + HRESULT LocalUserOwner( [out, retval] BSTR* wszUserOwner ); + [id(21), propput] + HRESULT LocalUserOwner( [in] BSTR wszUserOwner ); + + [id(22), propget] + HRESULT LocalUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(22), propput] + HRESULT LocalUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(23), propget] + HRESULT RemoteUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(23), propput] + HRESULT RemoteUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(24), propget] + HRESULT RemoteMachineAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(24), propput] + HRESULT RemoteMachineAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(25), propget] + HRESULT SecureFlags( [out, retval] long* lOptions ); + [id(25), propput] + HRESULT SecureFlags( [in] long lOptions ); +} + [ local, object, @@ -703,10 +756,15 @@ library NetFwPublicTypeLib interface INetFwServices; interface INetFwAuthorizedApplication; interface INetFwAuthorizedApplications; + interface INetFwServiceRestriction; + interface INetFwRule; + interface INetFwRules; interface INetFwProfile; interface INetFwPolicy; interface INetFwPolicy2; interface INetFwMgr; + interface INetFwProduct; + interface INetFwProducts; [ uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5)

1 0

Andrew Eikum : user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6d7828e8df68178ca662bc618f7598254afcfbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7828e8df68178ca662bc61… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:37 2019 -0500 user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 18 ++++++++++++++++++ dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 770ec91096..85ff0c5e80 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -33,6 +33,7 @@ #include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/hid.h" #include "user_private.h" @@ -467,6 +468,23 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT to_copy = &info; break; + case RIDI_PREPARSEDDATA: + avail_bytes = *data_size; + if (device == WINE_MOUSE_HANDLE || + device == WINE_KEYBOARD_HANDLE) + { + to_copy_bytes = 0; + *data_size = 0; + to_copy = NULL; + } + else + { + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + *data_size = to_copy_bytes; + to_copy = hid_device->data; + } + break; + default: FIXME("command %#x not supported\n", command); return ~0U; diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824e..dd101d69f3 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 hid C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5723af3fd2..1e6be311ee 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -55,6 +55,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "ddk/hidsdi.h" #include "wine/test.h" @@ -1605,6 +1606,7 @@ static void test_GetRawInputDeviceList(void) RAWINPUTDEVICELIST devices[32]; UINT ret, oret, devcount, odevcount, i; DWORD err; + BOOLEAN br; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); @@ -1642,6 +1644,7 @@ static void test_GetRawInputDeviceList(void) UINT sz, len; RID_DEVICE_INFO info; HANDLE file; + char *ppd; /* get required buffer size */ name[0] = '\0'; @@ -1688,6 +1691,44 @@ static void test_GetRawInputDeviceList(void) file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); todo_wine_if(info.dwType != RIM_TYPEHID) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + + sz = 0; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz); + ok(ret == 0, "GetRawInputDeviceInfo gave wrong return: %u\n", ret); + ok((info.dwType == RIM_TYPEHID && sz != 0) || + (info.dwType != RIM_TYPEHID && sz == 0), + "Got wrong PPD size for type 0x%x: %u\n", info.dwType, sz); + + ppd = HeapAlloc(GetProcessHeap(), 0, sz); + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, ppd, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %u, should be %u\n", ret, sz); + + if (file != INVALID_HANDLE_VALUE && ret == sz) + { + PHIDP_PREPARSED_DATA preparsed; + + if (info.dwType == RIM_TYPEHID) + { + br = HidD_GetPreparsedData(file, &preparsed); + ok(br == TRUE, "HidD_GetPreparsedData failed\n"); + + if (br) + ok(!memcmp(preparsed, ppd, sz), "Expected to get same preparsed data\n"); + } + else + { + /* succeeds on hardware, fails in some VMs */ + br = HidD_GetPreparsedData(file, &preparsed); + todo_wine + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + } + + if (br) + HidD_FreePreparsedData(preparsed); + } + + HeapFree(GetProcessHeap(), 0, ppd); + CloseHandle(file); }

1 0

Andrew Eikum : user32: Clean up GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0b7f4b40cf2f19f80765f798bfdb4733c8952c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f4b40cf2f19f80765f798… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:28 2019 -0500 user32: Clean up GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 89 ++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 94cf7a9a5d..770ec91096 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -404,80 +404,83 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - struct hid_device *hid_device; - const WCHAR *name = NULL; - RID_DEVICE_INFO *info; - UINT s; + + RID_DEVICE_INFO info; + struct hid_device *hid_device = device; + const void *to_copy; + UINT to_copy_bytes, avail_bytes; TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size) return ~0U; + /* each case below must set: + * *data_size: length (meaning defined by command) of data we want to copy + * avail_bytes: number of bytes available in user buffer + * to_copy_bytes: number of bytes we want to copy into user buffer + * to_copy: pointer to data we want to copy into user buffer + */ switch (command) { case RIDI_DEVICENAME: + /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ + avail_bytes = *data_size * sizeof(WCHAR); if (device == WINE_MOUSE_HANDLE) { - s = ARRAY_SIZE(mouse_name); - name = mouse_name; + *data_size = ARRAY_SIZE(mouse_name); + to_copy = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = ARRAY_SIZE(keyboard_name); - name = keyboard_name; + *data_size = ARRAY_SIZE(keyboard_name); + to_copy = keyboard_name; } else { - hid_device = device; - s = strlenW(hid_device->path) + 1; - name = hid_device->path; + *data_size = strlenW(hid_device->path) + 1; + to_copy = hid_device->path; } + to_copy_bytes = *data_size * sizeof(WCHAR); break; + case RIDI_DEVICEINFO: - s = sizeof(*info); + avail_bytes = *data_size; + info.cbSize = sizeof(info); + if (device == WINE_MOUSE_HANDLE) + { + info.dwType = RIM_TYPEMOUSE; + info.u.mouse = mouse_info; + } + else if (device == WINE_KEYBOARD_HANDLE) + { + info.dwType = RIM_TYPEKEYBOARD; + info.u.keyboard = keyboard_info; + } + else + { + info.dwType = RIM_TYPEHID; + info.u.hid = hid_device->info; + } + to_copy_bytes = sizeof(info); + *data_size = to_copy_bytes; + to_copy = &info; break; + default: + FIXME("command %#x not supported\n", command); return ~0U; } if (!data) - { - *data_size = s; return 0; - } - if (*data_size < s) - { - *data_size = s; + if (avail_bytes < to_copy_bytes) return ~0U; - } - if (command == RIDI_DEVICENAME) - { - memcpy(data, name, s * sizeof(WCHAR)); - return s; - } + memcpy(data, to_copy, to_copy_bytes); - info = data; - info->cbSize = sizeof(*info); - if (device == WINE_MOUSE_HANDLE) - { - info->dwType = RIM_TYPEMOUSE; - info->u.mouse = mouse_info; - } - else if (device == WINE_KEYBOARD_HANDLE) - { - info->dwType = RIM_TYPEKEYBOARD; - info->u.keyboard = keyboard_info; - } - else - { - hid_device = device; - info->dwType = RIM_TYPEHID; - info->u.hid = hid_device->info; - } - return s; + return *data_size; } /***********************************************************************

1 0

Andrew Eikum : user32/tests: Move rawinput tests into input.c.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 4a58d67106b63772322a682cf1022b1a290acdca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a58d67106b63772322a682c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:20 2019 -0500 user32/tests: Move rawinput tests into input.c. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/input.c | 71 +++++++++++++++++++++++++++++ dlls/user32/tests/rawinput.c | 101 ------------------------------------------ 3 files changed, 71 insertions(+), 102 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 26bc3b2bc6..7149dc824e 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c5cf9556ed..5723af3fd2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1,6 +1,7 @@ /* Test Key event to Key message translation * * Copyright 2003 Rein Klazes + * Copyright 2019 Remi Bernon for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1712,6 +1713,75 @@ static void test_GetRawInputData(void) ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); } +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2902,6 +2972,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_GetRawInputData(); + test_RegisterRawInputDevices(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c deleted file mode 100644 index f4c8eb6738..0000000000 --- a/dlls/user32/tests/rawinput.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Unit test suite for rawinput. - * - * Copyright 2019 Remi Bernon for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" - -static void test_RegisterRawInputDevices(void) -{ - HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; - BOOL res; - - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; - - hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "CreateWindowExA failed\n"); - - - res = RegisterRawInputDevices(NULL, 0, 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - - - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_REMOVE requires hwndTarget == NULL */ - raw_devices[0].dwFlags = RIDEV_REMOVE; - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_INPUTSINK requires hwndTarget != NULL */ - raw_devices[0].dwFlags = RIDEV_INPUTSINK; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine - ok(res == FALSE, "RegisterRawInputDevices failed\n"); - todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - DestroyWindow(hwnd); -} - -START_TEST(rawinput) -{ - test_RegisterRawInputDevices(); -}

1 0

Andrew Eikum : hid: Move preparsed data definition to global header.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b466419c32550cac59f4b6a891d02255eb94c5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466419c32550cac59f4b6a8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:25:58 2019 -0500 hid: Move preparsed data definition to global header. PHIDP_PREPARSED_DATA is supposed to be an opaque pointer, but the size is accessible through user32.GetRawInputDeviceInfo(RIDI_PREPARSEDDATA), so we will need to know the struct layout in user32, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/parse.h | 69 ---------------------------------- dlls/hid/parse.h => include/wine/hid.h | 0 4 files changed, 2 insertions(+), 71 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59a4078c6c..9d631912c8 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -32,7 +32,7 @@ #include "hidusage.h" #include "ddk/hidpi.h" -#include "parse.h" +#include "wine/hid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hidp); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 86d7bdf98f..36d13c009d 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -29,7 +29,7 @@ #include "ddk/hidpi.h" #include "cfgmgr32.h" #include "wine/list.h" -#include "parse.h" +#include "wine/hid.h" #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 diff --git a/dlls/hidclass.sys/parse.h b/dlls/hidclass.sys/parse.h deleted file mode 100644 index 319105d286..0000000000 --- a/dlls/hidclass.sys/parse.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Wine internal HID structures - * - * Copyright 2015 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PARSE_H -#define __WINE_PARSE_H - -#define HID_MAGIC 0x8491759 - -typedef enum __WINE_ELEMENT_TYPE { - UnknownElement = 0, - ButtonElement, - ValueElement, -} WINE_ELEMENT_TYPE; - -typedef struct __WINE_ELEMENT -{ - WINE_ELEMENT_TYPE ElementType; - UINT valueStartBit; - UINT bitCount; - union { - HIDP_VALUE_CAPS value; - HIDP_BUTTON_CAPS button; - } caps; -} WINE_HID_ELEMENT; - -typedef struct __WINE_HID_REPORT -{ - UCHAR reportID; - DWORD bitSize; - DWORD elementCount; - DWORD elementIdx; -} WINE_HID_REPORT; - -typedef struct __WINE_HIDP_PREPARSED_DATA -{ - DWORD magic; - DWORD dwSize; - HIDP_CAPS caps; - - DWORD elementOffset; - DWORD reportCount[3]; - BYTE reportIdx[3][256]; - - WINE_HID_REPORT reports[1]; -} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; - -#define HID_INPUT_REPORTS(d) ((d)->reports) -#define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) -#define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) -#define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) - -#endif /* __WINE_PARSE_H */ diff --git a/dlls/hid/parse.h b/include/wine/hid.h similarity index 100% rename from dlls/hid/parse.h rename to include/wine/hid.h

1 0

Martin Storsjo : kernel32: Add a special case to EnumProcessModules for the local process.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fbda8db334f0703c0e66a2b84dda6bb56537f50b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbda8db334f0703c0e66a2b8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 30 14:13:34 2019 +0200 kernel32: Add a special case to EnumProcessModules for the local process. LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections when unwinding dwarf exceptions (used on i686). When running wine in docker (without adding custom additional permissions), EnumProcessModules currently fails as it uses ReadProcessMemory, which requires the SYS_PTRACE capability. The current implementation also is slower than necessary (by a couple orders of magnituide), for accessing the current process. Currently, unwinding 10000 exception throws with libunwind on i686 takes 24 seconds when run in wine, while it runs in less than 0.1 second with this patch. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b7f19ffe36..45814dbff3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -555,6 +555,40 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, DWORD size = 0; INT ret; + if (process == GetCurrentProcess()) + { + PPEB_LDR_DATA ldr_data = NtCurrentTeb()->Peb->LdrData; + PLIST_ENTRY head = &ldr_data->InLoadOrderModuleList; + PLIST_ENTRY entry = head->Flink; + + if (cb && !lphModule) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + while (entry != head) + { + PLDR_MODULE table_entry = (PLDR_MODULE) + ((PBYTE)entry - offsetof(LDR_MODULE, InLoadOrderModuleList)); + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = table_entry->BaseAddress; + cb -= sizeof(HMODULE); + } + size += sizeof(HMODULE); + entry = entry->Flink; + } + + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + *needed = size; + + return TRUE; + } + if (!init_module_iterator(&iter, process)) return FALSE;

1 0

Nikolay Sivov : mf: Add MFCreateVideoRendererActivate().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fef1d403c5dc18722883361e95f7b0f3a5e68b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef1d403c5dc18722883361e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 16:04:33 2019 +0300 mf: Add MFCreateVideoRendererActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 24 ++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 12 ++++++++++++ include/mfidl.idl | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2e6dc78290..251d59e1c0 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1144,3 +1144,27 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou return S_OK; } + +static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void evr_free_private(void *user_context) +{ +} + +static const struct activate_funcs evr_activate_funcs = +{ + evr_create_object, + evr_free_private, +}; + +HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) +{ + TRACE("%p, %p.\n", hwnd, activate); + + return create_activation_object(hwnd, &evr_activate_funcs, activate); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index f13a2451fb..a8dd314aa3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -67,7 +67,7 @@ @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin @ stub MFCreateVideoRenderer -@ stub MFCreateVideoRendererActivate +@ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate @ stdcall MFEnumDeviceSources(ptr ptr ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0428c22ed3..b353df780b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2584,6 +2584,17 @@ if (SUCCEEDED(hr)) CoUninitialize(); } +static void test_evr(void) +{ + IMFActivate *activate; + HRESULT hr; + + hr = MFCreateVideoRendererActivate(NULL, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + IMFActivate_Release(activate); +} + START_TEST(mf) { test_topology(); @@ -2597,4 +2608,5 @@ START_TEST(mf) test_video_processor(); test_quality_manager(); test_sar(); + test_evr(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 9c14c5604b..da43399828 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -586,6 +586,7 @@ cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **t cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") +cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);")

1 0

Zebediah Figura : httpapi: Implement HttpReceiveRequestEntityBody().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: c1a62e0167835e85d4abcb4c362be25f492d4cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a62e0167835e85d4abcb4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:38 2019 -0600 httpapi: Implement HttpReceiveRequestEntityBody(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48017 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 31 ++++++++++-- dlls/httpapi/tests/httpapi.c | 118 ++++++++++++++++++++++++++++++++++++++++++- include/http.h | 2 + 3 files changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 47b5d8a2bb..0449d53045 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -284,12 +284,37 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { - *ret_size = 0; + struct http_receive_body_params params = + { + .id = id, + .bits = sizeof(void *) * 8, + }; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED sync_ovl; - FIXME("stub: queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); - return ERROR_HANDLE_EOF; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (!ovl) + { + sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl = &sync_ovl; + } + + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, NULL, ovl)) + ret = GetLastError(); + + if (ovl == &sync_ovl) + { + if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) + ret = GetLastError(); + CloseHandle(sync_ovl.hEvent); + } + + return ret; } /*********************************************************************** diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5c3b4ec13c..c506023ee7 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -546,12 +546,13 @@ static void test_v1_short_buffer(void) static void test_v1_entity_body(void) { - char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048]; + char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048], recv_body[2000]; HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; HTTP_RESPONSE_V1 response = {}; HTTP_DATA_CHUNK chunks[2] = {}; ULONG ret, chunk_size; unsigned int i; + OVERLAPPED ovl; DWORD ret_size; HANDLE queue; SOCKET s; @@ -571,6 +572,8 @@ static void test_v1_entity_body(void) "Content-Length: 2048\r\n" "\r\n"; + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + for (i = 0; i < sizeof(req_body); ++i) req_body[i] = i / 111; @@ -708,6 +711,119 @@ static void test_v1_entity_body(void) send_response_v1(queue, req->RequestId, s); + /* Test HttpReceiveRequestEntityBody(). */ + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 2, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 3, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(!ret || ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %u.\n", GetLastError()); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req2, strlen(post_req2), 0); + ok(ret == strlen(post_req2), "send() returned %d.\n", ret); + ret = send(s, req_body, sizeof(req_body), 0); + ok(ret == sizeof(req_body), "send() returned %d.\n", ret); + + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, 2000, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2000, "Got size %u.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + chunk_size = req->pEntityChunks[0].FromMemory.BufferLength; + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2048 - chunk_size, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, req_body + chunk_size, ret_size), "Entity body didn't match.\n"); + + send_response_v1(queue, req->RequestId, s); + + CloseHandle(ovl.hEvent); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); closesocket(s); diff --git a/include/http.h b/include/http.h index 49eb557fae..394167fd68 100644 --- a/include/http.h +++ b/include/http.h @@ -46,6 +46,8 @@ typedef struct _HTTPAPI_VERSION #define HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY 0x00000001 #define HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY 0x00000002 +#define HTTP_RECEIVE_REQUEST_ENTITY_BODY_FLAG_FILL_BUFFER 0x00000001 + #define HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS 0x00000001 #define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 #define HTTP_REQUEST_FLAG_HTTP2 0x00000004

1 0

Zebediah Figura : http.sys: Allow receiving entity body data.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 92008978498037167e478725934c4c4b12095958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92008978498037167e478725… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:37 2019 -0600 http.sys: Allow receiving entity body data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++--- include/wine/http.h | 7 +++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 41f9f15bba..91d81400e6 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -411,9 +411,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) const struct http_receive_request_params params = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); + ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset, processed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset; const char *p, *name, *value, *host, *abs_path, *query; USHORT unk_headers_count = 0, unk_header_idx; int name_len, value_len, len; @@ -758,8 +758,10 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) assert(offset == irp->IoStatus.Information); conn->available = FALSE; - memmove(conn->buffer, conn->buffer + conn->req_len, conn->len - conn->req_len); - conn->len -= conn->req_len; + processed = conn->req_len - (conn->content_len - chunk_len); + memmove(conn->buffer, conn->buffer + processed, conn->len - processed); + conn->content_len -= chunk_len; + conn->len -= processed; return STATUS_SUCCESS; } @@ -1216,6 +1218,13 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) { if (send(conn->socket, response->buffer, response->len, 0) >= 0) { + if (conn->content_len) + { + /* Discard whatever entity body is left. */ + memmove(conn->buffer, conn->buffer + conn->content_len, conn->len - conn->content_len); + conn->len -= conn->content_len; + } + conn->queue = NULL; conn->req_id = HTTP_NULL_ID; WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); @@ -1242,6 +1251,44 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) return STATUS_CONNECTION_INVALID; } +static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) +{ + const struct http_receive_body_params *params = irp->AssociatedIrp.SystemBuffer; + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + struct connection *conn; + NTSTATUS ret; + + TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + + EnterCriticalSection(&http_cs); + + if ((conn = get_connection(params->id))) + { + TRACE("%u bits remaining.\n", conn->content_len); + + if (conn->content_len) + { + ULONG len = min(conn->content_len, output_len); + memcpy(irp->AssociatedIrp.SystemBuffer, conn->buffer, len); + memmove(conn->buffer, conn->buffer + len, conn->len - len); + conn->content_len -= len; + conn->len -= len; + + irp->IoStatus.Information = len; + ret = STATUS_SUCCESS; + } + else + ret = STATUS_END_OF_FILE; + } + else + ret = STATUS_CONNECTION_INVALID; + + LeaveCriticalSection(&http_cs); + + return ret; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -1262,6 +1309,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_SEND_RESPONSE: ret = http_send_response(queue, irp); break; + case IOCTL_HTTP_RECEIVE_BODY: + ret = http_receive_body(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index eb75d8f60e..d8039dea07 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -27,6 +27,7 @@ #define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) #define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) #define IOCTL_HTTP_SEND_RESPONSE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_RECEIVE_BODY CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -49,4 +50,10 @@ struct http_response char buffer[1]; }; +struct http_receive_body_params +{ + HTTP_REQUEST_ID id; + ULONG bits; +}; + #endif

1 0

Zebediah Figura : http.sys: Factor out get_connection().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6360ea89320927526b6e90b201f96eecde633e60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6360ea89320927526b6e90b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:36 2019 -0600 http.sys: Factor out get_connection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 62 ++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index c51ca8a350..41f9f15bba 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1159,6 +1159,18 @@ static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) return STATUS_SUCCESS; } +static struct connection *get_connection(HTTP_REQUEST_ID req_id) +{ + struct connection *conn; + + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->req_id == req_id) + return conn; + } + return NULL; +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1170,14 +1182,11 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) EnterCriticalSection(&http_cs); - LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + if ((conn = get_connection(params->id)) && conn->available && conn->queue == queue) { - if (conn->available && conn->queue == queue && params->id == conn->req_id) - { - ret = complete_irp(conn, irp); - LeaveCriticalSection(&http_cs); - return ret; - } + ret = complete_irp(conn, irp); + LeaveCriticalSection(&http_cs); + return ret; } if (params->id == HTTP_NULL_ID) @@ -1203,33 +1212,30 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) EnterCriticalSection(&http_cs); - LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + if ((conn = get_connection(response->id))) { - if (conn->req_id == response->id) + if (send(conn->socket, response->buffer, response->len, 0) >= 0) { - if (send(conn->socket, response->buffer, response->len, 0) >= 0) - { - conn->queue = NULL; - conn->req_id = HTTP_NULL_ID; - WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); - irp->IoStatus.Information = response->len; - /* We might have another request already in the buffer. */ - if (parse_request(conn) < 0) - { - WARN("Failed to parse request; shutting down connection.\n"); - send_400(conn); - close_connection(conn); - } - } - else + conn->queue = NULL; + conn->req_id = HTTP_NULL_ID; + WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); + irp->IoStatus.Information = response->len; + /* We might have another request already in the buffer. */ + if (parse_request(conn) < 0) { - ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + WARN("Failed to parse request; shutting down connection.\n"); + send_400(conn); close_connection(conn); } - - LeaveCriticalSection(&http_cs); - return STATUS_SUCCESS; } + else + { + ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + close_connection(conn); + } + + LeaveCriticalSection(&http_cs); + return STATUS_SUCCESS; } LeaveCriticalSection(&http_cs);

1 0

Zebediah Figura : ntoskrnl.exe: Pass the correct output size to IoBuildDeviceIoControlRequest().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 61928e816030413d8d3363dcf9840b302bedfcc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61928e816030413d8d3363dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:35 2019 -0600 ntoskrnl.exe: Pass the correct output size to IoBuildDeviceIoControlRequest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 --- dlls/ntoskrnl.exe/tests/driver.c | 9 +++------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 ++++++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4dd6bb38b3..f53434aedf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -721,10 +721,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = out_buff; } else - { out_buff = context->in_buff; - out_size = context->in_size; - } } irp = IoBuildDeviceIoControlRequest( context->params.ioctl.code, device, context->in_buff, diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0506011ce5..67f22a4b2b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1777,17 +1777,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG length = min(stack->Parameters.DeviceIoControl.OutputBufferLength, sizeof(teststr)); char *buffer = irp->AssociatedIrp.SystemBuffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(teststr)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, teststr, sizeof(teststr)); - *info = sizeof(teststr); + memcpy(buffer, teststr, length); + *info = length; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index eb58878cec..76bcf0d0ce 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -190,8 +190,8 @@ static void main_test(void) static void test_basic_ioctl(void) { + char inbuf[64], buf[32]; DWORD written; - char buf[32]; BOOL res; res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, NULL, 0, buf, @@ -199,6 +199,13 @@ static void test_basic_ioctl(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(teststr), "got size %d\n", written); ok(!strcmp(buf, teststr), "got '%s'\n", buf); + + memset(buf, 0, sizeof(buf)); + res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, inbuf, + sizeof(inbuf), buf, 10, &written, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + ok(written == 10, "got size %d\n", written); + ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } static void test_overlapped(void)

1 0

Sven Baars : shell32: Fix a memory leak (Valgrind).
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6796cd8ac4a3a03d7af3dd2139c12c53b984a089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6796cd8ac4a3a03d7af3dd21… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Nov 2 12:02:27 2019 +0100 shell32: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c0c027fbd3..bcb9466315 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -655,6 +655,8 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) { if (IncludeObject(This, pidl) == S_OK) shellview_add_item(This, pidl); + else + ILFree(pidl); } SendMessageW(This->hWndList, LVM_SORTITEMS, (WPARAM)This->pSFParent, (LPARAM)ShellView_CompareItems);

1 0

Alexandre Julliard : winegcc: Also check magic number to detect shared libraries.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 21c832da633096dfed47c7865c8912420f127ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c832da633096dfed47c786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 15:54:58 2019 +0100 winegcc: Also check magic number to detect shared libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 3197e46e47..52f46c491b 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -212,6 +212,7 @@ file_type get_file_type(const char* filename) { /* see tools/winebuild/res32.c: check_header for details */ static const char res_sig[] = { 0,0,0,0, 32,0,0,0, 0xff,0xff, 0,0, 0xff,0xff, 0,0, 0,0,0,0, 0,0, 0,0, 0,0,0,0, 0,0,0,0 }; + static const char elf_sig[4] = "\177ELF"; char buf[sizeof(res_sig)]; int fd, cnt; @@ -230,6 +231,11 @@ file_type get_file_type(const char* filename) if (strendswith(filename, ".def")) return file_def; if (strendswith(filename, ".spec")) return file_spec; if (strendswith(filename, ".rc")) return file_rc; + if (cnt >= sizeof(elf_sig) && !memcmp(buf, elf_sig, sizeof(elf_sig))) return file_so; /* ELF lib */ + if (cnt >= sizeof(unsigned int) && + (*(unsigned int *)buf == 0xfeedface || *(unsigned int *)buf == 0xcefaedfe || + *(unsigned int *)buf == 0xfeedfacf || *(unsigned int *)buf == 0xcffaedfe)) + return file_so; /* Mach-O lib */ return file_other; }

1 0

Alexandre Julliard : vcomp: Fix signed char issues.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 010d44a2ac4a420dc1b3f6e43372bfd067a3db2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=010d44a2ac4a420dc1b3f6e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 15:14:35 2019 +0100 vcomp: Fix signed char issues. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 12 ++++++------ dlls/vcomp/tests/vcomp.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 686984709a..3c6d48d41c 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -431,10 +431,10 @@ void CDECL _vcomp_atomic_and_i1(char *dest, char val) do old = *dest; while (interlocked_cmpxchg8(dest, old & val, old) != old); } -void CDECL _vcomp_atomic_div_i1(char *dest, char val) +void CDECL _vcomp_atomic_div_i1(signed char *dest, signed char val) { - char old; - do old = *dest; while (interlocked_cmpxchg8(dest, old / val, old) != old); + signed char old; + do old = *dest; while ((signed char)interlocked_cmpxchg8((char *)dest, old / val, old) != old); } void CDECL _vcomp_atomic_div_ui1(unsigned char *dest, unsigned char val) @@ -461,10 +461,10 @@ void CDECL _vcomp_atomic_shl_i1(char *dest, unsigned int val) do old = *dest; while (interlocked_cmpxchg8(dest, old << val, old) != old); } -void CDECL _vcomp_atomic_shr_i1(char *dest, unsigned int val) +void CDECL _vcomp_atomic_shr_i1(signed char *dest, unsigned int val) { - char old; - do old = *dest; while (interlocked_cmpxchg8(dest, old >> val, old) != old); + signed char old; + do old = *dest; while ((signed char)interlocked_cmpxchg8((char *)dest, old >> val, old) != old); } void CDECL _vcomp_atomic_shr_ui1(unsigned char *dest, unsigned int val) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index ea62909756..a8b80a0e22 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1549,7 +1549,7 @@ static void test_atomic_integer8(void) struct { void (CDECL *func)(char *, char); - char v1, v2, expected; + signed char v1, v2, expected; } tests1[] = { @@ -1566,9 +1566,9 @@ static void test_atomic_integer8(void) struct { void (CDECL *func)(char *, unsigned int); - char v1; + signed char v1; unsigned int v2; - char expected; + signed char expected; } tests2[] = { @@ -1616,14 +1616,14 @@ static void test_atomic_integer8(void) for (i = 0; i < ARRAY_SIZE(tests1); i++) { - char val = tests1[i].v1; - tests1[i].func(&val, tests1[i].v2); + signed char val = tests1[i].v1; + tests1[i].func((char *)&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } for (i = 0; i < ARRAY_SIZE(tests2); i++) { - char val = tests2[i].v1; - tests2[i].func(&val, tests2[i].v2); + signed char val = tests2[i].v1; + tests2[i].func((char *)&val, tests2[i].v2); ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); } for (i = 0; i < ARRAY_SIZE(tests3); i++)

1 0

Alexandre Julliard : vcomp: Fix vcomp_fork() implementation on ARM64.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 15ecb13d9c76a0e9635af6a49ad1412c1a8092be URL: https://source.winehq.org/git/wine.git/?a=commit;h=15ecb13d9c76a0e9635af6a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 15:14:28 2019 +0100 vcomp: Fix vcomp_fork() implementation on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 52 ++++++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index fe87ca06fc..686984709a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -239,40 +239,24 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" "mov x29, SP\n\t" "mov x9, x0\n\t" - "cbz w1, 2f\n\t" - "mov w10, w1\n\t" - "mov x11, x2\n\t" - "ldr w12, [x11, #24]\n\t" - "ldr x13, [x11, #8]\n\t" - "ldr x0, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x1, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x2, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x3, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x4, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x5, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x6, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "ldr x7, [x13, w12, sxtw]\n\t" - "add w12, w12, #8\n\t" - "add x13, x13, w12, sxtw\n\t" - "subs w12, w10, #8\n\t" - "b.le 2f\n\t" - "ldr x11, [x11]\n\t" - "lsl w12, w12, #3\n\t" - "sub SP, SP, w12, sxtw\n\t" - "tbz w12, #3, 1f\n\t" - "sub SP, SP, #8\n\t" - "1: sub w12, w12, #8\n\t" - "ldr x14, [x13, w12, sxtw]\n\t" - "str x14, [SP, w12, sxtw]\n\t" - "cbnz w12, 1b\n\t" - "2: blr x9\n\t" + "cbz w1, 4f\n\t" + "lsl w8, w1, #3\n\t" + "cmp w8, #64\n\t" + "b.ge 1f\n\t" + "mov w8, #64\n" + "1:\ttbz w8, #3, 2f\n\t" + "add w8, w8, #8\n" + "2:\tsub x10, x29, x8\n\t" + "mov sp, x10\n" + "3:\tldr x0, [x2], #8\n\t" + "str x0, [x10], #8\n\t" + "subs w1, w1, #1\n\t" + "b.ne 3b\n\t" + "ldp x0, x1, [sp], #16\n\t" + "ldp x2, x3, [sp], #16\n\t" + "ldp x4, x5, [sp], #16\n\t" + "ldp x6, x7, [sp], #16\n" + "4:\tblr x9\n\t" "mov SP, x29\n\t" "ldp x29, x30, [SP], #16\n\t" "ret\n" )

1 0

Fabian Maurer : user32/combo: Properly handle WM_CTLCOLOR* messages.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fbec0ba9eeb12cc153e1e4e0ca98734fe5bc593a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbec0ba9eeb12cc153e1e4e0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:29 2019 +0300 user32/combo: Properly handle WM_CTLCOLOR* messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 12 ++++++++++++ dlls/user32/tests/combo.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 59c2e6484c..4ddccd6c95 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1988,6 +1988,18 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); return TRUE; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lphc->owner) + return SendMessageW(lphc->owner, message, wParam, lParam); + break; + /* Combo messages */ case CB_ADDSTRING: diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 289e1d3f56..6b51ff9719 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -854,7 +854,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); } @@ -865,7 +864,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(!brush, "%u: unexpected brush %p.\n", i, brush); }

1 0

Fabian Maurer : comctl32/combo: Properly handle WM_CTLCOLOR* messages.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1dc3ec2cdc83da0c1cab96f2dc61b2c917fd1e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc3ec2cdc83da0c1cab96f2… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:28 2019 +0300 comctl32/combo: Properly handle WM_CTLCOLOR* messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46417 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 10 ++++++++++ dlls/comctl32/tests/combo.c | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 8a52a0bdc0..599817aed4 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1963,6 +1963,16 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); return TRUE; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + return SendMessageW(lphc->owner, message, wParam, lParam); + /* Combo messages */ case CB_ADDSTRING: if (lphc->dwStyle & CBS_LOWERCASE) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index be4ee53c22..4757fa3cc6 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1306,7 +1306,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); } @@ -1317,7 +1316,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(!brush, "%u: unexpected brush %p.\n", i, brush); } @@ -1344,7 +1342,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(!brush, "%u: unexpected brush %p.\n", i, brush); }

1 0

Fabian Maurer : user32/tests: Add combo tests for WM_CTLCOLOR*.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2feab9b99dbcccc434cc479964bc34ef1fa44f4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2feab9b99dbcccc434cc4799… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:27 2019 +0300 user32/tests: Add combo tests for WM_CTLCOLOR*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..289e1d3f56 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -173,6 +173,8 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR; +static HBRUSH brush_red; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -204,6 +206,20 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + return (LRESULT) brush_red; + } + break; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -804,8 +820,89 @@ static void test_WS_VSCROLL(void) DestroyWindow(hCombo); } +static void test_combo_ctlcolor(void) +{ + static const int messages[] = + { + WM_CTLCOLOR, + WM_CTLCOLORMSGBOX, + WM_CTLCOLOREDIT, + WM_CTLCOLORLISTBOX, + WM_CTLCOLORBTN, + WM_CTLCOLORDLG, + WM_CTLCOLORSCROLLBAR, + WM_CTLCOLORSTATIC, + }; + + HBRUSH brush, global_brush; + unsigned int i, ret; + COMBOBOXINFO info; + HWND combo; + + combo = build_combo(CBS_DROPDOWN); + ok(!!combo, "Failed to create combo window.\n"); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + info.cbSize = sizeof(COMBOBOXINFO); + ret = GetComboBoxInfo(combo, &info); + ok(ret, "Failed to get combobox info structure.\n"); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + /* Parent returns valid brush handle. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); + } + + /* Parent returns NULL brush. */ + global_brush = brush_red; + brush_red = NULL; + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + brush_red = global_brush; + + lparam_for_WM_CTLCOLOR = 0; + + /* Parent does default processing. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + ok(!!brush && brush != brush_red, "%u: unexpected brush %p.\n", i, brush); + } + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(combo); + + /* Combo without a parent. */ + combo = CreateWindowA("ComboBox", "Combo", CBS_DROPDOWN, 5, 5, 100, 100, NULL, NULL, NULL, 0); + ok(!!combo, "Failed to create combo window.\n"); + + info.cbSize = sizeof(COMBOBOXINFO); + ret = GetComboBoxInfo(combo, &info); + ok(ret, "Failed to get combobox info structure.\n"); + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + ok(!!brush && brush != brush_red, "%u: unexpected brush %p.\n", i, brush); + } + + DestroyWindow(combo); +} + START_TEST(combo) { + brush_red = CreateSolidBrush(RGB(255, 0, 0)); hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -825,6 +922,8 @@ START_TEST(combo) test_listbox_styles(CBS_DROPDOWN); test_listbox_styles(CBS_DROPDOWNLIST); test_listbox_size(CBS_DROPDOWN); + test_combo_ctlcolor(); DestroyWindow(hMainWnd); + DeleteObject(brush_red); }

1 0

Fabian Maurer : comctl32/tests: Add combo tests for WM_CTLCOLOR*.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: e95873997f09956f8ba49f26bc186803f8bed0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95873997f09956f8ba49f26… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:26 2019 +0300 comctl32/tests: Add combo tests for WM_CTLCOLOR*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..be4ee53c22 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,20 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + return (LRESULT) brush_red; + } + break; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1274,83 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo_ctlcolor(void) +{ + static const int messages[] = + { + WM_CTLCOLOR, + WM_CTLCOLORMSGBOX, + WM_CTLCOLOREDIT, + WM_CTLCOLORLISTBOX, + WM_CTLCOLORBTN, + WM_CTLCOLORDLG, + WM_CTLCOLORSCROLLBAR, + WM_CTLCOLORSTATIC, + }; + + HBRUSH brush, global_brush; + COMBOBOXINFO info; + unsigned int i; + HWND combo; + + combo = create_combobox(CBS_DROPDOWN); + ok(!!combo, "Failed to create combo window.\n"); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + get_combobox_info(combo, &info); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + /* Parent returns valid brush handle. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); + } + + /* Parent returns NULL brush. */ + global_brush = brush_red; + brush_red = NULL; + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + brush_red = global_brush; + + lparam_for_WM_CTLCOLOR = 0; + + /* Parent does default processing. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + ok(!!brush && brush != brush_red, "%u: unexpected brush %p.\n", i, brush); + } + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(combo); + + /* Combo without a parent. */ + combo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN, 5, 5, 100, 100, NULL, NULL, NULL, 0); + ok(!!combo, "Failed to create combo window.\n"); + + get_combobox_info(combo, &info); + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + DestroyWindow(combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1297,6 +1394,7 @@ START_TEST(combo) test_combo_listbox_styles(CBS_DROPDOWNLIST); test_combo_dropdown_size(0); test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); + test_combo_ctlcolor(); cleanup(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : ole32: Support BIND_OPTS3 in bind context.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 89ef98ab8ad17f72fc2d4fd473fa5cf19b6305f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef98ab8ad17f72fc2d4fd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 23:58:58 2019 +0300 ole32: Support BIND_OPTS3 in bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/bindctx.c | 38 +++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 13 ++++++++----- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 1951100b0b..24229568f1 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -57,7 +57,7 @@ typedef struct BindCtxImpl{ DWORD bindCtxTableLastIndex; /* first free index in the table */ DWORD bindCtxTableSize; /* size table */ - BIND_OPTS2 bindOption2; /* a structure which contains the bind options*/ + BIND_OPTS3 options; } BindCtxImpl; @@ -246,17 +246,17 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - TRACE("(%p,%p)\n",This,pbindopts); + TRACE("(%p,%p)\n",This, pbindopts); if (pbindopts==NULL) return E_POINTER; - if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) + if (pbindopts->cbStruct > sizeof(This->options)) { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ + WARN("invalid size %u.\n", pbindopts->cbStruct); + return E_INVALIDARG; } - memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct); + memcpy(&This->options, pbindopts, pbindopts->cbStruct); return S_OK; } @@ -267,19 +267,16 @@ static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG cbStruct; + DWORD size; TRACE("(%p,%p)\n",This,pbindopts); if (pbindopts==NULL) return E_POINTER; - cbStruct = pbindopts->cbStruct; - if (cbStruct > sizeof(BIND_OPTS2)) - cbStruct = sizeof(BIND_OPTS2); - - memcpy(pbindopts, &This->bindOption2, cbStruct); - pbindopts->cbStruct = cbStruct; + size = min(pbindopts->cbStruct, sizeof(This->options)); + memcpy(pbindopts, &This->options, size); + pbindopts->cbStruct = size; return S_OK; } @@ -520,16 +517,11 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; This->ref = 0; - /* Initialize the BIND_OPTS2 structure */ - This->bindOption2.cbStruct = sizeof(BIND_OPTS2); - This->bindOption2.grfFlags = 0; - This->bindOption2.grfMode = STGM_READWRITE; - This->bindOption2.dwTickCountDeadline = 0; - - This->bindOption2.dwTrackFlags = 0; - This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = GetThreadLocale(); - This->bindOption2.pServerInfo = 0; + memset(&This->options, 0, sizeof(This->options)); + This->options.cbStruct = sizeof(This->options); + This->options.grfMode = STGM_READWRITE; + This->options.dwClassContext = CLSCTX_SERVER; + This->options.locale = GetThreadLocale(); /* Initialize the bindctx table */ This->bindCtxTableSize=0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5bcc136a36..18ea4d465b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1888,7 +1888,7 @@ static void test_bind_context(void) HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; - BIND_OPTS2 bind_opts; + BIND_OPTS3 bind_opts; HeapUnknown *unknown; HeapUnknown *unknown2; IUnknown *param_obj; @@ -1908,19 +1908,20 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ - "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(BIND_OPTS3) || broken(bind_opts.cbStruct == sizeof(BIND_OPTS2)) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + memset(&bind_opts, 0xfe, sizeof(bind_opts)); bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(bind_opts) || bind_opts.cbStruct == sizeof(BIND_OPTS2) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); ok(bind_opts.grfFlags == 0, "bind_opts.grfFlags was 0x%x instead of 0\n", bind_opts.grfFlags); ok(bind_opts.grfMode == STGM_READWRITE, "bind_opts.grfMode was 0x%x instead of STGM_READWRITE\n", bind_opts.grfMode); ok(bind_opts.dwTickCountDeadline == 0, "bind_opts.dwTickCountDeadline was %d instead of 0\n", bind_opts.dwTickCountDeadline); @@ -1929,6 +1930,8 @@ static void test_bind_context(void) "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); + if (bind_opts.cbStruct >= sizeof(BIND_OPTS3)) + ok(bind_opts.hwnd == NULL, "Unexpected bind_opts.hwnd %p.\n", bind_opts.hwnd); bind_opts.cbStruct = -1; hr = IBindCtx_SetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts);

1 0

Nikolay Sivov : comsvcs: Implement Inverse() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ab6274180b0823f2babdc4737b4b510ec15bea8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6274180b0823f2babdc473… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:31:00 2019 +0300 comsvcs: Implement Inverse() 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 | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index d772365dda..6b292844d9 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -584,9 +584,9 @@ static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) { - FIXME("%p, %p.\n", iface, inverse); + TRACE("%p, %p.\n", iface, inverse); - return E_NOTIMPL; + return CreateAntiMoniker(inverse); } static HRESULT WINAPI new_moniker_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **ret) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 5fb73d29ca..37fce3dab4 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -358,16 +358,13 @@ todo_wine ok(hr == MK_E_NOSTORAGE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Inverse(moniker, &inverse); -todo_wine ok(hr == S_OK, "Failed to create inverse moniker, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ moniker_type = MKSYS_NONE; hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); -} + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs: Implement IsSystemMoniker() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 96b5670ac74df6a470018f56b527ffca923b70c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b5670ac74df6a470018f56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:59 2019 +0300 comsvcs: Implement IsSystemMoniker() 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 | 6 ++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 7addd1ee80..d772365dda 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -621,9 +621,11 @@ static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pb static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) { - FIXME("%p, %p.\n", iface, moniker_type); + TRACE("%p, %p.\n", iface, moniker_type); - return E_NOTIMPL; + *moniker_type = MKSYS_NONE; + + return S_FALSE; } static const IMonikerVtbl new_moniker_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index cbe338872a..5fb73d29ca 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -332,10 +332,9 @@ static void test_new_moniker(void) moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); -todo_wine { ok(hr == S_FALSE || broken(hr == S_OK) /* XP */, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_NONE, "Unexpected moniker type %d.\n", moniker_type); -} + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs: Implement Hash() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ee9447162518be0a91f1e580f8f246f1785eeee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9447162518be0a91f1e580… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:58 2019 +0300 comsvcs: Implement Hash() 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 | 10 ++++++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 101af6f071..7addd1ee80 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -55,6 +55,7 @@ struct new_moniker { IMoniker IMoniker_iface; LONG refcount; + CLSID clsid; }; static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); @@ -556,9 +557,13 @@ static HRESULT WINAPI new_moniker_IsEqual(IMoniker *iface, IMoniker *other_monik static HRESULT WINAPI new_moniker_Hash(IMoniker *iface, DWORD *hash) { - FIXME("%p, %p.\n", iface, hash); + struct new_moniker *moniker = impl_from_IMoniker(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hash); + + *hash = moniker->clsid.Data1; + + return S_OK; } static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMoniker *pmkToLeft, @@ -748,6 +753,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; moniker->refcount = 1; + moniker->clsid = guid; *ret = &moniker->IMoniker_iface; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index b377a9a515..cbe338872a 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -327,10 +327,9 @@ static void test_new_moniker(void) /* Hashing */ hash = 0; hr = IMoniker_Hash(moniker, &hash); -todo_wine { ok(hr == S_OK, "Failed to get a hash, hr %#x.\n", hr); ok(hash == 0x20d04fe0, "Unexpected hash value %#x.\n", hash); -} + moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); todo_wine {

1 0

Nikolay Sivov : comsvcs: Implement display name parsing for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 51d90cb843266d4efbbb5337c58445b0d7cbb3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d90cb843266d4efbbb5337… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:57 2019 +0300 comsvcs: Implement display name parsing 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 | 132 +++++++++++++++++++++++++++++++++++++------ dlls/comsvcs/tests/comsvcs.c | 9 ++- 2 files changed, 123 insertions(+), 18 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index ae09094d30..101af6f071 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -57,6 +57,8 @@ struct new_moniker LONG refcount; }; +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); @@ -607,9 +609,9 @@ static HRESULT WINAPI new_moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - FIXME("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); + TRACE("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); - return E_NOTIMPL; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) @@ -646,6 +648,115 @@ static const IMonikerVtbl new_moniker_vtbl = new_moniker_IsSystemMoniker }; +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL is_valid_hex(WCHAR c) +{ + return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || + (c >= 'A' && c <= 'F'); +} + +static HRESULT guid_from_string(const WCHAR *s, GUID *ret) +{ + BOOL has_brackets; + GUID guid = { 0 }; + int i; + + memset(ret, 0, sizeof(*ret)); + + /* Curly brackets are optional. */ + has_brackets = s[0] == '{'; + + if (has_brackets) + s++; + + for (i = 0; i < 8; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data1 = (guid.Data1 << 4) | guid_conv_table[s[i]]; + } + s += 8; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[0])) return FALSE; + guid.Data2 = (guid.Data2 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data3 = (guid.Data3 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 17; i += 2) + { + if (i == 4) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; + guid.Data4[i / 2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; + } + s += 17; + + if (has_brackets && s[0] != '}') + return FALSE; + + *ret = guid; + + return TRUE; +} + +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) +{ + struct new_moniker *moniker; + GUID guid; + + *ret = NULL; + + if (wcsnicmp(name, L"new:", 4)) + return MK_E_SYNTAX; + + if (!guid_from_string(name + 4, &guid)) + return MK_E_SYNTAX; + + moniker = heap_alloc_zero(sizeof(*moniker)); + if (!moniker) + return E_OUTOFMEMORY; + + moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; + moniker->refcount = 1; + + *ret = &moniker->IMoniker_iface; + + if (eaten) + *eaten = lstrlenW(name); + + return S_OK; +} + static HRESULT WINAPI new_moniker_parse_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -676,22 +787,9 @@ static ULONG WINAPI new_moniker_parse_Release(IParseDisplayName *iface) static HRESULT WINAPI new_moniker_parse_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - struct new_moniker *moniker; - - FIXME("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - - moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) - return E_OUTOFMEMORY; - - moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; - moniker->refcount = 1; + TRACE("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - *ret = &moniker->IMoniker_iface; - - *eaten = lstrlenW(name); - - return S_OK; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static const IParseDisplayNameVtbl new_moniker_parse_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 68760afd91..b377a9a515 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -269,7 +269,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { - IMoniker *moniker, *inverse, *class_moniker; + IMoniker *moniker, *moniker2, *inverse, *class_moniker; DWORD moniker_type; IBindCtx *bindctx; FILETIME filetime; @@ -286,6 +286,13 @@ static void test_new_moniker(void) ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + eaten = 0; + hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, (WCHAR *)L"new:20d04fe0-3aea-1069-a2d8-08002b30309d", + &eaten, &moniker2); + ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); + ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + IMoniker_Release(moniker2); + hr = IMoniker_QueryInterface(moniker, &IID_IParseDisplayName, (void **)&obj); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs: Add a stub for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: d36b8350d9b04de2b50a76085e47bef059f8f09f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36b8350d9b04de2b50a7608… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:56 2019 +0300 comsvcs: Add a stub for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 1 + dlls/comsvcs/comsvcs_classes.idl | 29 ++++ dlls/comsvcs/main.c | 354 ++++++++++++++++++++++++++++++++++++++- dlls/comsvcs/tests/comsvcs.c | 100 +++++++++++ 4 files changed, 480 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d36b8350d9b04de2b50a…

1 0

Nikolay Sivov : comsvcs/tests: Rename test file.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: a3bf974aeeac21f205f99555a08d98ad3770479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bf974aeeac21f205f99555… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:55 2019 +0300 comsvcs/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/Makefile.in | 2 +- dlls/comsvcs/tests/{dispenser.c => comsvcs.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 9a7047ebaf..86da9fda66 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - dispenser.c + comsvcs.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/comsvcs.c similarity index 99% rename from dlls/comsvcs/tests/dispenser.c rename to dlls/comsvcs/tests/comsvcs.c index 10bce8e849..77d3224366 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -268,7 +268,7 @@ static void create_dispenser(void) } -START_TEST(dispenser) +START_TEST(comsvcs) { HRESULT hr;

1 0

Zebediah Figura : strmbase/transform: Reimplement IQualityControl for the source pin.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: cdeb55a8f94f1cfe3af01a6349d70c905b06583a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdeb55a8f94f1cfe3af01a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 2 22:33:14 2019 -0500 strmbase/transform: Reimplement IQualityControl for the source pin. There is not enough common code between renderers and transforms to be worth duplicating. This fixes a regression introduced by db7eb3327. The wrong impl_from_*() helper was used in IQualityControl::Notify(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 105 +++++++++++++++++++++++++++++++++------------- include/wine/strmbase.h | 5 ++- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 266232f57a..f4c2c4be72 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -28,7 +28,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface ) { @@ -149,7 +148,6 @@ static void transform_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); FreeMediaType(&filter->pmt); - QualityControlImpl_Destroy(filter->qcimpl); IUnknown_Release(filter->seekthru_unk); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -225,7 +223,7 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo TransformFilter *filter = impl_from_source_IPin(&iface->IPin_iface); if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); else @@ -265,6 +263,80 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; +static TransformFilter *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, TransformFilter, source_IQualityControl_iface); +} + +static HRESULT WINAPI transform_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI transform_source_qc_AddRef(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI transform_source_qc_Release(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality q) +{ + IQualityControl *peer; + HRESULT hr = S_FALSE; + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI transform_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->pFuncsTable->pfnNotify) + return filter->pFuncsTable->pfnNotify(filter, sender, q); + return TransformFilterImpl_Notify(filter, sender, q); +} + +static HRESULT WINAPI transform_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + transform_source_qc_QueryInterface, + transform_source_qc_AddRef, + transform_source_qc_Release, + transform_source_qc_Notify, + transform_source_qc_SetSink, +}; + static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { @@ -285,9 +357,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, strmbase_source_init(&filter->source, &TransformFilter_OutputPin_Vtbl, &filter->filter, wcsOutputPinName, &source_ops); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; + filter->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; filter->seekthru_unk = NULL; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&filter->filter.IBaseFilter_iface, @@ -335,11 +405,6 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) -{ - return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { TransformFilter *filter = impl_from_sink_IPin(iface); @@ -479,21 +544,3 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; - -static HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *qc = (QualityControlImpl*)iface; - TransformFilter *This = impl_from_source_IPin(&qc->pin->IPin_iface); - - if (This->pFuncsTable->pfnNotify) - return This->pFuncsTable->pfnNotify(This, sender, qm); - else - return TransformFilterImpl_Notify(This, sender, qm); -} - -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - TransformFilter_QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a4920054e6..f92a375a56 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,14 +204,17 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter); typedef struct TransformFilter { struct strmbase_filter filter; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + BaseInputPin sink; AM_MEDIA_TYPE pmt; CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; - struct QualityControlImpl *qcimpl; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; } TransformFilter;

1 0

Nikolay Sivov : propsys: Add a semi-stub for PSCreatePropertyStoreFromObject().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: acb2e4fc7a4242c74ac91657edb97bf1e402656a URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb2e4fc7a4242c74ac91657… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 00:13:37 2019 +0300 propsys: Add a semi-stub for PSCreatePropertyStoreFromObject(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47958 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propstore.c | 16 ++++++++++++++++ dlls/propsys/propsys.spec | 2 +- dlls/propsys/tests/propsys.c | 35 ++++++++++++++++++++++++++++++++++- include/propsys.idl | 1 + 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6212f29312..6e0d49057d 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -473,3 +473,19 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv return ret; } + +HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFIID riid, void **ret) +{ + HRESULT hr; + + TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + + if (!obj || !ret) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IPropertyStore) && SUCCEEDED(hr = IUnknown_QueryInterface(obj, riid, ret))) + return hr; + + FIXME("Unimplemented for %s.\n", debugstr_guid(riid)); + return E_NOTIMPL; +} diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 8416b6dc74..3582805726 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -68,7 +68,7 @@ @ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray -@ stub PSCreatePropertyStoreFromObject +@ stdcall PSCreatePropertyStoreFromObject(ptr long ptr ptr) @ stub PSCreatePropertyStoreFromPropertySetStorage @ stub PSCreateSimplePropertyChange @ stub PSEnumeratePropertyDescriptions diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 419a0a080b..191a154744 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -29,8 +29,8 @@ #include "windef.h" #include "winbase.h" -#include "objbase.h" #include "initguid.h" +#include "objbase.h" #include "propsys.h" #include "propvarutil.h" #include "strsafe.h" @@ -1919,6 +1919,38 @@ static void test_propertystore(void) IPropertyStore_Release(propstore); } +static void test_PSCreatePropertyStoreFromObject(void) +{ + IPropertyStore *propstore; + IUnknown *unk; + HRESULT hr; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "Failed to create property store, hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject(NULL, STGM_READWRITE, &IID_IUnknown, (void **)&unk); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unk != (IUnknown *)propstore, "Unexpected object returned.\n"); + IUnknown_Release(unk); + } + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IPropertyStore, (void **)&unk); + ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); + ok(unk == (IUnknown *)propstore, "Unexpected object returned.\n"); + IUnknown_Release(unk); + + IPropertyStore_Release(propstore); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1941,4 +1973,5 @@ START_TEST(propsys) test_persistserialized(); test_PSCreateMemoryPropertyStore(); test_propertystore(); + test_PSCreatePropertyStoreFromObject(); } diff --git a/include/propsys.idl b/include/propsys.idl index bdd67fa6a5..fa6902831e 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -800,6 +800,7 @@ cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") +cpp_quote("HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);")

1 0

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