October 2020 - Wine-commits

Nikolay Sivov : msxml3/tests: Use wide string literals in more tests.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 20e36dcb1b3df78839f9d14f0a4308e7d0e886d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e36dcb1b3df78839f9d14f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:00 2020 +0300 msxml3/tests: Use wide string literals in more tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 +- dlls/msxml3/tests/saxreader.c | 158 +++++++++++++++++------------------------- dlls/msxml3/tests/schema.c | 21 ++---- dlls/msxml3/tests/xmldoc.c | 79 ++++++++------------- dlls/msxml3/tests/xmlview.c | 16 ++--- 5 files changed, 110 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20e36dcb1b3df78839f9…

1 0

Nikolay Sivov : msxml3/tests: Fix tests failures with unreachable network resources.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 44705156b588c679b2fc0a192ff1a07ef6084ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44705156b588c679b2fc0a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:01 2020 +0300 msxml3/tests: Fix tests failures with unreachable network resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5f5137dd16..4a23f1d82a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1295,7 +1295,6 @@ static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID r hr = IXMLHttpRequest_get_responseText(httpreq, &text); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(*text != 0, "got %s\n", wine_dbgstr_w(text)); SysFreeString(text); } @@ -1798,7 +1797,7 @@ static void test_server_xhr(void) V_VT(&body) = VT_EMPTY; hr = IServerXMLHTTPRequest_send(xhr, body); - if (hr == INET_E_RESOURCE_NOT_FOUND) + if (hr == INET_E_RESOURCE_NOT_FOUND || hr == WININET_E_NAME_NOT_RESOLVED) { skip("No connection could be made with test.winehq.org\n"); IServerXMLHTTPRequest_Release(xhr);

1 0

Nikolay Sivov : comctl32/tests: Remove some workarounds from ListView tests.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 120364fa9ceee0ce90a82512f550b195a42c165e URL: https://source.winehq.org/git/wine.git/?a=commit;h=120364fa9ceee0ce90a82512… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:01:49 2020 +0300 comctl32/tests: Remove some workarounds from ListView tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 116 +++++++++-------------------------------- 1 file changed, 25 insertions(+), 91 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9db3dc6ec4..e95b81f5bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -62,8 +62,6 @@ static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; -/* indicates we're running < 5.80 version */ -static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; /* alter notification code A->W */ @@ -727,20 +725,6 @@ static HWND create_listview_controlW(DWORD style, HWND parent) return hwnd; } -static BOOL is_win_xp(void) -{ - HWND hwnd, header; - BOOL ret; - - hwnd = create_listview_control(LVS_ICON); - SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, LVS_EX_HEADERINALLVIEWS); - header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); - ret = !IsWindow(header); - - DestroyWindow(hwnd); - - return ret; -} static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1039,12 +1023,6 @@ static void test_checkboxes(void) item.stateMask = 0xffff; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); - if (item.state != 0x1ccc) - { - win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); - DestroyWindow(hwnd); - return; - } /* Now add an item without specifying a state and check that its state goes to 0x1000 */ item.iItem = 2; @@ -1638,12 +1616,6 @@ static void test_create(BOOL is_version_6) DWORD style; ATOM class; - if (is_win_xp() && is_version_6) - { - win_skip("Skipping some tests on XP.\n"); - return; - } - cls.cbSize = sizeof(WNDCLASSEXA); r = GetClassInfoExA(GetModuleHandleA(NULL), WC_LISTVIEWA, &cls); ok(r, "Failed to get class info.\n"); @@ -3136,29 +3108,22 @@ static void test_ownerdata(void) DWORD res; LVITEMA item; - /* it isn't possible to set LVS_OWNERDATA after creation */ - if (g_is_below_5) - { - win_skip("set LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); + /* Setting LVS_OWNERDATA after creation leads to crash on older versions < 5.80 */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); - DestroyWindow(hwnd); - } + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); + DestroyWindow(hwnd); /* try to set LVS_OWNERDATA after creation just having it */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -3174,28 +3139,20 @@ static void test_ownerdata(void) "try to switch to LVS_OWNERDATA seq", FALSE); DestroyWindow(hwnd); - /* try to remove LVS_OWNERDATA after creation just having it */ - if (g_is_below_5) - { - win_skip("remove LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - DestroyWindow(hwnd); - } + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + DestroyWindow(hwnd); /* try select an item */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4624,27 +4581,6 @@ static void test_indentation(void) DestroyWindow(hwnd); } -static INT CALLBACK DummyCompareEx(LPARAM first, LPARAM second, LPARAM param) -{ - return 0; -} - -static BOOL is_below_comctl_5(void) -{ - HWND hwnd; - BOOL ret; - - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - insert_item(hwnd, 0); - - ret = SendMessageA(hwnd, LVM_SORTITEMSEX, 0, (LPARAM)&DummyCompareEx); - - DestroyWindow(hwnd); - - return !ret; -} - static void test_get_set_view(void) { HWND hwnd; @@ -6700,8 +6636,6 @@ START_TEST(listview) hwndparent = create_parent_window(FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - g_is_below_5 = is_below_comctl_5(); - test_header_notification(); test_header_notification2(); test_images();

1 0

Nikolay Sivov : rtworkq: Add remaining queue management stubs.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 1d7469d9a6e82e3a4c6a170e542f48fd4a342ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7469d9a6e82e3a4c6a170e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:02:56 2020 +0300 rtworkq: Add remaining queue management stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 +++--- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +++--- include/mfapi.h | 3 +++ include/rtworkq.idl | 2 ++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index f55a8237d3..8f5e7db6ae 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -25,7 +25,7 @@ @ stub MFBeginGetHostByName @ stub MFBeginRegisterWorkQueueWithMMCSS @ stdcall MFBeginRegisterWorkQueueWithMMCSSEx(long wstr long long ptr ptr) rtworkq.RtwqBeginRegisterWorkQueueWithMMCSS -@ stub MFBeginUnregisterWorkQueueWithMMCSS +@ stdcall MFBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) rtworkq.RtwqBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread @ stub MFCalculateBitmapImageSize @ stdcall MFCalculateImageSize(ptr long long ptr) @@ -87,8 +87,8 @@ @ stub MFDeserializePresentationDescriptor @ stdcall MFEndCreateFile(ptr ptr) @ stub MFEndGetHostByName -@ stub MFEndRegisterWorkQueueWithMMCSS -@ stub MFEndUnregisterWorkQueueWithMMCSS +@ stdcall MFEndRegisterWorkQueueWithMMCSS(ptr ptr) rtworkq.RtwqEndRegisterWorkQueueWithMMCSS +@ stdcall MFEndUnregisterWorkQueueWithMMCSS(ptr) rtworkq.RtwqEndUnregisterWorkQueueWithMMCSS @ stub MFFrameRateToAverageTimePerFrame @ stub MFFreeAdaptersAddresses @ stub MFGetAdaptersAddresses diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 07d124cfb7..f4e9f10d3f 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1533,6 +1533,27 @@ HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *cla return E_NOTIMPL; } +HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid) +{ + FIXME("%p, %p.\n", result, taskid); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state) +{ + FIXME("%#x, %p, %p.\n", queue, callback, state); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqEndUnregisterWorkQueueWithMMCSS(IRtwqAsyncResult *result) +{ + FIXME("%p.\n", result); + + return E_NOTIMPL; +} + HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events) { FIXME("%p.\n", events); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 09d877790d..2200b0863b 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -2,13 +2,13 @@ @ stdcall RtwqAllocateSerialWorkQueue(long ptr) @ stdcall RtwqAllocateWorkQueue(long ptr) @ stdcall RtwqBeginRegisterWorkQueueWithMMCSS(long wstr long long ptr ptr) -@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stdcall RtwqBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) @ stdcall RtwqCancelDeadline(long) @ stub RtwqCancelMultipleWaitingWorkItem @ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) -@ stub RtwqEndRegisterWorkQueueWithMMCSS -@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stdcall RtwqEndRegisterWorkQueueWithMMCSS(ptr ptr) +@ stdcall RtwqEndUnregisterWorkQueueWithMMCSS(ptr) @ stub RtwqGetPlatform @ stdcall RtwqGetWorkQueueMMCSSClass(long ptr ptr) @ stdcall RtwqGetWorkQueueMMCSSPriority(long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index b1edeac02f..e9b26f322c 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -490,6 +490,7 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSSEx(DWORD queue, const WCHAR *usage_class, DWORD taskid, LONG priority, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size); HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -517,6 +518,8 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); +HRESULT WINAPI MFEndRegisterWorkQueueWithMMCSS(IMFAsyncResult *result, DWORD *taskid); +HRESULT WINAPI MFEndUnregisterWorkQueueWithMMCSS(IMFAsyncResult *result); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); diff --git a/include/rtworkq.idl b/include/rtworkq.idl index ed32df1c3b..e7ff768074 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -93,9 +93,11 @@ cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") +cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);")

