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

Esme Povirk : win32u: Implement EVENT_SYSTEM_MINIMIZESTART/END.
by Alexandre Julliard June 13, 2024

June 13, 2024

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 : winex11: Move layered window mapping to X11DRV_UpdateLayeredWindow.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: eca7068ab3f74a0b3ef4d2599c0239932fc952bf URL: https://gitlab.winehq.org/wine/wine/-/commit/eca7068ab3f74a0b3ef4d2599c0239… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:42:18 2024 +0200 winex11: Move layered window mapping to X11DRV_UpdateLayeredWindow. --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 20 +++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ec77a232e8e..28729d1c14b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -421,6 +421,7 @@ static const struct user_driver_funcs x11drv_funcs = .pClipboardWindowProc = X11DRV_ClipboardWindowProc, .pUpdateClipboard = X11DRV_UpdateClipboard, .pCreateLayeredWindow = X11DRV_CreateLayeredWindow, + .pUpdateLayeredWindow = X11DRV_UpdateLayeredWindow, .pWindowMessage = X11DRV_WindowMessage, .pWindowPosChanging = X11DRV_WindowPosChanging, .pCreateWindowSurface = X11DRV_CreateWindowSurface, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1d6bf30206d..74a9a4f6d68 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2991,7 +2991,6 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co { struct window_surface *surface; struct x11drv_win_data *data; - BOOL mapped; RECT rect; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -3013,6 +3012,22 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co else set_surface_color_key( surface, color_key ); if ((*window_surface = surface)) window_surface_add_ref( surface ); + release_win_data( data ); + + return TRUE; +} + + +/*********************************************************************** + * UpdateLayeredWindow (X11DRV.@) + */ +void X11DRV_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, + BYTE alpha, UINT flags ) +{ + struct x11drv_win_data *data; + BOOL mapped; + + if (!(data = get_win_data( hwnd ))) return; mapped = data->mapped; release_win_data( data ); @@ -3024,10 +3039,9 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co if ((style & WS_VISIBLE) && ((style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) map_window( hwnd, style ); } - - return TRUE; } + /* Add a window to taskbar */ static void taskbar_add_tab( HWND hwnd ) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c16423b3cf0..49fb17fc7cd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -242,6 +242,8 @@ extern LRESULT X11DRV_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARA extern void X11DRV_UpdateClipboard(void); extern BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, struct window_surface **surface ); +extern void X11DRV_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, + BYTE alpha, UINT flags ); extern LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ); extern BOOL X11DRV_CreateWindowSurface( HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface );

1 0

Alex Henrie : ntdll: Copy the correct number of bytes with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 13, 2024

June 13, 2024

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 June 13, 2024

June 13, 2024

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

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

June 13, 2024

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 June 13, 2024

June 13, 2024

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

