Eric Pouech : quartz: Always expose that non fullscreen mode is supported and active.
Module: wine Branch: master Commit: 6fd8e30c69a127222b444a9da1f58f63ec40dfe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fd8e30c69a127222b444a9da1f58f6... Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 10:28:03 2024 +0200 quartz: Always expose that non fullscreen mode is supported and active. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/filtergraph.c | 7 +++++++ dlls/quartz/tests/vmr7.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4696d5ced01..cc66b17c75b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4504,6 +4504,11 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, LONG * if (hr == S_OK) hr = IVideoWindow_get_FullScreenMode(pVideoWindow, FullScreenMode); + if (hr == E_NOTIMPL) + { + *FullScreenMode = OAFALSE; + hr = S_OK; + } LeaveCriticalSection(&This->cs); @@ -4524,6 +4529,8 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG F if (hr == S_OK) hr = IVideoWindow_put_FullScreenMode(pVideoWindow, FullScreenMode); + if (hr == E_NOTIMPL && FullScreenMode == OAFALSE) + hr = S_FALSE; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b7f36134bcd..58753242108 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2473,10 +2473,10 @@ static void test_video_window(void) l = 0xdeadbeef; hr = IVideoWindow_get_FullScreenMode(window, &l); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); hr = IVideoWindow_put_FullScreenMode(window, l); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IFilterGraph2_Release(graph); IVideoWindow_Release(window);
participants (1)
-
Alexandre Julliard