September 2018 - Wine-commits

Józef Kucia : wined3d: Allocate memory for formats in wined3d_adapter_init_format_info().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 6d543d237cb4cc44fc703b092509716c2f5a4343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d543d237cb4cc44fc703b09… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 20 09:02:01 2018 +0200 wined3d: Allocate memory for formats in wined3d_adapter_init_format_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9627b13..bf32953 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1994,23 +1994,15 @@ static enum wined3d_channel_type map_channel_type(char t) } } -static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format_size) +static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i, j; - adapter->format_size = format_size; - if (!(adapter->formats = heap_calloc(WINED3D_FORMAT_COUNT - + ARRAY_SIZE(typeless_depth_stencil_formats), adapter->format_size))) - { - ERR("Failed to allocate memory.\n"); - return FALSE; - } - for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (!(format = get_format_internal(adapter, formats[i].id))) - goto fail; + return FALSE; format->id = formats[i].id; format->red_size = formats[i].red_size; @@ -2036,10 +2028,10 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format DWORD flags = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) - goto fail; + return FALSE; if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) - goto fail; + return FALSE; format->id = typed_formats[i].id; format->red_size = typeless_format->red_size; @@ -2087,7 +2079,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i) { if (!(format = get_format_internal(adapter, ddi_formats[i].id))) - goto fail; + return FALSE; format->ddi_format = ddi_formats[i].ddi_format; } @@ -2095,16 +2087,12 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format for (i = 0; i < ARRAY_SIZE(format_base_flags); ++i) { if (!(format = get_format_internal(adapter, format_base_flags[i].id))) - goto fail; + return FALSE; format_set_flag(format, format_base_flags[i].flags); } return TRUE; - -fail: - heap_free(adapter->formats); - return FALSE; } static BOOL init_format_block_info(struct wined3d_adapter *adapter) @@ -3951,9 +3939,21 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { - if (!init_format_base_info(adapter, format_size)) return FALSE; - if (!init_format_block_info(adapter)) goto fail; - if (!init_format_decompress_info(adapter)) goto fail; + unsigned int count = WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats); + + if (!(adapter->formats = heap_calloc(count, format_size))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + adapter->format_size = format_size; + + if (!init_format_base_info(adapter)) + goto fail; + if (!init_format_block_info(adapter)) + goto fail; + if (!init_format_decompress_info(adapter)) + goto fail; return TRUE;

1 0

Józef Kucia : wined3d: Store max_clip_distances in struct d3d_info.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: d3da2400e6faa25fb64aab1112c8e886a5d2cbd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3da2400e6faa25fb64aab11… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 20 09:02:02 2018 +0200 wined3d: Store max_clip_distances in struct d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9c074d3..0ee71fd 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3651,6 +3651,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); d3d_info->limits.max_rt_count = gl_info->limits.buffers; + d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96e7a3d..3fc3ae5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1762,7 +1762,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; @@ -1790,7 +1790,7 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a501da1..637c721 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -165,6 +165,7 @@ struct wined3d_d3d_limits unsigned int active_light_count; unsigned int max_rt_count; + unsigned int max_clip_distances; float pointsize_max; };

1 0

