December 2019 - Wine-Commits

Zebediah Figura : strmbase: Combine the SetMediaType() and CompleteConnect() callbacks.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 264c539ed6180216300e28be1b68aaebc102e5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264c539ed6180216300e28be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 10:35:11 2019 -0600 strmbase: Combine the SetMediaType() and CompleteConnect() callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 115 +++++++++--------------------- dlls/quartz/avidec.c | 37 +++------- dlls/strmbase/transform.c | 7 +- dlls/winegstreamer/gsttffilter.c | 146 ++++++++++++++------------------------- dlls/wineqtdecoder/qtvdecoder.c | 25 ++----- include/wine/strmbase.h | 5 +- 6 files changed, 103 insertions(+), 232 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=264c539ed6180216300e…

1 0

Francois Gouget : msvcrt/tests: Avoid an unneeded strlen() call.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 92d31164aa6d467e2afde7e71446d110d5fdc73f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d31164aa6d467e2afde7e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:28:43 2019 +0100 msvcrt/tests: Avoid an unneeded strlen() call. Note that buf is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index c59464f82d..7e2a7e4069 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -211,7 +211,7 @@ static void test_strerror_s(void) memset(buf, 'X', sizeof(buf)); ret = pstrerror_s(buf, 1, 0); ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); - ok(strlen(buf) == 0, "Expected output buffer to be null terminated\n"); + ok(buf[0] == 0, "Expected output buffer to be null terminated\n"); memset(buf, 'X', sizeof(buf)); ret = pstrerror_s(buf, 2, 0);

1 0

