wine-commits

wine-commits@winehq.org

1 participants
185846 discussions

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

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 : 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 : 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 : 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

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

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

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

Zhiyi Zhang : ntdll: Don't zero out socket address in sockaddr_from_unix().
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: d5bfa879088e7dfd3f79cdf724ce8f2880f872cb URL: https://gitlab.winehq.org/wine/wine/-/commit/d5bfa879088e7dfd3f79cdf724ce8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 13 12:33:52 2024 +0800 ntdll: Don't zero out socket address in sockaddr_from_unix(). tallygatewayserver.exe specifies a from sockaddr pointing to a heap buffer smaller than 128 bytes yet it passes 128 as the fromlen to recvfrom(). So the memset(wsaddr, 0, wsaddrlen) call in sockaddr_from_unix() ends up trashing other data in the heap, causing the application to crash. Although this is an application bug, tests on Windows also showed that the socket address buffer should be written only with the necessary socket address data, thus preventing the crash. --- dlls/ntdll/unix/socket.c | 2 -- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 65f30759db3..ea2f5d3a670 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -298,8 +298,6 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_sockaddr *wsaddr, socklen_t wsaddrlen ) { - memset( wsaddr, 0, wsaddrlen ); - switch (uaddr->addr.sa_family) { case AF_INET: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 57f1e6f9f97..e8c618cc0af 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3224,7 +3224,6 @@ static void test_UDP(void) n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); todo_wine ok ( n_recv == SOCKET_ERROR, "UDP: recvfrom() succeeded\n" ); - todo_wine ok ( sockaddr_buf[0] == 'A', "UDP: marker got overwritten\n" ); if ( n_recv == SOCKET_ERROR ) { @@ -3241,7 +3240,6 @@ static void test_UDP(void) ss = sizeof(sockaddr_buf); n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); - todo_wine ok ( sockaddr_buf[1023] == 'B', "UDP: marker got overwritten\n" ); /* test getsockname() */

1 0

Zhiyi Zhang : ws2_32/tests: Test fromlen for recvfrom().
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 2c01c0136bb148acca8be8cbc393bc776f7b1dc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c01c0136bb148acca8be8cbc393bc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 13 12:11:36 2024 +0800 ws2_32/tests: Test fromlen for recvfrom(). Test that specifying a too small or too large fromlen for recvfrom() shouldn't write unnecessary data. --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6954b3e077a..57f1e6f9f97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3185,7 +3185,7 @@ static void test_UDP(void) /* peer 0 receives data from all other peers */ static const TIMEVAL timeout_zero = {0}; struct sock_info peer[NUM_UDP_PEERS]; - char buf[16]; + char buf[16], sockaddr_buf[1024]; int ss, i, n_recv, n_sent, ret; struct sockaddr_in addr; int sock; @@ -3215,11 +3215,40 @@ static void test_UDP(void) ok ( peer[i].addr.sin_port != htons ( 0 ), "UDP: bind() did not associate port\n" ); } + /* Test that specifying a too small fromlen for recvfrom() shouldn't write unnecessary data */ + n_sent = sendto ( peer[1].s, buf, sizeof(buf), 0, (struct sockaddr *)&peer[0].addr, sizeof(peer[0].addr) ); + ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent ); + + sockaddr_buf[0] = 'A'; + ss = 1; + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + todo_wine + ok ( n_recv == SOCKET_ERROR, "UDP: recvfrom() succeeded\n" ); + todo_wine + ok ( sockaddr_buf[0] == 'A', "UDP: marker got overwritten\n" ); + if ( n_recv == SOCKET_ERROR ) + { + ss = sizeof ( peer[0].addr ); + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + ok ( n_recv == sizeof(buf), "UDP: recvfrom() failed\n" ); + } + + /* Test that specifying a large fromlen for recvfrom() shouldn't write unnecessary data besides the socket address */ + n_sent = sendto ( peer[1].s, buf, sizeof(buf), 0, (struct sockaddr *)&peer[0].addr, sizeof(peer[0].addr) ); + ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent ); + + sockaddr_buf[1023] = 'B'; + ss = sizeof(sockaddr_buf); + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); + todo_wine + ok ( sockaddr_buf[1023] == 'B', "UDP: marker got overwritten\n" ); + /* test getsockname() */ ok ( peer[0].addr.sin_port == htons ( SERVERPORT ), "UDP: getsockname returned incorrect peer port\n" ); for ( i = 1; i < NUM_UDP_PEERS; i++ ) { - /* send client's ip */ + /* send client's port */ memcpy( buf, &peer[i].addr.sin_port, sizeof(peer[i].addr.sin_port) ); n_sent = sendto ( peer[i].s, buf, sizeof(buf), 0, (struct sockaddr*) &peer[0].addr, sizeof(peer[0].addr) ); ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits