June 2024 - Wine-Commits - list.winehq.org

Eric Pouech : quartz: Always expose that non fullscreen mode is supported and active.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 6fd8e30c69a127222b444a9da1f58f63ec40dfe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fd8e30c69a127222b444a9da1f58f… 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);

1 0

Eric Pouech : quartz/tests: Add new tests about fullscreen handling.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: faa5cade4a0db7a0a9af1896942dc4a8f8b3e238 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa5cade4a0db7a0a9af1896942dc4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 09:14:50 2024 +0200 quartz/tests: Add new tests about fullscreen handling. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 8 ++++++++ dlls/quartz/tests/vmr7.c | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c3dcfb803c2..4039939f0d9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2966,6 +2966,14 @@ static void test_control_delegation(void) hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + val = 0xdeadbeef; + hr = IVideoWindow_get_FullScreenMode(window, &val); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + 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); + hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 028f14838c3..b7f36134bcd 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2466,6 +2466,18 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + IVideoWindow_Release(window); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + 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); + hr = IVideoWindow_put_FullScreenMode(window, l); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + IFilterGraph2_Release(graph); IVideoWindow_Release(window); IOverlay_Release(overlay);

1 0

Rémi Bernon : winemac: Move layered window mapping to macdrv_UpdateLayeredWindow.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: c7287cc73499a53077a510bcdae9885547c8d031 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7287cc73499a53077a510bcdae988… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:44:12 2024 +0200 winemac: Move layered window mapping to macdrv_UpdateLayeredWindow. --- dlls/winemac.drv/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3c13659360..012189249a4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1925,10 +1925,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((*window_surface = surface)) window_surface_add_ref(surface); - /* Since layered attributes are now set, can now show the window */ - if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) - show_window(data); - release_win_data(data); return TRUE; @@ -1944,6 +1940,10 @@ void macdrv_UpdateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((data = get_win_data(hwnd))) { + /* Since layered attributes are now set, can now show the window */ + if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + show_window(data); + /* The ULW flags are a superset of the LWA flags. */ sync_window_opacity(data, color_key, 255, TRUE, flags); release_win_data(data);

1 0

Rémi Bernon : win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 6eac284201b4f8b2ecf78ad5623bf0fcebcd57bb URL: https://gitlab.winehq.org/wine/wine/-/commit/6eac284201b4f8b2ecf78ad5623bf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 13 10:35:15 2024 +0200 win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range. It is otherwise ignored and not passed to the drivers WindowMessage callback. Fixes: b89c9c60d50cf21650331d1528ff965c319a1217 --- include/ntuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntuser.h b/include/ntuser.h index 10afabfdc60..bd11567290f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -504,10 +504,10 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_UPDATEWINDOWSTATE, - WM_WINE_DESKTOP_RESIZED, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */ WM_WINE_SETCURSOR, + WM_WINE_DESKTOP_RESIZED, WM_WINE_LAST_DRIVER_MSG = 0x80001fff };

1 0

Eric Pouech : quartz/tests: Fix typo in tests.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 5fb9b19218dacd70366d15cf82f13fec3ec8a3e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fb9b19218dacd70366d15cf82f13f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 11:49:04 2024 +0200 quartz/tests: Fix typo in tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index df1db0cfed6..c3dcfb803c2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -46,7 +46,7 @@ static WCHAR *create_file(const WCHAR *name, const char *data, DWORD size) ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", wine_dbgstr_w(pathW), GetLastError()); WriteFile(file, data, size, &written, NULL); - ok(written = size, "Failed to write file data, error %lu.\n", GetLastError()); + ok(written == size, "Failed to write file data, error %lu.\n", GetLastError()); CloseHandle(file); return pathW;

1 0

Rémi Bernon : wineandroid: Remove unnecessary visible_rect initialization.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 10e4a6819c0e3905f4179f6ffe2003f1a62bc97e URL: https://gitlab.winehq.org/wine/wine/-/commit/10e4a6819c0e3905f4179f6ffe2003… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 10:01:35 2024 +0200 wineandroid: Remove unnecessary visible_rect initialization. --- dlls/wineandroid.drv/window.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 6d05af575f3..ea2c8935d2c 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1150,16 +1150,12 @@ BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_re hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), (int)NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); - if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE; + if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE; /* use default surface */ - *visible_rect = *window_rect; - - /* create the window surface if necessary */ - - if (data->parent) goto done; - if (swp_flags & SWP_HIDEWINDOW) goto done; - if (is_argb_surface( data->surface )) goto done; - if (!get_surface_rect( visible_rect, &surface_rect )) goto done; + if (data->parent) goto done; /* use default surface */ + if (swp_flags & SWP_HIDEWINDOW) goto done; /* use default surface */ + if (is_argb_surface( data->surface )) goto done; /* use default surface */ + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; /* use default surface */ if (data->surface) {

1 0

Rémi Bernon : win32u: Remove unused insert_after WindowPosChanging parameter.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: fe7e94d58c2596c23b407c5a0cd11b57f001d4dd URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7e94d58c2596c23b407c5a0cd11b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 15:38:47 2024 +0200 win32u: Remove unused insert_after WindowPosChanging parameter. --- dlls/win32u/driver.c | 3 +-- dlls/win32u/window.c | 4 ++-- dlls/wineandroid.drv/android.h | 3 +-- dlls/wineandroid.drv/window.c | 5 ++--- dlls/winemac.drv/macdrv.h | 3 +-- dlls/winemac.drv/window.c | 5 ++--- dlls/winewayland.drv/waylanddrv.h | 3 +-- dlls/winewayland.drv/window.c | 7 +++---- dlls/winex11.drv/window.c | 5 ++--- dlls/winex11.drv/x11drv.h | 5 ++--- include/wine/gdi_driver.h | 2 +- 11 files changed, 18 insertions(+), 27 deletions(-)

1 0

Rémi Bernon : winemac: Remove unnecessary visible_rect initialization.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 5b3bf77b1689b2b02f777309f57480949ee570b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b3bf77b1689b2b02f777309f57480… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 10:02:33 2024 +0200 winemac: Remove unnecessary visible_rect initialization. --- dlls/winemac.drv/window.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3d6fb1aa6d2..28deb0220f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2011,17 +2011,15 @@ BOOL macdrv_WindowPosChanging(HWND hwnd, UINT swp_flags, const RECT *window_rect swp_flags, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), wine_dbgstr_rect(visible_rect), surface); - if (!data && !(data = macdrv_create_win_data(hwnd, window_rect, client_rect))) return TRUE; + if (!data && !(data = macdrv_create_win_data(hwnd, window_rect, client_rect))) return TRUE; /* use default surface */ - *visible_rect = *window_rect; macdrv_window_to_mac_rect(data, style, visible_rect, window_rect, client_rect); TRACE("visible_rect %s -> %s\n", wine_dbgstr_rect(window_rect), wine_dbgstr_rect(visible_rect)); - /* create the window surface if necessary */ - if (!data->cocoa_window) goto done; - if (swp_flags & SWP_HIDEWINDOW) goto done; - if (data->ulw_layered) goto done; + if (!data->cocoa_window) goto done; /* use default surface */ + if (swp_flags & SWP_HIDEWINDOW) goto done; /* use default surface */ + if (data->ulw_layered) goto done; /* use default surface */ if (*surface) window_surface_release(*surface); *surface = NULL;

