September 2018 - Wine-commits

Henri Verbeet : wined3d: Move "texture_size" from struct wined3d_gl_limits to struct wined3d_d3d_limits.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: a470045506b432ccbf80d4e72ad87f7a20ee79c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a470045506b432ccbf80d4e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 01:02:37 2018 +0330 wined3d: Move "texture_size" from struct wined3d_gl_limits to struct wined3d_d3d_limits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ba6c457..87418e1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2853,7 +2853,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); - gl_info->limits.texture_size = gl_max; + d3d_info->limits.texture_size = gl_max; TRACE("Maximum texture size support - max texture size %d.\n", gl_max); gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] @@ -3143,8 +3143,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } else { - gl_info->limits.framebuffer_width = gl_info->limits.texture_size; - gl_info->limits.framebuffer_height = gl_info->limits.texture_size; + gl_info->limits.framebuffer_width = d3d_info->limits.texture_size; + gl_info->limits.framebuffer_height = d3d_info->limits.texture_size; } gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2d1368a..a618486 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,8 +2136,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * idea how generating the smoothing alpha values works; the result is different */ - caps->MaxTextureWidth = gl_info->limits.texture_size; - caps->MaxTextureHeight = gl_info->limits.texture_size; + caps->MaxTextureWidth = d3d_info->limits.texture_size; + caps->MaxTextureHeight = d3d_info->limits.texture_size; if (gl_info->supported[EXT_TEXTURE3D]) caps->MaxVolumeExtent = gl_info->limits.texture3d_size; @@ -2145,7 +2145,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVolumeExtent = 0; caps->MaxTextureRepeat = 32768; - caps->MaxTextureAspectRatio = gl_info->limits.texture_size; + caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; caps->MaxVertexW = 1.0f; caps->GuardBandLeft = 0.0f; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdf2651..c0bdddc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2687,7 +2687,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_width = pow2_width; texture->pow2_height = pow2_height; - if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) + if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size) && (desc->usage & WINED3DUSAGE_TEXTURE)) { /* One of four options: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46b47dd..941bfa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -166,6 +166,7 @@ struct wined3d_d3d_limits unsigned int max_rt_count; unsigned int max_clip_distances; + unsigned int texture_size; float pointsize_max; }; @@ -2540,7 +2541,6 @@ struct wined3d_gl_limits unsigned int combined_samplers; UINT general_combiners; UINT user_clip_distances; - UINT texture_size; UINT texture3d_size; UINT anisotropy; float shininess;

1 0

Henri Verbeet : ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 8ac639d25c8cb7beb0cd66c9c08dd6b41c9e5dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac639d25c8cb7beb0cd66c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 01:02:38 2018 +0330 ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c51db76..fc120e3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6152,12 +6152,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } else { - if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; - else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; + if (!(ddraw->flags & DDRAW_NO3D)) + { + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; + else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; + } if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) {

1 0

Gabriel Ivăncescu : shell32/autocomplete: Remove flicker while redrawing the AutoComplete listbox.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: aaf0fb5292e262f1831626d3142a7c091e7b8505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf0fb5292e262f1831626d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 25 14:55:27 2018 +0300 shell32/autocomplete: Remove flicker while redrawing the AutoComplete listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2153968..b5a053c 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -175,12 +175,15 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - /* Set txtbackup to point to text itself (which must not be released) */ heap_free(ac->txtbackup); ac->txtbackup = text; + if (ac->options & ACO_AUTOSUGGEST) + { + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + } IEnumString_Reset(ac->enumstr); for (cpt = 0;;) { @@ -220,12 +223,12 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); GetWindowRect(hwnd, &r); - SetParent(ac->hwndListBox, HWND_DESKTOP); /* It seems that Windows XP displays 7 lines at most and otherwise displays a vertical scroll bar */ SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, r.right - r.left, height * min(cpt + 1, 7), SWP_SHOWWINDOW ); + SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else ShowWindow(ac->hwndListBox, SW_HIDE); @@ -438,6 +441,7 @@ static void create_listbox(IAutoCompleteImpl *This) if (This->hwndListBox) { This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); + SetParent(This->hwndListBox, HWND_DESKTOP); } else This->options &= ~ACO_AUTOSUGGEST;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use 0 instead of CW_USEDEFAULT.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 75ccf7537c8a0ef99aaafaec715b00006c354f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=75ccf7537c8a0ef99aaafaec… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 25 14:55:28 2018 +0300 shell32/autocomplete: Use 0 instead of CW_USEDEFAULT. Clean the CreateWindowEx code of CW_USEDEFAULT since it's not valid for a child window and ends up being 0 anyway. Even more, it's useless as the actual size is given when the window is shown. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b5a053c..fe5bba2 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -428,15 +428,10 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, static void create_listbox(IAutoCompleteImpl *This) { - HWND hwndParent; - - hwndParent = GetParent(This->hwndEdit); - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ This->hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, shell32_hInstance, NULL ); + 0, 0, 0, 0, GetParent(This->hwndEdit), NULL, shell32_hInstance, NULL); if (This->hwndListBox) { This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc);