Zebediah Figura : strmbase/transform: Use base sink connection methods.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 67a6af77b52da04cb3cfa651dc0a19b3ec88e9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a6af77b52da04cb3cfa651… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 10:35:14 2019 -0600 strmbase/transform: Use base sink connection methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 56 ++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index bf74ad0f49..993e30202b 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -212,12 +212,31 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void return S_OK; } +static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); + + if (filter->pFuncsTable->transform_connect_sink) + return filter->pFuncsTable->transform_connect_sink(filter, mt); + return S_OK; +} + +static void sink_disconnect(struct strmbase_sink *iface) +{ + TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); + + if (filter->pFuncsTable->pfnBreakConnect) + filter->pFuncsTable->pfnBreakConnect(filter, PINDIR_INPUT); +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_query_interface = sink_query_interface, .pfnReceive = TransformFilter_Input_Receive, + .sink_connect = sink_connect, + .sink_disconnect = sink_disconnect, }; static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -397,39 +416,6 @@ static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) return VFW_E_NOT_CONNECTED; } -static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) -{ - TransformFilter *pTransform = impl_from_sink_IPin(iface); - HRESULT hr = S_OK; - - TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); - strmbase_dump_media_type(pmt); - - if (pTransform->pFuncsTable->transform_connect_sink) - hr = pTransform->pFuncsTable->transform_connect_sink(pTransform, pmt); - - if (SUCCEEDED(hr)) - { - hr = BaseInputPinImpl_ReceiveConnection(iface, pReceivePin, pmt); - if (FAILED(hr) && pTransform->pFuncsTable->pfnBreakConnect) - pTransform->pFuncsTable->pfnBreakConnect(pTransform, PINDIR_INPUT); - } - - return hr; -} - -static HRESULT WINAPI TransformFilter_InputPin_Disconnect(IPin * iface) -{ - TransformFilter *pTransform = impl_from_sink_IPin(iface); - - TRACE("(%p)->()\n", iface); - - if (pTransform->pFuncsTable->pfnBreakConnect) - pTransform->pFuncsTable->pfnBreakConnect(pTransform, PINDIR_INPUT); - - return BaseInputPinImpl_Disconnect(iface); -} - static HRESULT WINAPI TransformFilter_InputPin_BeginFlush(IPin * iface) { TransformFilter *pTransform = impl_from_sink_IPin(iface); @@ -483,8 +469,8 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - TransformFilter_InputPin_ReceiveConnection, - TransformFilter_InputPin_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo,

1 0

Francois Gouget : jscript: Fix the spelling of a couple of comments.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 72a7d945860e2aff861a0f16c19046c816c6d255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a7d945860e2aff861a0f16… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:23:50 2019 +0100 jscript: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a36c9c1e5b..97d069aff7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -672,13 +672,13 @@ static INT32 double_to_int32(double number) * after rounding; if the exponent is > 83 then no bits of precision can be * left in the low 32-bit range of the result (IEEE-754 doubles have 52 bits * of fractional precision). - * Note this case handles 0, -0, and all infinte, NaN, & denormal value. */ + * Note this case handles 0, -0, and all infinite, NaN & denormal values. */ if(exp < 0 || exp > 83) return 0; /* Select the appropriate 32-bits from the floating point mantissa. If the * exponent is 52 then the bits we need to select are already aligned to the - * lowest bits of the 64-bit integer representation of tghe number, no need + * lowest bits of the 64-bit integer representation of the number, no need * to shift. If the exponent is greater than 52 we need to shift the value * left by (exp - 52), if the value is less than 52 we need to shift right * accordingly. */

1 0

Francois Gouget : qcap/tests: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 194851e560c7c4ff5da7fe6b00e5a511ed662bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194851e560c7c4ff5da7fe6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:29:03 2019 +0100 qcap/tests: Avoid an unneeded lstrlenW() call. Note that achName is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 4eac344d53..014c6ee2d1 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2078,7 +2078,7 @@ static void test_smart_tee_filter(void) if (FAILED(hr)) goto end; - ok(lstrlenW(filterInfo.achName) == 0, + ok(!*filterInfo.achName, "filter's name is meant to be empty but it's %s\n", wine_dbgstr_w(filterInfo.achName)); hr = IBaseFilter_EnumPins(smartTeeFilter, &enumPins);

1 0

Francois Gouget : winecfg: Avoid an unneeded strlen() call.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 81d5d929ba5e5c570274173ebdc06892b54fa5bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d5d929ba5e5c570274173e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:36:31 2019 +0100 winecfg: Avoid an unneeded strlen() call. Note that szLinkTarget is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 66d23448f6..dffe1861e8 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -842,7 +842,7 @@ static void on_shell_folder_selection_changed(HWND hDlg, LPNMLISTVIEW lpnm) { if (lpnm->uNewState & LVIS_SELECTED) { psfiSelected = (struct ShellFolderInfo *)lpnm->lParam; EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 1); - if (strlen(psfiSelected->szLinkTarget)) { + if (*psfiSelected->szLinkTarget) { WCHAR *link; CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_CHECKED); EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 1);

1 0

Francois Gouget : ws2_32/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: c52c3d5a367ba8d1069991856fbcefc0965a91fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52c3d5a367ba8d106999185… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:30:01 2019 +0100 ws2_32/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e4b57cfdda..cd97aae4bb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6611,7 +6611,7 @@ static void test_WSASendMsg(void) ok(!ret, "WSASendMsg should have worked\n"); ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, "Expected 0, got %d\n", GetLastError()); - ok(bytesSent == iovec[0].len, "incorret bytes sent, expected %d, sent %d\n", + ok(bytesSent == iovec[0].len, "incorrect bytes sent, expected %d, sent %d\n", iovec[0].len, bytesSent); /* receive data */ @@ -6639,7 +6639,7 @@ static void test_WSASendMsg(void) SetLastError(0xdeadbeef); ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(!ret, "WSASendMsg should have worked\n"); - ok(bytesSent == iovec[0].len + iovec[1].len, "incorret bytes sent, expected %d, sent %d\n", + ok(bytesSent == iovec[0].len + iovec[1].len, "incorrect bytes sent, expected %d, sent %d\n", iovec[0].len + iovec[1].len, bytesSent); ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, "Expected 0, got %d\n", GetLastError());

1 0

Zebediah Figura : strmbase/renderer: Use base sink connection methods.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 7f57286d73e2881f8df39c39b41952e498070ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f57286d73e2881f8df39c39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 10:35:15 2019 -0600 strmbase/renderer: Use base sink connection methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 21 ++++++++++------ dlls/quartz/vmr9.c | 8 +++--- dlls/strmbase/renderer.c | 63 ++++++++++++++++-------------------------------- 4 files changed, 40 insertions(+), 54 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index dae86bd3fa..4a971dcdc1 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1392,7 +1392,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(source.source.pin.peer == pin, "Got peer %p.\n", peer); IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 5ece5c6f7b..241394277b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -901,7 +901,8 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); + todo_wine_if (((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader.biBitCount == 24) + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mt); @@ -1315,13 +1316,17 @@ static void test_connect_pin(void) skip("Got E_FAIL when connecting.\n"); goto out; } - ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, - wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); + todo_wine_if (bpp_tests[j] == 24) + ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, + wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); - hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IFilterGraph2_Disconnect(graph, pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } } } @@ -1391,7 +1396,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(source.source.pin.peer == pin, "Got peer %p.\n", source.source.pin.peer); IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a9b90b322d..a3391870a7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -356,7 +356,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) HRESULT hr; TRACE("my mode: %u, my window: %p, my last window: %p\n", This->mode, This->baseControlWindow.baseWindow.hWnd, This->hWndClippingWindow); - if (This->num_surfaces || !This->renderer.sink.pin.peer) + if (This->num_surfaces) return S_OK; if (This->mode == VMR9Mode_Windowless && !This->hWndClippingWindow) @@ -410,7 +410,8 @@ static void vmr_start_stream(struct strmbase_renderer *iface) TRACE("(%p)\n", This); - VMR9_maybe_init(This, TRUE); + if (This->renderer.sink.pin.peer) + VMR9_maybe_init(This, TRUE); IVMRImagePresenter9_StartPresenting(This->presenter, This->cookie); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, This->source_rect.left, @@ -1760,7 +1761,8 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles EnterCriticalSection(&This->renderer.filter.csFilter); This->hWndClippingWindow = hwnd; - VMR9_maybe_init(This, FALSE); + if (This->renderer.sink.pin.peer) + VMR9_maybe_init(This, FALSE); if (!hwnd) IVMRSurfaceAllocatorEx9_TerminateDevice(This->allocator, This->cookie); LeaveCriticalSection(&This->renderer.filter.csFilter); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7d8dbdfa93..7b9736ccfb 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -40,46 +40,6 @@ static inline struct strmbase_renderer *impl_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct strmbase_renderer, sink.pin.IPin_iface); } -static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) -{ - struct strmbase_renderer *filter = impl_from_IPin(iface); - HRESULT hr; - - TRACE("iface %p, peer %p, mt %p.\n", iface, peer, mt); - strmbase_dump_media_type(mt); - - EnterCriticalSection(&filter->filter.csFilter); - hr = BaseInputPinImpl_ReceiveConnection(iface, peer, mt); - if (SUCCEEDED(hr)) - { - if (filter->pFuncsTable->renderer_connect) - hr = filter->pFuncsTable->renderer_connect(filter, mt); - } - LeaveCriticalSection(&filter->filter.csFilter); - - return hr; -} - -static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) -{ - struct strmbase_renderer *filter = impl_from_IPin(iface); - HRESULT hr; - - TRACE("iface %p.\n", iface); - - EnterCriticalSection(&filter->filter.csFilter); - hr = BaseInputPinImpl_Disconnect(iface); - if (SUCCEEDED(hr)) - { - if (filter->pFuncsTable->pfnBreakConnect) - hr = filter->pFuncsTable->pfnBreakConnect(filter); - } - BaseRendererImpl_ClearPendingSample(filter); - LeaveCriticalSection(&filter->filter.csFilter); - - return hr; -} - static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { struct strmbase_renderer *filter = impl_from_IPin(iface); @@ -157,8 +117,8 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - BaseRenderer_InputPin_ReceiveConnection, - BaseRenderer_InputPin_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, @@ -312,12 +272,31 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp return BaseRendererImpl_Receive(filter, sample); } +static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); + + if (filter->pFuncsTable->renderer_connect) + return filter->pFuncsTable->renderer_connect(filter, mt); + return S_OK; +} + +static void sink_disconnect(struct strmbase_sink *iface) +{ + struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); + + if (filter->pFuncsTable->pfnBreakConnect) + filter->pFuncsTable->pfnBreakConnect(filter); +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, + .sink_connect = sink_connect, + .sink_disconnect = sink_disconnect, }; void strmbase_renderer_cleanup(struct strmbase_renderer *filter)