Lucas Chollet : dnsapi: Add a stub for DnsServiceBrowse.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 0440cb4b02991f2c827304c538b6420127c68da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0440cb4b02991f2c827304c538b642… Author: Lucas Chollet <lucas.chollet(a)free.fr> Date: Wed Jun 12 00:45:21 2024 -0400 dnsapi: Add a stub for DnsServiceBrowse. This is needed by Moku (software for scientific instrument). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56828 --- dlls/dnsapi/dnsapi.spec | 1 + dlls/dnsapi/main.c | 10 ++++++++++ include/windns.h | 22 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 0d50c56ec68..a8ffa40a0ae 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -103,6 +103,7 @@ @ stub DnsReplaceRecordSet_UTF8 @ stdcall DnsReplaceRecordSetW(ptr long ptr ptr ptr) @ stub DnsReplaceRecordSet_W +@ stdcall DnsServiceBrowse(ptr ptr) @ stub DnsServiceNotificationDeregister_A @ stub DnsServiceNotificationDeregister_UTF8 @ stub DnsServiceNotificationDeregister_W diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 6324d46e173..9b057a09a05 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -233,3 +233,13 @@ DNS_STATUS WINAPI DnsReplaceRecordSetW( DNS_RECORDW *set, DWORD options, HANDLE FIXME( "(%p, %#lx, %p, %p, %p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } + +/****************************************************************************** + * DnsServiceBrowse [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsServiceBrowse( PDNS_SERVICE_BROWSE_REQUEST request, PDNS_SERVICE_CANCEL cancel) +{ + FIXME( "(%p, %p) stub\n", request, cancel ); + return ERROR_SUCCESS; +} diff --git a/include/windns.h b/include/windns.h index b0b14df1b4f..05d3359b1df 100644 --- a/include/windns.h +++ b/include/windns.h @@ -760,6 +760,27 @@ typedef struct _DNS_CACHE_ENTRY ULONG Flags; } DNS_CACHE_ENTRY, *PDNS_CACHE_ENTRY; +typedef void WINAPI DNS_SERVICE_BROWSE_CALLBACK(DWORD, void *, PDNS_RECORD); +typedef DNS_SERVICE_BROWSE_CALLBACK *PDNS_SERVICE_BROWSE_CALLBACK; + +typedef struct _DNS_SERVICE_BROWSE_REQUEST +{ + ULONG Version; + ULONG InterfaceIndex; + const WCHAR *QueryName; + union + { + PDNS_SERVICE_BROWSE_CALLBACK pBrowseCallback; + DNS_QUERY_COMPLETION_ROUTINE *pBrowseCallbackV2; + }; + void *pQueryContext; +} DNS_SERVICE_BROWSE_REQUEST, *PDNS_SERVICE_BROWSE_REQUEST; + +typedef struct _DNS_SERVICE_CANCEL +{ + void *reserved; +} DNS_SERVICE_CANCEL, *PDNS_SERVICE_CANCEL; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -791,6 +812,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); #define DnsReplaceRecordSet WINELIB_NAME_AW(DnsReplaceRecordSet) +DNS_STATUS WINAPI DnsServiceBrowse(PDNS_SERVICE_BROWSE_REQUEST, PDNS_SERVICE_CANCEL); DNS_STATUS WINAPI DnsValidateName_A(PCSTR,DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_W(PCWSTR, DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_UTF8(PCSTR,DNS_NAME_FORMAT);

1 0

Hans Leidekker : winscard: Pass ATR buffer to unixlib in SCardStatusA().
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: e6f9cb1e0935a0381ea54663dc61886677d1bb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/e6f9cb1e0935a0381ea54663dc6188… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 11 10:18:20 2024 +0200 winscard: Pass ATR buffer to unixlib in SCardStatusA(). --- dlls/winscard/winscard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 7e53fba45f6..8749f5ea795 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -292,7 +292,7 @@ LONG WINAPI SCardStatusA( SCARDHANDLE connect, char *names, DWORD *names_len, DW params.names_len = &names_len_utf8; params.state = &state64; params.protocol = &protocol64; - params.atr = NULL; + params.atr = atr; if (!atr_len) params.atr_len = NULL; else {

1 0

Alex Henrie : ntdll/tests: Remove unused WINE_CRASH flag.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: af33e3922c155747d49d2958081c47fcc372cfc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/af33e3922c155747d49d2958081c47… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 11 23:40:15 2024 -0600 ntdll/tests: Remove unused WINE_CRASH flag. --- dlls/ntdll/tests/reg.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 58cefd6ed30..fe36ce41a29 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2548,7 +2548,6 @@ struct query_reg_values_test WINE_TODO_TYPE = 0x80, WINE_TODO_SIZE = 0x100, WINE_TODO_DATA = 0x200, - WINE_CRASH = 0x400, } flags; ULONG expected_type; @@ -2817,12 +2816,6 @@ static void test_RtlQueryRegistryValues(void) const WCHAR *expected_data; ULONG expected_size; - if ((test->flags & WINE_CRASH) && !strcmp(winetest_platform, "wine")) - { - skip("Currently crashes on Wine\n"); - continue; - } - winetest_push_context("%u/%Iu", i, ARRAY_SIZE(query_reg_values_tests) - 1); for (query = test->query_table; query->QueryRoutine || query->Name; query++)

1 0

Alex Henrie : ntdll: Don't call a null QueryRoutine in RtlQueryRegistryValues.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 2bc3b7f8502a7ef9293f7a1f74fdf6f7430ad03b URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc3b7f8502a7ef9293f7a1f74fdf6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 11 23:40:15 2024 -0600 ntdll: Don't call a null QueryRoutine in RtlQueryRegistryValues. --- dlls/ntdll/reg.c | 4 ++-- dlls/ntdll/tests/reg.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 37619db2032..d4bf530537a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -265,7 +265,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, memcpy(str->Buffer, pQuery->DefaultData, default_size); return STATUS_SUCCESS; } - else + else if (pQuery->QueryRoutine) { status = pQuery->QueryRoutine(pQuery->Name, pQuery->DefaultType, pQuery->DefaultData, pQuery->DefaultLength, pContext, pQuery->EntryContext); @@ -336,7 +336,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, break; } } - else + else if (pQuery->QueryRoutine) { if((pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND) || (pInfo->Type != REG_EXPAND_SZ && pInfo->Type != REG_MULTI_SZ)) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index acb6967fc7b..58cefd6ed30 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2636,7 +2636,11 @@ static struct query_reg_values_test query_reg_values_tests[] = /* Name without query routine or DIRECT */ { {{ NULL, 0, (WCHAR*)L"WindowsDrive" }}, - STATUS_SUCCESS, 0, WINE_CRASH + STATUS_SUCCESS, 0 + }, + { + {{ NULL, 0, (WCHAR*)L"I don't exist", NULL, REG_SZ, (WCHAR*)L"Some default" }}, + STATUS_SUCCESS, 0 }, /* The query routine is called for every value in current key */ {

1 0