1 0

Rémi Bernon : win32u: Split WindowPosChanging driver call to a separate CreateWindowSurface.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 71ff81bc2b14dc90110e97ac71e5eee042644fed URL: https://gitlab.winehq.org/wine/wine/-/commit/71ff81bc2b14dc90110e97ac71e5ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 09:42:22 2024 +0200 win32u: Split WindowPosChanging driver call to a separate CreateWindowSurface. --- dlls/win32u/driver.c | 10 ++++++-- dlls/win32u/window.c | 25 ++++++++------------ dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 35 ++++++++++++++++++++++------ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 4 ++-- dlls/winemac.drv/window.c | 32 +++++++++++++++++++++----- dlls/winewayland.drv/waylanddrv.h | 4 ++-- dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 42 +++++++++++++++++++++++----------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 35 ++++++++++++++++++++++------ dlls/winex11.drv/x11drv.h | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 15 files changed, 142 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : winex11: Remove unnecessary visible_rect initialization.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 2a2637743b82031d0039698e116a0d1daf18dc1d URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2637743b82031d0039698e116a0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 10:03:24 2024 +0200 winex11: Remove unnecessary visible_rect initialization. --- dlls/winex11.drv/window.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a13f5fb68e6..f71b8eb8c10 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2602,7 +2602,7 @@ BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_rec COLORREF key; BOOL layered = NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED; - if (!data && !(data = X11DRV_create_win_data( hwnd, window_rect, client_rect ))) return TRUE; + if (!data && !(data = X11DRV_create_win_data( hwnd, window_rect, client_rect ))) return TRUE; /* use default surface */ /* check if we need to switch the window to managed */ if (!data->managed && data->whole_window && is_window_managed( hwnd, swp_flags, window_rect )) @@ -2610,27 +2610,24 @@ BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_rec TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); release_win_data( data ); unmap_window( hwnd ); - if (!(data = get_win_data( hwnd ))) return TRUE; + if (!(data = get_win_data( hwnd ))) return TRUE; /* use default surface */ data->managed = TRUE; } - *visible_rect = *window_rect; X11DRV_window_to_X_rect( data, visible_rect, window_rect, client_rect ); - /* create the window surface if necessary */ - - if (!data->whole_window && !data->embedded) goto done; - if (swp_flags & SWP_HIDEWINDOW) goto done; - if (data->use_alpha) goto done; - if (!get_surface_rect( visible_rect, &surface_rect )) goto done; + if (!data->whole_window && !data->embedded) goto done; /* use default surface */ + if (swp_flags & SWP_HIDEWINDOW) goto done; /* use default surface */ + if (data->use_alpha) goto done; /* use default surface */ + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; /* use default surface */ if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ - if (data->embedded) goto done; - if (data->whole_window == root_window) goto done; - if (data->client_window) goto done; - if (!client_side_graphics && !layered) goto done; + if (data->embedded) goto done; /* draw directly to the window */ + if (data->whole_window == root_window) goto done; /* draw directly to the window */ + if (data->client_window) goto done; /* draw directly to the window */ + if (!client_side_graphics && !layered) goto done; /* draw directly to the window */ if (data->surface) {

1 0