Module: wine Branch: master Commit: 1d42cf12747a6d80ee7d84c70d7e0bbca00ee4fc URL: https://gitlab.winehq.org/wine/wine/-/commit/1d42cf12747a6d80ee7d84c70d7e0bb...
Author: Eric Pouech epouech@codeweavers.com Date: Mon Jun 10 10:54:08 2024 +0200
quartz: Fix result in put_FullScreenMode().
Signed-off-by: Eric Pouech epouech@codeweavers.com
---
dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4039939f0d9..b4c79b17310 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2972,7 +2972,7 @@ static void test_control_delegation(void) ok(val == OAFALSE, "Got fullscreen %lu\n", val);
hr = IVideoWindow_put_FullScreenMode(window, OAFALSE); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e6735367cb3..bbd34678dfd 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -291,6 +291,9 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f
FIXME("filter %p, fullscreen %ld.\n", filter, fullscreen);
+ if (fullscreen == filter->FullScreenMode) + return S_FALSE; + if (fullscreen) { filter->saved_style = GetWindowLongW(window, GWL_STYLE);