1 0

Zebediah Figura : quartz/tests: Add some tests for IMediaFilter_SetSyncSource() and IMediaFilter_GetSyncSource().
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 13a1dfd7c2ab9283bcc203a7326cc5e1d8e3ff42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a1dfd7c2ab9283bcc203a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:18 2018 -0500 quartz/tests: Add some tests for IMediaFilter_SetSyncSource() and IMediaFilter_GetSyncSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5693c86..54afb8a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2460,6 +2460,58 @@ todo_wine ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); } +static void test_sync_source(void) +{ + struct testfilter filter1, filter2; + + IFilterGraph2 *graph = create_graph(); + IReferenceClock *systemclock, *clock; + IMediaFilter *filter; + HRESULT hr; + ULONG ref; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); + + testfilter_init(&filter1, NULL, 0); + testfilter_init(&filter2, NULL, 0); + + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + + ok(!filter1.clock, "Got clock %p.\n", filter1.clock); + ok(!filter2.clock, "Got clock %p.\n", filter2.clock); + + CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, + &IID_IReferenceClock, (void **)&systemclock); + + hr = IMediaFilter_SetSyncSource(filter, systemclock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter1.clock == systemclock, "Got clock %p.\n", filter1.clock); + ok(filter2.clock == systemclock, "Got clock %p.\n", filter2.clock); + + hr = IMediaFilter_GetSyncSource(filter, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock == systemclock, "Got clock %p.\n", clock); + IReferenceClock_Release(clock); + + hr = IMediaFilter_SetSyncSource(filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!filter1.clock, "Got clock %p.\n", filter1.clock); + ok(!filter2.clock, "Got clock %p.\n", filter2.clock); + + hr = IMediaFilter_GetSyncSource(filter, &clock); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!clock, "Got clock %p.\n", clock); + + IReferenceClock_Release(systemclock); + IMediaFilter_Release(filter); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d\n", ref); + ok(filter1.ref == 1, "Got outstanding refcount %d.\n", filter1.ref); + ok(filter2.ref == 1, "Got outstanding refcount %d.\n", filter2.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -2474,6 +2526,7 @@ START_TEST(filtergraph) test_control_delegation(); test_add_remove_filter(); test_connect_direct(); + test_sync_source(); CoUninitialize(); test_render_with_multithread();

1 0

Zebediah Figura : quartz/filtergraph: Also set the default sync source if necessary in IMediaControl_Pause().
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 12d72c891db5064ab468c7e5092bf8151a8516a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d72c891db5064ab468c7e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:19 2018 -0500 quartz/filtergraph: Also set the default sync source if necessary in IMediaControl_Pause(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8d99ee5..f173c12 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2273,6 +2273,9 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) if (This->state == State_Paused) goto out; + if (This->defaultclock && !This->refClock) + IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); + if (This->state == State_Running && This->refClock && This->start_time >= 0) IReferenceClock_GetTime(This->refClock, &This->pause_time); else

1 0

Zebediah Figura : quartz/tests: Add some tests for filter states.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 0c0606cd1bacf24e0cce6a83c17a8efbf17a4dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0606cd1bacf24e0cce6a83… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:20 2018 -0500 quartz/tests: Add some tests for filter states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 276 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 268 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0606cd1bacf24e0cce…

1 0