1 0

Nikolay Sivov : evr/presenter: Validate mixer's device id.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 93de829b13c6ff93bcdce510e1a90f17f5d88f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93de829b13c6ff93bcdce510… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:40 2020 +0300 evr/presenter: Validate mixer's device id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 55 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04e9a55684..4a7a4021c2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,41 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) +{ + IMFVideoDeviceID *device_id; + unsigned int count; + GUID id = { 0 }; + HRESULT hr; + + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) + { + WARN("Failed to get mixer interface, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(presenter->mixer, &IID_IMFVideoDeviceID, (void **)&device_id))) + { + if (SUCCEEDED(hr = IMFVideoDeviceID_GetDeviceID(device_id, &id))) + { + if (!IsEqualGUID(&id, &IID_IDirect3DDevice9)) + hr = MF_E_INVALIDREQUEST; + } + + IMFVideoDeviceID_Release(device_id); + } + + if (FAILED(hr)) + { + IMFTransform_Release(presenter->mixer); + presenter->mixer = NULL; + } + + return hr; +} + static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { @@ -384,20 +419,16 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClock, (void **)&presenter->clock, &count); - count = 1; - if (SUCCEEDED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) - { - /* FIXME: presumably should validate mixer's device id. */ - } - else - WARN("Failed to get mixer interface, hr %#x.\n", hr); + hr = video_presenter_attach_mixer(presenter, service_lookup); - count = 1; - if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + if (SUCCEEDED(hr)) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + { + WARN("Failed to get renderer event sink, hr %#x.\n", hr); + } } if (SUCCEEDED(hr))

1 0

Nikolay Sivov : mf: Implement MFCreateVideoRenderer().
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 6019f3c17989085ed0349edaade0c1c44e007e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6019f3c17989085ed0349eda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:41 2020 +0300 mf: Implement MFCreateVideoRenderer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 28 ++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 4 ++++ include/evr.idl | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 31bc110ea4..c5b2ceecd6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1388,3 +1388,31 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) return hr; } + +/*********************************************************************** + * MFCreateVideoRenderer (mf.@) + */ +HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer) +{ + IMFAttributes *attributes; + IUnknown *obj; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), renderer); + + *renderer = NULL; + + if (FAILED(hr = MFCreateAttributes(&attributes, 0))) + return hr; + + hr = evr_create_object(attributes, NULL, &obj); + IMFAttributes_Release(attributes); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(obj, riid, renderer); + IUnknown_Release(obj); + } + + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 4b5b085d08..2927d9f8a8 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -66,7 +66,7 @@ @ stub MFCreateTranscodeSinkActivate @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin -@ stub MFCreateVideoRenderer +@ stdcall MFCreateVideoRenderer(ptr ptr) @ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2c02b1d8e5..0bc297cc69 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3253,6 +3253,10 @@ static void test_evr(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + hr = MFCreateVideoRenderer(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = MFCreateVideoRendererActivate(NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 77c46a075f..c217883538 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -313,5 +313,6 @@ cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device cpp_quote("HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *presenter_outer, ") cpp_quote(" REFIID riid_mixer, void **mixer, REFIID riid_presenter, void **presenter);") cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **allocator);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);")

1 0

Nikolay Sivov : evr/presenter: Better validate input rectangles in SetVideoPosition().
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: a419b3eb79741adc9f6f22f84b71ed3e8ae19025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a419b3eb79741adc9f6f22f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:42 2020 +0300 evr/presenter: Better validate input rectangles in SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 10 +++++++++- dlls/evr/tests/evr.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 4a7a4021c2..babaca6885 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -510,7 +510,15 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo return E_POINTER; if (src_rect && (src_rect->left < 0.0f || src_rect->top < 0.0f || - src_rect->right > 1.0f || src_rect->bottom > 1.0f)) + src_rect->right > 1.0f || src_rect->bottom > 1.0f || + src_rect->left > src_rect->right || + src_rect->top > src_rect->bottom)) + { + return E_INVALIDARG; + } + + if (dst_rect && (dst_rect->left > dst_rect->right || + dst_rect->top > dst_rect->bottom)) return E_INVALIDARG; EnterCriticalSection(&presenter->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 48bf01a2ef..0436836963 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1111,6 +1111,21 @@ static void test_default_presenter(void) hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* Flipped source rectangle. */ + src_rect.left = 0.5f; + src_rect.top = 0.0f; + src_rect.right = 0.4f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = 0.0f; + src_rect.top = 0.5f; + src_rect.right = 0.4f; + src_rect.bottom = 0.1f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + src_rect.left = 0.1f; src_rect.top = 0.2f; src_rect.right = 0.8f; @@ -1123,6 +1138,15 @@ static void test_default_presenter(void) ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); + /* Flipped destination rectangle. */ + SetRect(&dst_rect, 100, 1, 50, 1000); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 100, 100, 50); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + SetRect(&dst_rect, 1, 2, 999, 1000); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Check video window in SetVideoPosition().
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: f859a4d0482aeb5dc1a2831ba4795b46184315e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f859a4d0482aeb5dc1a2831b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:43 2020 +0300 evr/presenter: Check video window in SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 16 ++- dlls/evr/tests/evr.c | 385 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 308 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f859a4d0482aeb5dc1a2…