Jacek Caban : user32: Make sure that passed window handle is scroll control before accessing wExtra in SCROLL_GetInternalInfo.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: b8ef42c9fd165da5c31d8f68f2ae39b77e9101f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ef42c9fd165da5c31d8f68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 20 16:48:55 2018 +0200 user32: Make sure that passed window handle is scroll control before accessing wExtra in SCROLL_GetInternalInfo. Fixes memory corruption in Office 2016. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 3 ++- dlls/user32/tests/scroll.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 1c127fb..30a0cd9 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -159,7 +159,8 @@ static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->vert; break; case SB_CTL: - infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra; + if (get_class_winproc( wndPtr->class ) == BUILTIN_WINPROC( WINPROC_SCROLLBAR )) + infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra; break; case SB_BOTH: WARN("with SB_BOTH\n"); diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 291d11a..c19607d 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,6 +114,14 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + SetLastError( 0xdeadbeef ); + ret = EnableScrollBar( mainwnd, SB_CTL, ESB_ENABLE_BOTH ); + ok( !ret, "EnableScrollBar should fail.\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER + || broken(GetLastError() == 0xdeadbeef), /* winxp */ + "GetLastError() = %u\n", GetLastError() ); + /* disable window, try to re-enable */ ret = EnableWindow( hScroll, FALSE ); ok( !ret, "got %d\n", ret ); @@ -170,6 +178,16 @@ static void test_SetScrollPos(void) ret = GetScrollPos( hScroll, SB_CTL); ok( ret == 30, "The position should not be equal to zero\n"); + SetLastError( 0xdeadbeef ); + ret = SetScrollPos( mainwnd, SB_CTL, 30, TRUE ); + ok( !ret, "The position should not be set.\n" ); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = GetScrollPos( mainwnd, SB_CTL ); + ok( !ret, "The position should be equal to zero\n"); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %u\n", GetLastError() ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } @@ -192,6 +210,9 @@ static void test_ShowScrollBar(void) ret = ShowScrollBar( NULL, SB_CTL, TRUE ); ok( !ret, "The ShowScrollBar() should failed.\n" ); + ret = ShowScrollBar( mainwnd, SB_CTL, TRUE ); + ok( ret, "The ShowScrollBar() should not fail.\n" ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); }

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_ConnectDirect() and IFilterGraph_Disconnect().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 54843d8fbfd2bd6d8501bf8d7bbebdc4b2808fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54843d8fbfd2bd6d8501bf8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:16 2018 -0500 quartz/tests: Add some tests for IFilterGraph_ConnectDirect() and IFilterGraph_Disconnect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 184 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 168 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5035f80..b1059ca 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -767,6 +767,7 @@ struct testpin PIN_DIRECTION dir; IBaseFilter *filter; IPin *peer; + AM_MEDIA_TYPE *mt; IEnumMediaTypes IEnumMediaTypes_iface; const AM_MEDIA_TYPE *types; @@ -991,7 +992,19 @@ static HRESULT WINAPI testpin_EndOfStream(IPin *iface) return E_NOTIMPL; } -static HRESULT WINAPI testsink_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI no_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI no_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI no_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) { ok(0, "Unexpected call.\n"); return E_NOTIMPL; @@ -1007,18 +1020,12 @@ static HRESULT WINAPI testsink_ReceiveConnection(IPin *iface, IPin *peer, const return S_OK; } -static HRESULT WINAPI testsink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) -{ - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; -} - static const IPinVtbl testsink_vtbl = { testpin_QueryInterface, testpin_AddRef, testpin_Release, - testsink_Connect, + no_Connect, testsink_ReceiveConnection, testpin_Disconnect, testpin_ConnectedTo, @@ -1027,7 +1034,7 @@ static const IPinVtbl testsink_vtbl = testpin_QueryDirection, testpin_QueryId, testpin_QueryAccept, - testsink_EnumMediaTypes, + no_EnumMediaTypes, testpin_QueryInternalConnections, testpin_EndOfStream, testpin_BeginFlush, @@ -1057,19 +1064,13 @@ static HRESULT WINAPI testsource_Connect(IPin *iface, IPin *peer, const AM_MEDIA return IPin_ReceiveConnection(peer, &pin->IPin_iface, mt); } -static HRESULT WINAPI testsource_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) -{ - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; -} - static const IPinVtbl testsource_vtbl = { testpin_QueryInterface, testpin_AddRef, testpin_Release, testsource_Connect, - testsource_ReceiveConnection, + no_ReceiveConnection, testpin_Disconnect, testpin_ConnectedTo, testpin_ConnectionMediaType, @@ -1864,6 +1865,156 @@ static void test_add_remove_filter(void) ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); } +static HRESULT WINAPI test_connect_direct_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + struct testpin *pin = impl_from_IPin(iface); + if (winetest_debug > 1) trace("%p->Connect()\n", pin); + + pin->peer = peer; + IPin_AddRef(peer); + pin->mt = (AM_MEDIA_TYPE *)mt; + return S_OK; +} + +static const IPinVtbl test_connect_direct_vtbl = +{ + testpin_QueryInterface, + testpin_AddRef, + testpin_Release, + test_connect_direct_Connect, + no_ReceiveConnection, + testpin_Disconnect, + testpin_ConnectedTo, + testpin_ConnectionMediaType, + testpin_QueryPinInfo, + testpin_QueryDirection, + testpin_QueryId, + testpin_QueryAccept, + no_EnumMediaTypes, + testpin_QueryInternalConnections, + testpin_EndOfStream, + testpin_BeginFlush, + testpin_EndFlush, + testpin_NewSegment +}; + +static void test_connect_direct_init(struct testpin *pin, PIN_DIRECTION dir) +{ + memset(pin, 0, sizeof(*pin)); + pin->IPin_iface.lpVtbl = &test_connect_direct_vtbl; + pin->ref = 1; + pin->dir = dir; +} + +static void test_connect_direct(void) +{ + struct testpin source_pin, sink_pin; + struct testfilter source, sink; + + IFilterGraph2 *graph = create_graph(); + AM_MEDIA_TYPE mt; + HRESULT hr; + + test_connect_direct_init(&source_pin, PINDIR_OUTPUT); + test_connect_direct_init(&sink_pin, PINDIR_INPUT); + testfilter_init(&source, &source_pin, 1); + testfilter_init(&sink, &sink_pin, 1); + + hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Swap the pins when connecting. */ + hr = IFilterGraph2_ConnectDirect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); +todo_wine + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Disconnect() does not disconnect the peer. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Test specifying the media type. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Both pins are disconnected when a filter is removed. */ + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Or when the graph is destroyed. */ + hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + IPin_AddRef(sink_pin.peer = &source_pin.IPin_iface); + + hr = IFilterGraph2_Release(graph); + ok(!hr, "Got outstanding refcount %d.\n", hr); + ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); + ok(sink.ref == 1, "Got outstanding refcount %d.\n", sink.ref); + ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); +todo_wine + ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1876,6 +2027,7 @@ START_TEST(filtergraph) test_aggregate_filter_graph(); test_control_delegation(); test_add_remove_filter(); + test_connect_direct(); CoUninitialize(); test_render_with_multithread();