1 0

Nikolay Sivov : oleaut32/tests: Add some more tests for GetRefTypeInfo() in case of dual interface.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 4b49875ec132a231197147272ce45cfa3702fd84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b49875ec132a23119714727… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 10 16:49:06 2019 +0300 oleaut32/tests: Add some more tests for GetRefTypeInfo() in case of dual interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0b2920dfe0..4ffbaa9e2d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -76,6 +76,15 @@ #define ARCH "none" #endif +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); @@ -1846,6 +1855,7 @@ static void test_CreateTypeLib(SYSKIND sys) { static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID interface2guid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcd}}; + ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti, *ti_2; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; @@ -1853,7 +1863,6 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeLib2 *tl2; - ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; ITypeComp *tcomp, *tcomp2; @@ -2829,8 +2838,11 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == -2, "got %08x\n", hreftype); + EXPECT_REF(dual, 2); hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti); ok(hres == S_OK, "got %08x\n", hres); +todo_wine + EXPECT_REF(dual, 3); hres = ITypeInfo_GetTypeAttr(ti, &typeattr); ok(hres == S_OK, "got %08x\n", hres); @@ -2847,6 +2859,18 @@ static void test_CreateTypeLib(SYSKIND sys) { ITypeInfo_ReleaseTypeAttr(ti, typeattr); + hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti_2); + ok(hres == S_OK, "Failed to get reference typeinfo, hr %#x.\n", hres); +todo_wine { + ok(ti == ti_2, "Unexpected typeinfo instance.\n"); + EXPECT_REF(dual, 4); +} + ITypeInfo_AddRef(ti_2); +todo_wine + EXPECT_REF(dual, 5); + ITypeInfo_Release(ti_2); + + ITypeInfo_Release(ti_2); ITypeInfo_Release(ti); hres = ICreateTypeInfo_SetTypeDescAlias(createti, &typedesc1);

1 0

Nikolay Sivov : oleaut32/tests: Use TYPEKIND values.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: d9911e3631ead6ad7551dbb41c04445294ee5d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9911e3631ead6ad7551dbb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 10 16:49:05 2019 +0300 oleaut32/tests: Use TYPEKIND values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 053011d4be..0b2920dfe0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2813,7 +2813,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(dual, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 1, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2835,7 +2835,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(ti, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 4, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_DISPATCH, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2857,7 +2857,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 13, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2872,7 +2872,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(interface2, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 2, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes);

1 0