1 0

Nikolay Sivov : evr/presenter: Set VIDEO_ZOOM_RECT on SetVideoPosition().
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 94b2db85b6ae695c91f2a7c872549bc6ebca19f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b2db85b6ae695c91f2a7c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:44 2020 +0300 evr/presenter: Set VIDEO_ZOOM_RECT on SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 37f4e67593..eceabfd381 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,25 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static void video_presenter_set_mixer_rect(struct video_presenter *presenter) +{ + IMFAttributes *attributes; + HRESULT hr; + + if (!presenter->mixer) + return; + + if (SUCCEEDED(IMFTransform_GetAttributes(presenter->mixer, &attributes))) + { + if (FAILED(hr = IMFAttributes_SetBlob(attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&presenter->src_rect, + sizeof(presenter->src_rect)))) + { + WARN("Failed to set zoom rectangle attribute, hr %#x.\n", hr); + } + IMFAttributes_Release(attributes); + } +} + static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; @@ -389,6 +408,8 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I presenter->mixer = NULL; } + video_presenter_set_mixer_rect(presenter); + return hr; } @@ -528,7 +549,13 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo else { if (src_rect) - presenter->src_rect = *src_rect; + { + if (memcmp(&presenter->src_rect, src_rect, sizeof(*src_rect))) + { + presenter->src_rect = *src_rect; + video_presenter_set_mixer_rect(presenter); + } + } if (dst_rect) presenter->dst_rect = *dst_rect; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 869af10b22..db9546a945 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1414,16 +1414,13 @@ static void test_presenter_video_position(void) hr = IMFAttributes_GetCount(mixer_attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected count %u.\n", count); memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); -} hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1505,11 +1502,10 @@ todo_wine { /* Presenter updates mixer attribute. */ memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); -} + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f &&

1 0

Sven Baars : shell32: Fix a leak on error path (Coverity).
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 2dac80524440bbae0ee0ef67c470bc0073b8bfaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dac80524440bbae0ee0ef67… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:23 2020 +0200 shell32: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a37b1bf588..48d5fe4ecb 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1251,7 +1251,10 @@ static HRESULT WINAPI ShellFolder2_GetDisplayNameOf(IShellFolder2* iface, LPWSTR pwszDosFileName = wine_get_dos_file_name(This->m_pszPath); if (!pwszDosFileName) return HRESULT_FROM_WIN32(GetLastError()); lpName->u.pOleStr = SHAlloc((lstrlenW(pwszDosFileName) + 1) * sizeof(WCHAR)); - if (!lpName->u.pOleStr) return HRESULT_FROM_WIN32(GetLastError()); + if (!lpName->u.pOleStr) { + heap_free(pwszDosFileName); + return HRESULT_FROM_WIN32(GetLastError()); + } lstrcpyW(lpName->u.pOleStr, pwszDosFileName); PathRemoveBackslashW(lpName->u.pOleStr); heap_free(pwszDosFileName);

1 0