1 0

Zebediah Figura : quartz/tests: Add some tests for IGraphBuilder_Connect() .
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 2fea0632458113cb7c2bbd66bdeef27af6edde1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fea0632458113cb7c2bbd66… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:17 2018 -0500 quartz/tests: Add some tests for IGraphBuilder_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 373 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 353 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fea0632458113cb7c2b…

1 0

Zebediah Figura : quartz/filtergraph: Don't use QueryInternalConnections() to find output pins in FilterGraph2_Connect().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 6eb05abf5fcc0c2eacf0888214e3320093dc551d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb05abf5fcc0c2eacf08882… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:18 2018 -0500 quartz/filtergraph: Don't use QueryInternalConnections() to find output pins in FilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 102 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7f22475..8d5c5dc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1036,6 +1036,55 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi return S_OK; } +/* Attempt to connect one of the output pins on filter to sink. Helper for + * FilterGraph2_Connect(). */ +static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, IPin *sink) +{ + IEnumPins *enumpins; + PIN_DIRECTION dir; + HRESULT hr; + WCHAR *id; + IPin *pin; + + hr = IBaseFilter_EnumPins(filter, &enumpins); + if (FAILED(hr)) + return hr; + + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_OUTPUT) + { + hr = IPin_QueryId(pin, &id); + if (FAILED(hr)) + { + IPin_Release(pin); + IEnumPins_Release(enumpins); + return hr; + } + + if (id[0] == '~') + { + TRACE("Skipping non-rendered pin %s.\n", debugstr_w(id)); + IPin_Release(pin); + IEnumPins_Release(enumpins); + return E_FAIL; + } + + if (SUCCEEDED(IFilterGraph2_Connect(&graph->IFilterGraph2_iface, pin, sink))) + { + IPin_Release(pin); + IEnumPins_Release(enumpins); + return S_OK; + } + } + IPin_Release(pin); + } + + IEnumPins_Release(enumpins); + return VFW_E_CANNOT_CONNECT; +} + /*** IGraphBuilder methods ***/ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin *ppinIn) { @@ -1047,13 +1096,11 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumPins* penumpins; IEnumMoniker* pEnumMoniker; GUID tab[2]; - ULONG nb = 0; IMoniker* pMoniker; ULONG pin; PIN_INFO PinInfo; CLSID FilterCLSID; PIN_DIRECTION dir; - unsigned int i = 0; IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -1162,11 +1209,10 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } hr = VFW_E_CANNOT_RENDER; - while(IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, &nb) == S_OK) + while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; GUID clsid; - IPin** ppins = NULL; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1263,52 +1309,10 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } TRACE("Successfully connected to filter, follow chain...\n"); - /* Render all output pins of the filter by calling IFilterGraph2_Connect on each of them */ - hr = GetInternalConnections(pfilter, ppinfilter, &ppins, &nb); - - if (SUCCEEDED(hr)) { - if (nb == 0) { - IPin_Disconnect(ppinfilter); - IPin_Disconnect(ppinOut); - goto error; - } - TRACE("pins to consider: %d\n", nb); - for(i = 0; i < nb; i++) - { - LPWSTR pinname = NULL; - - TRACE("Processing pin %u\n", i); - - hr = IPin_QueryId(ppins[i], &pinname); - if (SUCCEEDED(hr)) - { - if (pinname[0] == '~') - { - TRACE("Pinname=%s, skipping\n", debugstr_w(pinname)); - hr = E_FAIL; - } - else - hr = IFilterGraph2_Connect(iface, ppins[i], ppinIn); - CoTaskMemFree(pinname); - } - - if (FAILED(hr)) { - TRACE("Cannot connect pin %p (%x)\n", ppinfilter, hr); - } - IPin_Release(ppins[i]); - if (SUCCEEDED(hr)) break; - } - while (++i < nb) IPin_Release(ppins[i]); - CoTaskMemFree(ppins); + if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + { IPin_Release(ppinfilter); IBaseFilter_Release(pfilter); - if (FAILED(hr)) - { - IPin_Disconnect(ppinfilter); - IPin_Disconnect(ppinOut); - IFilterGraph2_RemoveFilter(iface, pfilter); - continue; - } break; } @@ -1319,8 +1323,6 @@ error: IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); } - while (++i < nb) IPin_Release(ppins[i]); - CoTaskMemFree(ppins); } IEnumMoniker_Release(pEnumMoniker);

