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

Eric Pouech : quartz: Always expose that non fullscreen mode is supported and active.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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: Fix result in put_FullScreenMode().
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 1d42cf12747a6d80ee7d84c70d7e0bbca00ee4fc URL: https://gitlab.winehq.org/wine/wine/-/commit/1d42cf12747a6d80ee7d84c70d7e0b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 10:54:08 2024 +0200 quartz: Fix result in put_FullScreenMode(). Signed-off-by: Eric Pouech <epouech(a)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);

1 0

Alex Henrie : ntdll: Copy the correct number of bytes with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 2bb984ee2969c0658349c128ef9a2cea8cec7a86 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bb984ee2969c0658349c128ef9a2c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 12 23:53:21 2024 -0600 ntdll: Copy the correct number of bytes with RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/tests/reg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d4bf530537a..265ea34d962 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -259,7 +259,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, { ULONG default_size = pQuery->DefaultLength; if (!default_size && pQuery->DefaultType == REG_SZ && pQuery->DefaultData) - default_size = wcslen(pQuery->DefaultData) + 1; + default_size = (wcslen(pQuery->DefaultData) + 1) * sizeof(WCHAR); if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index fe36ce41a29..afbf921469b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2734,7 +2734,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_DATA + STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist",

1 0

Alex Henrie : ntdll: Calculate the default size even without RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 6cd53ff08c572688eade33bc9c449eefdd015ccb URL: https://gitlab.winehq.org/wine/wine/-/commit/6cd53ff08c572688eade33bc9c449e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 12 23:53:21 2024 -0600 ntdll: Calculate the default size even without RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 9 +++++---- dlls/ntdll/tests/reg.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 265ea34d962..9be75649cc3 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -255,11 +255,12 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pInfo == NULL) { + ULONG default_size = pQuery->DefaultLength; + if (!default_size && pQuery->DefaultType == REG_SZ && pQuery->DefaultData) + default_size = (wcslen(pQuery->DefaultData) + 1) * sizeof(WCHAR); + if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { - ULONG default_size = pQuery->DefaultLength; - if (!default_size && pQuery->DefaultType == REG_SZ && pQuery->DefaultData) - default_size = (wcslen(pQuery->DefaultData) + 1) * sizeof(WCHAR); if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); @@ -268,7 +269,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, else if (pQuery->QueryRoutine) { status = pQuery->QueryRoutine(pQuery->Name, pQuery->DefaultType, pQuery->DefaultData, - pQuery->DefaultLength, pContext, pQuery->EntryContext); + default_size, pContext, pQuery->EntryContext); } return status; } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index afbf921469b..9449cd2f904 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2716,7 +2716,7 @@ static struct query_reg_values_test query_reg_values_tests[] = }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA | WINE_TODO_SIZE + STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, @@ -2784,7 +2784,7 @@ static struct query_reg_values_test query_reg_values_tests[] = }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_SZ, (WCHAR*)L"Some default" }}, - STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA | WINE_TODO_SIZE + STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA }, };

1 0

Esme Povirk : win32u: Implement EVENT_SYSTEM_MINIMIZESTART/END.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: ed478f96c2ce4d13d0f234f7b0371b3884b39e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed478f96c2ce4d13d0f234f7b0371b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 12 21:13:34 2024 +0000 win32u: Implement EVENT_SYSTEM_MINIMIZESTART/END. --- dlls/user32/tests/msg.c | 31 ++++++++++++++++--------------- dlls/win32u/window.c | 11 ++++++++++- 2 files changed, 26 insertions(+), 16 deletions(-)

1 0

Rémi Bernon : win32u: Remove unused insert_after WindowPosChanging parameter.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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 : wineandroid: Remove unnecessary visible_rect initialization.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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 : winemac: Remove unnecessary visible_rect initialization.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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 : winex11: Remove unnecessary visible_rect initialization.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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

Rémi Bernon : win32u: Split WindowPosChanging driver call to a separate CreateWindowSurface.
by Alexandre Julliard 13 Jun '24

13 Jun '24

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