Zebediah Figura : quartz/filtergraph: Implement IMediaControl state functions on top of IMediaFilter.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 093a32ec7b45dca8043b53e118ac896fb67f7b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=093a32ec7b45dca8043b53e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:21 2018 -0500 quartz/filtergraph: Implement IMediaControl state functions on top of IMediaFilter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 211 ++++++++++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 2 - 2 files changed, 108 insertions(+), 105 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f173c12..4dfe5c0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2228,114 +2228,34 @@ static HRESULT SendFilterMessage(IFilterGraphImpl *This, fnFoundFilter FoundFilt return S_FALSE; } -/*** IMediaControl methods ***/ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->cs); - if (This->state == State_Running) - goto out; - This->EcCompleteCount = 0; - - if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - if (This->refClock) - { - REFERENCE_TIME now; - IReferenceClock_GetTime(This->refClock, &now); - if (This->state == State_Stopped) - This->start_time = now + 500000; - else if (This->pause_time >= 0) - This->start_time += now - This->pause_time; - else - This->start_time = now; - } - else This->start_time = 0; - - SendFilterMessage(This, SendRun, (DWORD_PTR)&This->start_time); - This->state = State_Running; -out: - LeaveCriticalSection(&This->cs); - return S_FALSE; + return IMediaFilter_Run(&graph->IMediaFilter_iface, 0); } static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->cs); - if (This->state == State_Paused) - goto out; - - if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); - - if (This->state == State_Running && This->refClock && This->start_time >= 0) - IReferenceClock_GetTime(This->refClock, &This->pause_time); - else - This->pause_time = -1; - - SendFilterMessage(This, SendPause, 0); - This->state = State_Paused; -out: - LeaveCriticalSection(&This->cs); - return S_FALSE; + return IMediaFilter_Pause(&graph->IMediaFilter_iface); } static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - TRACE("(%p/%p)->()\n", This, iface); - - if (This->state == State_Stopped) return S_OK; - - EnterCriticalSection(&This->cs); - if (This->state == State_Running) SendFilterMessage(This, SendPause, 0); - SendFilterMessage(This, SendStop, 0); - This->state = State_Stopped; - LeaveCriticalSection(&This->cs); - return S_OK; + return IMediaFilter_Stop(&graph->IMediaFilter_iface); } -static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG msTimeout, - OAFilterState *pfs) +static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG timeout, OAFilterState *state) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - DWORD end; - - TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pfs); - - if (!pfs) - return E_POINTER; - - EnterCriticalSection(&This->cs); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - *pfs = This->state; - if (msTimeout > 0) - { - end = GetTickCount() + msTimeout; - } - else if (msTimeout < 0) - { - end = INFINITE; - } - else - { - end = 0; - } - if (end) - SendFilterMessage(This, SendGetState, end); + if (timeout < 0) timeout = INFINITE; - LeaveCriticalSection(&This->cs); - - return S_OK; + return IMediaFilter_GetState(&graph->IMediaFilter_iface, timeout, (FILTER_STATE *)state); } static HRESULT WINAPI MediaControl_RenderFile(IMediaControl *iface, BSTR strFilename) @@ -5454,34 +5374,119 @@ static HRESULT WINAPI MediaFilter_GetClassID(IMediaFilter *iface, CLSID * pClass static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); - return MediaControl_Stop(&This->IMediaControl_iface); + TRACE("graph %p.\n", graph); + + EnterCriticalSection(&graph->cs); + + if (graph->state == State_Stopped) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + + if (graph->state == State_Running) + SendFilterMessage(graph, SendPause, 0); + SendFilterMessage(graph, SendStop, 0); + graph->state = State_Stopped; + + LeaveCriticalSection(&graph->cs); + return S_OK; } static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); - return MediaControl_Pause(&This->IMediaControl_iface); + TRACE("graph %p.\n", graph); + + EnterCriticalSection(&graph->cs); + + if (graph->state == State_Paused) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + + if (graph->defaultclock && !graph->refClock) + IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); + + if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) + IReferenceClock_GetTime(graph->refClock, &graph->pause_time); + else + graph->pause_time = -1; + + SendFilterMessage(graph, SendPause, 0); + graph->state = State_Paused; + + LeaveCriticalSection(&graph->cs); + return S_FALSE; } -static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) +static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); + + TRACE("graph %p, start %s.\n", graph, wine_dbgstr_longlong(start)); - if (tStart) - FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart)); + EnterCriticalSection(&graph->cs); - return MediaControl_Run(&This->IMediaControl_iface); + if (graph->state == State_Running) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + graph->EcCompleteCount = 0; + + if (graph->defaultclock && !graph->refClock) + IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); + + if (!start && graph->refClock) + { + REFERENCE_TIME now; + IReferenceClock_GetTime(graph->refClock, &now); + if (graph->state == State_Stopped) + graph->start_time = now + 500000; + else if (graph->pause_time >= 0) + graph->start_time += now - graph->pause_time; + else + graph->start_time = now; + } + else + graph->start_time = start; + + SendFilterMessage(graph, SendRun, (DWORD_PTR)&graph->start_time); + graph->state = State_Running; + + LeaveCriticalSection(&graph->cs); + return S_FALSE; } -static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, - FILTER_STATE *pState) +static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, FILTER_STATE *state) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); + DWORD end; + + TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); + + if (!state) + return E_POINTER; + + EnterCriticalSection(&graph->cs); - return MediaControl_GetState(&This->IMediaControl_iface, dwMsTimeout, (OAFilterState*)pState); + *state = graph->state; + if (timeout > 0) + end = GetTickCount() + timeout; + else if (timeout == INFINITE) + end = INFINITE; + else + end = 0; + if (end) + SendFilterMessage(graph, SendGetState, end); + + LeaveCriticalSection(&graph->cs); + return S_OK; } static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceClock *pClock) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 8dc7341..6838c02 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2698,10 +2698,8 @@ todo_wine todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); -todo_wine { ok(source.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); -} hr = IMediaFilter_Pause(filter); todo_wine

