November 2020 - Wine-commits

Alexandre Julliard : kernelbase: Copy MulDiv() implementation instead of forwarding.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: f46e239468d48cf984cb8dc6697be840345199db URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46e239468d48cf984cb8dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 13:18:53 2020 +0100 kernelbase: Copy MulDiv() implementation instead of forwarding. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index da35b5e5c6e..36d0492857f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -959,7 +959,7 @@ @ stdcall MoveFileExW(wstr wstr long) # @ stub MoveFileWithProgressTransactedW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) -@ stdcall MulDiv(long long long) kernel32.MulDiv +@ stdcall MulDiv(long long long) @ stdcall MultiByteToWideChar(long long str long ptr long) # @ stub NamedPipeEventEnum # @ stub NamedPipeEventSelect diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index e85586a0751..b90ee1cba2c 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -62,6 +62,32 @@ BOOL WINAPI DllMainCRTStartup( HANDLE inst, DWORD reason, LPVOID reserved ) } +/*********************************************************************** + * MulDiv (kernelbase.@) + */ +INT WINAPI MulDiv( INT a, INT b, INT c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + /*********************************************************************** * AppPolicyGetProcessTerminationMethod (KERNELBASE.@) */

1 0

Nikolay Sivov : dxva2: Add a semi-stub for VideoProcessBlt().
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 0824d408ba20ddbf30607e4d50ccb6a0c65f2fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0824d408ba20ddbf30607e4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:30:03 2020 +0300 dxva2: Add a semi-stub for VideoProcessBlt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 83c4723a7dc..341ee33d44d 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -218,13 +218,60 @@ static HRESULT WINAPI video_processor_GetFilterPropertyRange(IDirectXVideoProces return E_NOTIMPL; } +static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) +{ + if (IsRectEmpty(src1) || IsRectEmpty(src2) || + (src1->left >= src2->right) || (src2->left >= src1->right) || + (src1->top >= src2->bottom) || (src2->top >= src1->bottom)) + { + SetRectEmpty(dest); + return FALSE; + } + dest->left = max(src1->left, src2->left); + dest->right = min(src1->right, src2->right); + dest->top = max(src1->top, src2->top); + dest->bottom = min(src1->bottom, src2->bottom); + + return TRUE; +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) { - FIXME("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + IDirect3DDevice9 *device; + unsigned int i; + RECT dst_rect; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) + { + WARN("Failed to get surface device, hr %#x.\n", hr); + return hr; + } + + /* FIXME: use specified color */ + IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + + for (i = 0; i < sample_count; ++i) + { + dst_rect = params->TargetRect; + + if (!intersect_rect(&dst_rect, &dst_rect, &samples[i].DstRect)) + continue; + + if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect, + rt, &dst_rect, D3DTEXF_POINT))) + { + WARN("Failed to copy sample %u, hr %#x.\n", i, hr); + } + } + + IDirect3DDevice9_Release(device); + + return S_OK; } static const IDirectXVideoProcessorVtbl video_processor_vtbl =

1 0

Nikolay Sivov : evr/presenter: Add IQualProp stub.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: e19938f9db70015026fda73e202767a9ba8141f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19938f9db70015026fda73e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:31 2020 +0300 evr/presenter: Add IQualProp stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 88 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9bf4cda3725..c1f29d41e4e 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct video_presenter IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IQualProp IQualProp_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -137,6 +138,11 @@ static struct video_presenter *impl_from_IMFVideoSampleAllocatorNotify(IMFVideoS return CONTAINING_RECORD(iface, struct video_presenter, allocator_cb); } +static struct video_presenter *impl_from_IQualProp(IQualProp *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IQualProp_iface); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -444,6 +450,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IQualProp)) + { + *obj = &presenter->IQualProp_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -1285,6 +1295,79 @@ static const IMFVideoSampleAllocatorNotifyVtbl video_presenter_allocator_cb_vtbl video_presenter_allocator_cb_NotifyRelease, }; +static HRESULT WINAPI video_presenter_qualprop_QueryInterface(IQualProp *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_qualprop_AddRef(IQualProp *iface) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_qualprop_Release(IQualProp *iface) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_qualprop_get_FramesDroppedInRenderer(IQualProp *iface, int *frames) +{ + FIXME("%p, %p stub.\n", iface, frames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_FramesDrawn(IQualProp *iface, int *frames) +{ + FIXME("%p, %p stub.\n", iface, frames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_AvgFrameRate(IQualProp *iface, int *avg_frame_rate) +{ + FIXME("%p, %p stub.\n", iface, avg_frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_Jitter(IQualProp *iface, int *jitter) +{ + FIXME("%p, %p stub.\n", iface, jitter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_AvgSyncOffset(IQualProp *iface, int *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_DevSyncOffset(IQualProp *iface, int *devoffset) +{ + FIXME("%p, %p stub.\n", iface, devoffset); + + return E_NOTIMPL; +} + +static const IQualPropVtbl video_presenter_qualprop_vtbl = +{ + video_presenter_qualprop_QueryInterface, + video_presenter_qualprop_AddRef, + video_presenter_qualprop_Release, + video_presenter_qualprop_get_FramesDroppedInRenderer, + video_presenter_qualprop_get_FramesDrawn, + video_presenter_qualprop_get_AvgFrameRate, + video_presenter_qualprop_get_Jitter, + video_presenter_qualprop_get_AvgSyncOffset, + video_presenter_qualprop_get_DevSyncOffset, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1353,6 +1436,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; + object->IQualProp_iface.lpVtbl = &video_presenter_qualprop_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b8a16fc7cc9..bdf3154c7e5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1122,6 +1122,10 @@ static void test_default_presenter(void) if (FAILED(hr)) return; + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Nikolay Sivov : evr/presenter: Create a swapchain for given output window.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 02d982de3856bd1c98da34fb80085963f29aed05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d982de3856bd1c98da34fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:32 2020 +0300 evr/presenter: Create a swapchain for given output window. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 54 +++++++++++++++++++++- dlls/evr/tests/evr.c | 128 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d982de3856bd1c98da…

1 0

Nikolay Sivov : evr/presenter: Add IMFQualityAdvise stub.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: b6c01ee2f80db69c5b8c73fe125c9641552b21b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c01ee2f80db69c5b8c73fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:33 2020 +0300 evr/presenter: Add IMFQualityAdvise stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 62 +++++++++++++--------------------------- 2 files changed, 100 insertions(+), 42 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fc3a1b52c51..97b9029c70e 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -67,6 +67,7 @@ struct video_presenter IMFGetService IMFGetService_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; IQualProp IQualProp_iface; + IMFQualityAdvise IMFQualityAdvise_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -146,6 +147,11 @@ static struct video_presenter *impl_from_IQualProp(IQualProp *iface) return CONTAINING_RECORD(iface, struct video_presenter, IQualProp_iface); } +static struct video_presenter *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdvise_iface); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -470,6 +476,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IQualProp_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdvise)) + { + *obj = &presenter->IMFQualityAdvise_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -1418,6 +1428,75 @@ static const IQualPropVtbl video_presenter_qualprop_vtbl = video_presenter_qualprop_get_DevSyncOffset, }; +static HRESULT WINAPI video_presenter_quality_advise_QueryInterface(IMFQualityAdvise *iface, REFIID riid, void **out) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdvise(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, out); +} + +static ULONG WINAPI video_presenter_quality_advise_AddRef(IMFQualityAdvise *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdvise(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_quality_advise_Release(IMFQualityAdvise *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdvise(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_quality_advise_SetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE mode) +{ + FIXME("%p, %u.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_quality_advise_SetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL level) +{ + FIXME("%p, %u.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_quality_advise_GetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_quality_advise_GetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_quality_advise_DropTime(IMFQualityAdvise *iface, LONGLONG interval) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(interval)); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseVtbl video_presenter_quality_advise_vtbl = +{ + video_presenter_quality_advise_QueryInterface, + video_presenter_quality_advise_AddRef, + video_presenter_quality_advise_Release, + video_presenter_quality_advise_SetDropMode, + video_presenter_quality_advise_SetQualityLevel, + video_presenter_quality_advise_GetDropMode, + video_presenter_quality_advise_GetQualityLevel, + video_presenter_quality_advise_DropTime, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1487,6 +1566,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; object->IQualProp_iface.lpVtbl = &video_presenter_qualprop_vtbl; + object->IMFQualityAdvise_iface.lpVtbl = &video_presenter_quality_advise_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d4c2ffb0480..882d61b9d37 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -461,17 +461,16 @@ static void test_default_mixer(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); - hr = IMFTransform_QueryInterface(transform, &IID_IMFQualityAdvise, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFClockStateSink, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(transform, &IID_IMFQualityAdvise, TRUE); + check_interface(transform, &IID_IMFClockStateSink, TRUE); + check_interface(transform, &IID_IMFTopologyServiceLookupClient, TRUE); + check_interface(transform, &IID_IMFGetService, TRUE); + check_interface(transform, &IID_IMFAttributes, TRUE); + check_interface(transform, &IID_IMFVideoMixerBitmap, TRUE); + check_interface(transform, &IID_IMFVideoPositionMapper, TRUE); + check_interface(transform, &IID_IMFVideoProcessor, TRUE); + check_interface(transform, &IID_IMFVideoMixerControl, TRUE); + check_interface(transform, &IID_IMFVideoDeviceID, TRUE); hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -534,22 +533,6 @@ todo_wine IMFGetService_Release(gs); - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - hr = IMFTransform_SetOutputBounds(transform, 100, 10); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1117,13 +1100,16 @@ static void test_default_presenter(void) if (FAILED(hr)) return; - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoPositionMapper, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(presenter, &IID_IQualProp, TRUE); + check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); + check_interface(presenter, &IID_IMFTopologyServiceLookupClient, TRUE); + check_interface(presenter, &IID_IMFVideoDisplayControl, TRUE); + check_interface(presenter, &IID_IMFRateSupport, TRUE); + check_interface(presenter, &IID_IMFGetService, TRUE); + check_interface(presenter, &IID_IMFClockStateSink, TRUE); + check_interface(presenter, &IID_IMFVideoPresenter, TRUE); + check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); + check_interface(presenter, &IID_IMFQualityAdvise, TRUE); hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1141,14 +1127,6 @@ static void test_default_presenter(void) IMFVideoDeviceID_Release(deviceid); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Fix method function name for consistency.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 8b9b16151df2c5f36fb7d6c51ef282349fac210b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9b16151df2c5f36fb7d6c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:34 2020 +0300 evr/mixer: Fix method function name for consistency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 8eba3e3611b..66cb9b021a7 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -2207,7 +2207,7 @@ static ULONG WINAPI video_mixer_quality_advise_AddRef(IMFQualityAdvise *iface) return IMFTransform_AddRef(&mixer->IMFTransform_iface); } -static ULONG WINAPI video_mixer_quality_Release(IMFQualityAdvise *iface) +static ULONG WINAPI video_mixer_quality_advise_Release(IMFQualityAdvise *iface) { struct video_mixer *mixer = impl_from_IMFQualityAdvise(iface); return IMFTransform_Release(&mixer->IMFTransform_iface); @@ -2252,7 +2252,7 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = { video_mixer_quality_advise_QueryInterface, video_mixer_quality_advise_AddRef, - video_mixer_quality_Release, + video_mixer_quality_advise_Release, video_mixer_quality_advise_SetDropMode, video_mixer_quality_advise_SetQualityLevel, video_mixer_quality_advise_GetDropMode,

1 0

Nikolay Sivov : mf/tests: Use a helper for supported intefaces checks.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 71e13d44f9b581a7995e22283f67e4601a7e59cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e13d44f9b581a7995e2228… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:35 2020 +0300 mf/tests: Use a helper for supported intefaces checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 80 +++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 46 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9eccafee633..bd38785ea51 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -56,6 +56,21 @@ static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) expected_refcount); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -1028,7 +1043,6 @@ static void test_MFGetService(void) static void test_sequencer_source(void) { - IMFMediaSourceTopologyProvider *provider; IMFSequencerSource *seq_source; HRESULT hr; @@ -1038,9 +1052,7 @@ static void test_sequencer_source(void) hr = MFCreateSequencerSource(NULL, &seq_source); ok(hr == S_OK, "Failed to create sequencer source, hr %#x.\n", hr); - hr = IMFSequencerSource_QueryInterface(seq_source, &IID_IMFMediaSourceTopologyProvider, (void **)&provider); - ok(hr == S_OK, "Failed to get provider interface, hr %#x.\n", hr); - IMFMediaSourceTopologyProvider_Release(provider); + check_interface(seq_source, &IID_IMFMediaSourceTopologyProvider, TRUE); IMFSequencerSource_Release(seq_source); @@ -1743,7 +1755,6 @@ static void test_presentation_clock(void) MFTIME systime, time; LONGLONG clock_time; MFCLOCK_STATE state; - IMFTimer *timer; unsigned int i; DWORD value; float rate; @@ -1756,6 +1767,12 @@ static void test_presentation_clock(void) hr = MFCreatePresentationClock(&clock); ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFTimer, TRUE); + check_interface(clock, &IID_IMFRateControl, TRUE); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + check_interface(clock, &IID_IMFShutdown, TRUE); + check_interface(clock, &IID_IMFClock, TRUE); + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); @@ -1945,10 +1962,6 @@ static void test_presentation_clock(void) IMFRateControl_Release(rate_control); - hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFTimer, (void **)&timer); - ok(hr == S_OK, "Failed to get timer interface, hr %#x.\n", hr); - IMFTimer_Release(timer); - hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); ok(hr == S_OK, "Failed to get shutdown interface, hr %#x.\n", hr); @@ -2084,7 +2097,6 @@ static void test_sample_grabber(void) IMFPresentationTimeSource *time_source; IMFPresentationClock *clock, *clock2; IMFStreamSink *stream, *stream2; - IMFClockStateSink *clocksink; IMFMediaEventGenerator *eg; IMFMediaSink *sink, *sink2; DWORD flags, count, id; @@ -2135,9 +2147,7 @@ static void test_sample_grabber(void) hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); - hr = IMFStreamSink_QueryInterface(stream, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(stream, &IID_IMFMediaEventGenerator, TRUE); hr = IMFStreamSink_GetIdentifier(stream, &id); ok(hr == S_OK, "Failed to get stream id, hr %#x.\n", hr); @@ -2163,9 +2173,7 @@ static void test_sample_grabber(void) hr = IMFMediaSink_RemoveStreamSink(sink, 1); ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clocksink); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IMFClockStateSink_Release(clocksink); + check_interface(sink, &IID_IMFClockStateSink, TRUE); /* Event generator. */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); @@ -2915,14 +2923,9 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL), "Unexpected flags %#x.\n", flags); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&unk); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); - - /* Events */ - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(sink, &IID_IMFMediaSinkPreroll, TRUE); + check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(sink, &IID_IMFClockStateSink, TRUE); /* Clock */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink); @@ -2971,9 +2974,7 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); ok(hr == S_OK, "Failed to get a stream, hr %#x.\n", hr); - hr = IMFStreamSink_QueryInterface(stream_sink, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(stream_sink, &IID_IMFMediaEventGenerator, TRUE); hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3236,12 +3237,9 @@ static void test_evr(void) IMFStreamSink *stream_sink, *stream_sink2; IMFVideoDisplayControl *display_control; IMFMediaType *media_type, *media_type2; - IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; IMFMediaTypeHandler *type_handler; IMFVideoRenderer *video_renderer; - IMFClockStateSink *clock_sink; - IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFAttributes *attributes; IMFActivate *activate; @@ -3281,6 +3279,12 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + check_interface(sink, &IID_IMFMediaSinkPreroll, TRUE); + check_interface(sink, &IID_IMFVideoRenderer, TRUE); + check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(sink, &IID_IMFClockStateSink, TRUE); + check_interface(sink, &IID_IMFGetService, TRUE); + hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3443,22 +3447,6 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&preroll); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaSinkPreroll_Release(preroll); - - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&video_renderer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoRenderer_Release(video_renderer); - - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&ev_generator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaEventGenerator_Release(ev_generator); - - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clock_sink); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFClockStateSink_Release(clock_sink); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Add IMFQualityAdvise stub.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: f3b0fc6ae016c462870ffd4f4e62ff2868d184c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b0fc6ae016c462870ffd4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:36 2020 +0300 mf/evr: Add IMFQualityAdvise stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 1 + 2 files changed, 81 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index f14f2f46612..8fa4e33f4e3 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -76,6 +76,7 @@ struct video_renderer IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; IMediaEventSink IMediaEventSink_iface; IMFAttributes IMFAttributes_iface; + IMFQualityAdvise IMFQualityAdvise_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -141,6 +142,11 @@ static struct video_renderer *impl_from_IMFAttributes(IMFAttributes *iface) return CONTAINING_RECORD(iface, struct video_renderer, IMFAttributes_iface); } +static struct video_renderer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFQualityAdvise_iface); +} + static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); @@ -657,6 +663,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFAttributes_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdvise)) + { + *obj = &renderer->IMFQualityAdvise_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2120,6 +2130,75 @@ static const IMFAttributesVtbl video_renderer_attributes_vtbl = video_renderer_attributes_CopyAllItems, }; +static HRESULT WINAPI video_renderer_quality_advise_QueryInterface(IMFQualityAdvise *iface, REFIID riid, void **out) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, out); +} + +static ULONG WINAPI video_renderer_quality_advise_AddRef(IMFQualityAdvise *iface) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_quality_Release(IMFQualityAdvise *iface) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_quality_advise_SetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE mode) +{ + FIXME("%p, %u.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_SetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL level) +{ + FIXME("%p, %u.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_GetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_GetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_DropTime(IMFQualityAdvise *iface, LONGLONG interval) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(interval)); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseVtbl video_renderer_quality_advise_vtbl = +{ + video_renderer_quality_advise_QueryInterface, + video_renderer_quality_advise_AddRef, + video_renderer_quality_Release, + video_renderer_quality_advise_SetDropMode, + video_renderer_quality_advise_SetQualityLevel, + video_renderer_quality_advise_GetDropMode, + video_renderer_quality_advise_GetQualityLevel, + video_renderer_quality_advise_DropTime, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -2141,6 +2220,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFTopologyServiceLookup_iface.lpVtbl = &video_renderer_service_lookup_vtbl; object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; object->IMFAttributes_iface.lpVtbl = &video_renderer_attributes_vtbl; + object->IMFQualityAdvise_iface.lpVtbl = &video_renderer_quality_advise_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bd38785ea51..43dc9a49ee7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3284,6 +3284,7 @@ static void test_evr(void) check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); + check_interface(sink, &IID_IMFQualityAdvise, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control);

1 0

Nikolay Sivov : mfplat/buffer: Fix byte width set for d3d9 surface buffers.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: ed1dd4990e7318290cad7ea2810a4f30eef83188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1dd4990e7318290cad7ea2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:34:18 2020 +0300 mfplat/buffer: Fix byte width set for d3d9 surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 3d1d2abdf88..b47d2a9ba16 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -941,6 +941,18 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF { struct memory_buffer *object; D3DSURFACE_DESC desc; + unsigned int stride; + GUID subtype; + BOOL is_yuv; + + IDirect3DSurface9_GetDesc((IDirect3DSurface9 *)surface, &desc); + TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = desc.Format; + + if (!(stride = mf_format_get_stride(&subtype, desc.Width, &is_yuv))) + return MF_E_INVALIDMEDIATYPE; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -954,11 +966,8 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF object->d3d9_surface.surface = (IDirect3DSurface9 *)surface; IUnknown_AddRef(surface); - IDirect3DSurface9_GetDesc(object->d3d9_surface.surface, &desc); - TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); - MFGetPlaneSize(desc.Format, desc.Width, desc.Height, &object->_2d.plane_size); - object->_2d.width = desc.Width; + object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size;

1 0

Paul Gofman : ws2_32: Force adding completion for error status in WS2_ConnectEx().
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 2793bdeb2694b5dc15883773cbabe0300990ffc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2793bdeb2694b5dc15883773… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 13 22:05:52 2020 +0300 ws2_32: Force adding completion for error status in WS2_ConnectEx(). Fixes Paradox launcher hang on start (which happens after commit 0c2f556afe7b5fcc873c737512fae5b9c8c07624). The referenced commit did not introduce the problem, it just made getsockopt(..., WS_SO_PROTOCOL_INFOW, ) working and the application is taking another path after getting XP1_IFS_HANDLES flag for protocol. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..7d810c6d7b2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3485,7 +3485,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = sock_error_to_ntstatus( get_sock_error( s, FD_CONNECT_BIT )); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, TRUE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9357ad0d872..2d69a05aec5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7182,11 +7182,13 @@ static void test_ConnectEx(void) SOCKET connector = INVALID_SOCKET; struct sockaddr_in address, conaddress; int addrlen; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; + HANDLE previous_port, io_port; DWORD bytesReturned; char buffer[1024]; + ULONG_PTR key; BOOL bret; DWORD dwret; int iret; @@ -7305,18 +7307,39 @@ static void test_ConnectEx(void) address.sin_port = htons(1); + previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + bytesReturned = 0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &bytesReturned, &key, &olp, 200 ); + ok(!bret && GetLastError() == ERROR_CONNECTION_REFUSED, "Got unexpected bret %#x, GetLastError() %u.\n", + bret, GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(!bytesReturned, "Number of bytes transferred is %u\n", bytesReturned); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + CloseHandle(io_port); + WSACloseEvent(overlapped.hEvent); closesocket(connector); + + CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -10557,7 +10580,6 @@ START_TEST( sock ) test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); - test_completion_port(); test_address_list_query();

1 0