1 0

Zebediah Figura : quartz/filtergraph: Try filters in the graph first in FilterGraph2_Connect().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: a638c327533fb4b0a2e0120e97062d2f1ef00040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a638c327533fb4b0a2e0120e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:19 2018 -0500 quartz/filtergraph: Try filters in the graph first in FilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 35 ++++++++++++++++++++++++++++++++--- dlls/quartz/tests/filtergraph.c | 11 +---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8d5c5dc..4eaed31 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1089,7 +1089,9 @@ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin *ppinIn) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + struct filter *filter; HRESULT hr; + IPin *pin; AM_MEDIA_TYPE* mt = NULL; IEnumMediaTypes* penummt = NULL; ULONG nbmt; @@ -1097,7 +1099,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumMoniker* pEnumMoniker; GUID tab[2]; IMoniker* pMoniker; - ULONG pin; PIN_INFO PinInfo; CLSID FilterCLSID; PIN_DIRECTION dir; @@ -1160,6 +1161,34 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("Direct connection failed, trying to render using extra filters\n"); + LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) + { + hr = IBaseFilter_EnumPins(filter->filter, &penumpins); + if (FAILED(hr)) + goto out; + + while (IEnumPins_Next(penumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_INPUT && SUCCEEDED(IFilterGraph2_ConnectDirect(iface, + ppinOut, pin, NULL))) + { + if (SUCCEEDED(hr = connect_output_pin(This, filter->filter, ppinIn))) + { + IPin_Release(pin); + IEnumPins_Release(penumpins); + goto out; + } + + IFilterGraph2_Disconnect(iface, pin); + IFilterGraph2_Disconnect(iface, ppinOut); + } + IPin_Release(pin); + } + + IEnumPins_Release(penumpins); + } + hr = IPin_QueryPinInfo(ppinIn, &PinInfo); if (FAILED(hr)) goto out; @@ -1290,14 +1319,14 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); + hr = IEnumPins_Next(penumpins, 1, &ppinfilter, NULL); IEnumPins_Release(penumpins); if (FAILED(hr)) { WARN("Obtaining next pin: (%x)\n", hr); goto error; } - if (pin == 0) { + if (hr == S_FALSE) { WARN("Cannot use this filter: no pins\n"); goto error; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c9083f9..64705d2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1701,11 +1701,9 @@ todo_wine sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -1715,11 +1713,9 @@ todo_wine { IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -1729,12 +1725,10 @@ todo_wine { IFilterGraph2_AddFilter(graph, &parser3.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser3_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(parser3_pins[1].peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", parser3_pins[1].peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, parser3_pins[0].peer); @@ -1753,11 +1747,10 @@ todo_wine { IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { +todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} ok(!parser1_pins[2].peer, "Got peer %p.\n", parser1_pins[2].peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); @@ -1769,11 +1762,9 @@ todo_wine { parser1_pins[1].QueryInternalConnections_hr = S_OK; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer);

1 0

Zebediah Figura : quartz/filtergraph: Check pin name instead of id in connect_output_pin().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 009bbfa6a3b67e7d839307aad2c379a3615d92d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=009bbfa6a3b67e7d839307aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:20 2018 -0500 quartz/filtergraph: Check pin name instead of id in connect_output_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 20 ++++++-------------- dlls/quartz/tests/filtergraph.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4eaed31..c4ba644 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1041,9 +1041,8 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, IPin *sink) { IEnumPins *enumpins; - PIN_DIRECTION dir; + PIN_INFO info; HRESULT hr; - WCHAR *id; IPin *pin; hr = IBaseFilter_EnumPins(filter, &enumpins); @@ -1052,20 +1051,13 @@ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) { - IPin_QueryDirection(pin, &dir); - if (dir == PINDIR_OUTPUT) + IPin_QueryPinInfo(pin, &info); + IBaseFilter_Release(info.pFilter); + if (info.dir == PINDIR_OUTPUT) { - hr = IPin_QueryId(pin, &id); - if (FAILED(hr)) - { - IPin_Release(pin); - IEnumPins_Release(enumpins); - return hr; - } - - if (id[0] == '~') + if (info.achName[0] == '~') { - TRACE("Skipping non-rendered pin %s.\n", debugstr_w(id)); + TRACE("Skipping non-rendered pin %s.\n", debugstr_w(info.achName)); IPin_Release(pin); IEnumPins_Release(enumpins); return E_FAIL; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 64705d2..9ef229f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -768,6 +768,8 @@ struct testpin IBaseFilter *filter; IPin *peer; AM_MEDIA_TYPE *mt; + WCHAR name[10]; + WCHAR id[10]; IEnumMediaTypes IEnumMediaTypes_iface; const AM_MEDIA_TYPE *types; @@ -928,7 +930,7 @@ static HRESULT WINAPI testpin_QueryPinInfo(IPin *iface, PIN_INFO *info) info->pFilter = pin->filter; IBaseFilter_AddRef(pin->filter); info->dir = pin->dir; - info->achName[0] = 0; + lstrcpyW(info->achName, pin->name); return S_OK; } @@ -944,9 +946,10 @@ static HRESULT WINAPI testpin_QueryDirection(IPin *iface, PIN_DIRECTION *dir) static HRESULT WINAPI testpin_QueryId(IPin *iface, WCHAR **id) { + struct testpin *pin = impl_from_IPin(iface); if (winetest_debug > 1) trace("%p->QueryId()\n", iface); - *id = CoTaskMemAlloc(1); - (*id)[0] = 0; + *id = CoTaskMemAlloc(11); + lstrcpyW(*id, pin->id); return S_OK; } @@ -1770,6 +1773,38 @@ todo_wine IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + /* A pin whose name (not ID) begins with a tilde is not connected. */ + + parser1_pins[1].name[0] = '~'; + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); +todo_wine + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + + parser1.pin_count = 3; + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); +todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser1_pins[2].IPin_iface, "Got peer %p.\n", sink_pin.peer); +} + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + IFilterGraph2_Disconnect(graph, sink_pin.peer); + IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + parser1.pin_count = 2; + + parser1_pins[1].name[0] = 0; + parser1_pins[1].id[0] = '~'; + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + IFilterGraph2_Disconnect(graph, sink_pin.peer); + IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Michael Stefaniuc : wininet: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 717a17b24fa37df8d20a51f37b7d96e61b81a5bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=717a17b24fa37df8d20a51f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 20 19:13:58 2018 +0200 wininet: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b7be993..9e839ce 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3513,8 +3513,6 @@ static const LPCWSTR header_lookup[] = { szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ }; -#define LAST_TABLE_HEADER (sizeof(header_lookup)/sizeof(header_lookup[0])) - /*********************************************************************** * HTTP_HttpQueryInfoW (internal) */ @@ -3700,9 +3698,9 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return res; } default: - assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); + assert (ARRAY_SIZE(header_lookup) == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); - if (level < LAST_TABLE_HEADER && header_lookup[level]) + if (level < ARRAY_SIZE(header_lookup) && header_lookup[level]) index = HTTP_GetCustomHeaderIndex(request, header_lookup[level], requested_index,request_only); }

1 0

Michael Stefaniuc : wininet: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: b1a3b9e5ce74990777fca94658833802cb7b7a09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a3b9e5ce74990777fca946… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 20 19:13:59 2018 +0200 wininet: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 24 ++++++++++++------------ dlls/wininet/dialogs.c | 24 +++++++++++------------- dlls/wininet/http.c | 31 ++++++++++++++----------------- dlls/wininet/internet.c | 10 +++++----- dlls/wininet/netconnection.c | 8 ++++---- dlls/wininet/urlcache.c | 8 ++++---- dlls/wininet/utility.c | 2 +- 7 files changed, 51 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1a3b9e5ce74990777fc…

1 0