1 0

Zebediah Figura : quartz/tests/filtergraph: Add some tests for EC_COMPLETE.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: d65586ea95625a7d367c767c6bd088375b622021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65586ea95625a7d367c767c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:22 2018 -0500 quartz/tests/filtergraph: Add some tests for EC_COMPLETE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 430 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 430 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65586ea95625a7d367c…

1 0

Zebediah Figura : quartz/filtergraph: Check for AM_FILTER_MISC_FLAGS_IS_RENDERER or IMediaSeeking to count renderers.
by Alexandre Julliard 26 Sep '18

26 Sep '18

Module: wine Branch: master Commit: 783c2d66a41021d6c01c6bdf2440ab256f073db6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=783c2d66a41021d6c01c6bdf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:23 2018 -0500 quartz/filtergraph: Check for AM_FILTER_MISC_FLAGS_IS_RENDERER or IMediaSeeking to count renderers. Instead of using IPin_QueryInternalConnections(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 49 +++++++++++++++++++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 5 ----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4dfe5c0..c859564 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2084,8 +2084,34 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID dispIdMem typedef HRESULT(WINAPI *fnFoundFilter)(IBaseFilter *, DWORD_PTR data); +static BOOL has_output_pins(IBaseFilter *filter) +{ + IEnumPins *enumpins; + PIN_DIRECTION dir; + IPin *pin; + + if (FAILED(IBaseFilter_EnumPins(filter, &enumpins))) + return FALSE; + + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + IPin_Release(pin); + if (dir == PINDIR_OUTPUT) + { + IEnumPins_Release(enumpins); + return TRUE; + } + } + + IEnumPins_Release(enumpins); + return FALSE; +} + static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundFilter FoundFilter, DWORD_PTR data) { + IAMFilterMiscFlags *flags; + IMediaSeeking *seeking; HRESULT hr; IPin* pInputPin; IPin** ppPins; @@ -2108,13 +2134,7 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF if (SUCCEEDED(hr)) { - if (nb == 0) - { - TRACE("Reached a renderer\n"); - /* Count renderers for end of stream notification */ - pGraph->nRenderers++; - } - else + if (nb) { for(i = 0; i < nb; i++) { @@ -2129,6 +2149,21 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); + if (SUCCEEDED(IBaseFilter_QueryInterface(PinInfo.pFilter, + &IID_IAMFilterMiscFlags, (void **)&flags))) + { + if (IAMFilterMiscFlags_GetMiscFlags(flags) & AM_FILTER_MISC_FLAGS_IS_RENDERER) + pGraph->nRenderers++; + IAMFilterMiscFlags_Release(flags); + } + else if (SUCCEEDED(IBaseFilter_QueryInterface(PinInfo.pFilter, + &IID_IMediaSeeking, (void **)&seeking))) + { + if (!has_output_pins(PinInfo.pFilter)) + pGraph->nRenderers++; + IMediaSeeking_Release(seeking); + } + FoundFilter(PinInfo.pFilter, data); } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1345e41..74a3b68 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3080,10 +3080,8 @@ static void test_ec_complete(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, 0); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(code == EC_COMPLETE, "Got code %#x.\n", code); -} ok(param1 == S_OK, "Got param1 %#lx.\n", param1); ok(!param2, "Got param2 %#lx.\n", param2); hr = IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); @@ -3096,7 +3094,6 @@ todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, 50); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IMediaControl_Stop(control); @@ -3156,7 +3153,6 @@ todo_wine IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); @@ -3185,7 +3181,6 @@ todo_wine IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IMediaControl_Release(control);

1 0