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

Alexandre Julliard : ntdll: Move RtlIsProcessorFeaturePresent implementation to the CPU backends.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 0051e102cccee6fd461474324e32da947a9fb963 URL: https://gitlab.winehq.org/wine/wine/-/commit/0051e102cccee6fd461474324e32da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 11:16:57 2024 +0200 ntdll: Move RtlIsProcessorFeaturePresent implementation to the CPU backends. --- dlls/ntdll/rtl.c | 35 ----------------------------------- dlls/ntdll/signal_arm.c | 9 +++++++++ dlls/ntdll/signal_arm64.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 10 ++++++++++ dlls/ntdll/signal_i386.c | 9 +++++++++ dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 6 files changed, 68 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1288b57f11c..3dff04e52c9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -34,7 +34,6 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "in6addr.h" -#include "ddk/ntddk.h" #include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -1421,40 +1420,6 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Reserved = 0; } -/*********************************************************************** - * RtlIsProcessorFeaturePresent [NTDLL.@] - */ -BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) -{ -#ifdef __aarch64__ - static const ULONGLONG arm64_features = - (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | - (1ull << PF_NX_ENABLED) | - (1ull << PF_ARM_VFP_32_REGISTERS_AVAILABLE) | - (1ull << PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_SECOND_LEVEL_ADDRESS_TRANSLATION) | - (1ull << PF_FASTFAIL_AVAILABLE) | - (1ull << PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) | - (1ull << PF_ARM_64BIT_LOADSTORE_ATOMIC) | - (1ull << PF_ARM_EXTERNAL_CACHE_AVAILABLE) | - (1ull << PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE); - - return (feature < PROCESSOR_FEATURE_MAX && (arm64_features & (1ull << feature)) && - user_shared_data->ProcessorFeatures[feature]); -#elif defined _WIN64 - return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; -#else - return NtWow64IsProcessorFeaturePresent( feature ); -#endif -} - /*********************************************************************** * RtlInitializeGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index aeed022d78f..595eb71a81e 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -566,6 +566,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return NtWow64IsProcessorFeaturePresent( feature ); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8b4fea80bb6..0531083ba4e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -31,6 +31,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" @@ -600,6 +601,35 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + static const ULONGLONG arm64_features = + (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | + (1ull << PF_NX_ENABLED) | + (1ull << PF_ARM_VFP_32_REGISTERS_AVAILABLE) | + (1ull << PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_SECOND_LEVEL_ADDRESS_TRANSLATION) | + (1ull << PF_FASTFAIL_AVAILABLE) | + (1ull << PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) | + (1ull << PF_ARM_64BIT_LOADSTORE_ATOMIC) | + (1ull << PF_ARM_EXTERNAL_CACHE_AVAILABLE) | + (1ull << PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE); + + return (feature < PROCESSOR_FEATURE_MAX && (arm64_features & (1ull << feature)) && + user_shared_data->ProcessorFeatures[feature]); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9fde2a4a715..44b026fc044 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -28,6 +28,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" #include "ntdll_misc.h" @@ -1204,6 +1205,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a6c47f1226b..8f11d19024b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -461,6 +461,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return NtWow64IsProcessorFeaturePresent( feature ); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f491f07282e..0daf27f6850 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -32,6 +32,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" #include "ntdll_misc.h" @@ -802,6 +803,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move the IP string conversion functions to rtlstr.c.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: b2017a48dcb7fca3c0436a7f178649655f91de04 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2017a48dcb7fca3c0436a7f178649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 11:33:58 2024 +0200 ntdll: Move the IP string conversion functions to rtlstr.c. --- dlls/ntdll/rtl.c | 641 ---------------------------------------------------- dlls/ntdll/rtlstr.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 605 insertions(+), 641 deletions(-)

1 0

Elizabeth Figura : ntdll: Remove the redundant filling of the IOSB in NtDeviceIoControlFile().
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 0e928ccaea0c03da28fca2d7356402c6c2357cc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e928ccaea0c03da28fca2d7356402… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 25 19:13:31 2022 -0500 ntdll: Remove the redundant filling of the IOSB in NtDeviceIoControlFile(). --- dlls/ntdll/unix/file.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 429f8839ed2..e521dd44686 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6120,7 +6120,6 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT case FILE_DEVICE_BEEP: case FILE_DEVICE_NETWORK: status = sock_ioctl( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_NOT_SUPPORTED && status != STATUS_BAD_DEVICE_TYPE) return status; break; case FILE_DEVICE_DISK: case FILE_DEVICE_CD_ROM: @@ -6143,8 +6142,6 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - - if (status != STATUS_PENDING && !NT_ERROR(status)) io->Status = status; return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in cdrom_DeviceIoControl().
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 5f76f07bff03dc80453cf742be1fe23781c12d92 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f76f07bff03dc80453cf742be1fe2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:36:30 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in cdrom_DeviceIoControl(). Synchronous NT_ERROR conditions should not touch the IOSB or signal completion. --- dlls/ntdll/unix/cdrom.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 45b61d54d05..427e559968f 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2822,18 +2822,13 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc TRACE( "%p %s %p %d %p %d %p\n", device, iocodex(code), in_buffer, in_size, out_buffer, out_size, io ); - io->Information = 0; - if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) - { - if (status == STATUS_BAD_DEVICE_TYPE) return status; /* no associated fd */ - goto error; - } + return status; if ((status = CDROM_Open(fd, &dev))) { if (needs_close) close( fd ); - goto error; + return status; } #ifdef __APPLE__ @@ -2847,16 +2842,13 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc * Also for some reason it wants the fd to be closed before we even * open the parent if we're trying to eject the disk. */ - if ((status = get_parent_device( fd, name, sizeof(name) ))) goto error; + if ((status = get_parent_device( fd, name, sizeof(name) ))) return status; if (code == IOCTL_STORAGE_EJECT_MEDIA) NtClose( device ); if (needs_close) close( fd ); TRACE("opening parent %s\n", name ); if ((fd = open( name, O_RDONLY )) == -1) - { - status = errno_to_status( errno ); - goto error; - } + return errno_to_status( errno ); needs_close = 1; } #endif @@ -3117,13 +3109,14 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc break; default: - if (needs_close) close( fd ); - return STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; } if (needs_close) close( fd ); - error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent(event, NULL); + } return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in serial_DeviceIoControl().
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 98b99b65690bbe7779ed01352f757c41dd9e8a34 URL: https://gitlab.winehq.org/wine/wine/-/commit/98b99b65690bbe7779ed01352f757c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:37:32 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in serial_DeviceIoControl(). We should never fill the IOSB or signal completion for NT_ERROR conditions. --- dlls/ntdll/unix/serial.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ea9931d891a..a8abee6eeb6 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1261,14 +1261,12 @@ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE ap return STATUS_NOT_SUPPORTED; } - io->Information = 0; - - if ((status = server_get_unix_fd( device, access, &fd, &needs_close, &type, NULL ))) goto error; + if ((status = server_get_unix_fd( device, access, &fd, &needs_close, &type, NULL ))) + return status; if (type != FD_TYPE_SERIAL) { if (needs_close) close( fd ); - status = STATUS_OBJECT_TYPE_MISMATCH; - goto error; + return STATUS_OBJECT_TYPE_MISMATCH; } switch (code) @@ -1455,11 +1453,15 @@ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE ap status = STATUS_INVALID_PARAMETER; break; } + if (needs_close) close( fd ); - error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); + + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent(event, NULL); + } return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in tape_DeviceIoControl().
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 86be09ac0bc87f081a1e8abc7f43ed3e98ffb9c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/86be09ac0bc87f081a1e8abc7f43ed… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:38:02 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in tape_DeviceIoControl(). We should never fill the IOSB or signal completion for NT_ERROR conditions. --- dlls/ntdll/unix/tape.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 48807dbca7a..f513e558898 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -528,9 +528,8 @@ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, TRACE( "%p %s %p %d %p %d %p\n", device, io2str(code), in_buffer, in_size, out_buffer, out_size, io ); - io->Information = 0; - - if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) goto error; + if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) + return status; switch (code) { @@ -580,9 +579,11 @@ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, if (needs_close) close( fd ); -error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent( event, NULL ); + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent( event, NULL ); + } return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB in NtFsControlFile() on failure.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 1dee9881e2dfe6a31692aa96aa97dabc8c9de9e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1dee9881e2dfe6a31692aa96aa97da… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:26:38 2024 -0500 ntdll: Do not fill the IOSB in NtFsControlFile() on failure. --- dlls/ntdll/unix/file.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e521dd44686..c128e8aa369 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6225,14 +6225,12 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap } else { - io->Information = 0; status = STATUS_BUFFER_TOO_SMALL; } break; } case FSCTL_GET_REPARSE_POINT: - io->Information = 0; if (out_buffer && out_size) { FIXME("FSCTL_GET_REPARSE_POINT semi-stub\n"); @@ -6247,7 +6245,6 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap int fd, needs_close; struct stat st; - io->Information = 0; if (out_size >= sizeof(*info)) { status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); @@ -6273,7 +6270,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap in_buffer, in_size, out_buffer, out_size ); } - if (status != STATUS_PENDING) io->Status = status; + if (!NT_ERROR(status) && status != STATUS_PENDING) io->Status = status; return status; }

1 0

Alex Henrie : ntdll: Don't write partial strings with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 7dad7e87a9d08b367bc6b5416b0df7711c3e6e35 URL: https://gitlab.winehq.org/wine/wine/-/commit/7dad7e87a9d08b367bc6b5416b0df7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 20 23:16:19 2024 -0600 ntdll: Don't write partial strings with RTL_QUERY_REGISTRY_DIRECT. The new tests revealed only one case where too-small buffers were not already being handled correctly. --- dlls/ntdll/reg.c | 3 ++- dlls/ntdll/tests/reg.c | 54 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 137bd63c0a8..a70f95a6807 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -327,7 +327,8 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); str->MaximumLength = len; } - len = min(len, str->MaximumLength); + else if (str->MaximumLength < len) + return STATUS_BUFFER_TOO_SMALL; len -= sizeof(WCHAR); memcpy(str->Buffer, ((CHAR*)pInfo) + pInfo->DataOffset, len); str->Buffer[len / sizeof(WCHAR)] = 0; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ca30eabcb9c..2bd77290ab9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2624,7 +2624,8 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, return STATUS_SUCCESS; } -static UNICODE_STRING query_reg_values_direct_str; +static WCHAR query_reg_values_direct_str_buf[32]; +static UNICODE_STRING query_reg_values_direct_str = {0, 0, query_reg_values_direct_str_buf}; static ULONG query_reg_values_direct_int; @@ -2689,16 +2690,25 @@ static struct query_reg_values_test query_reg_values_tests[] = }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, 0, REG_SZ, L"C:" + STATUS_SUCCESS, 0, 0, REG_NONE, L"C:" + }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_NONE, L"\x2323", 0, 2 * sizeof(WCHAR) }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, 0, REG_SZ, L"%SYSTEMDRIVE%" + STATUS_SUCCESS, 0, 0, REG_NONE, L"%SYSTEMDRIVE%" + }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive", + &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_NONE, L"\x2323", 0, 2 * sizeof(WCHAR) }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"MeaningOfLife32", &query_reg_values_direct_int }}, - STATUS_SUCCESS, 0, 0, REG_DWORD, (WCHAR*)42 + STATUS_SUCCESS, 0, 0, REG_NONE, (WCHAR*)42 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"MeaningOfLife64", &query_reg_values_direct_sized }}, @@ -2724,7 +2734,12 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, 0, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") + STATUS_SUCCESS, 0, 0, REG_NONE, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") + }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", + &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_NONE, L"\x2323", 0, 2 * sizeof(WCHAR) }, /* DIRECT with a null buffer crashes on Windows */ /* { @@ -2788,15 +2803,25 @@ static struct query_reg_values_test query_reg_values_tests[] = &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, + STATUS_SUCCESS, 0, 0, REG_NONE, L"\x2323", 0, 2 * sizeof(WCHAR) + }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, WINE_TODO_SIZE | WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" + STATUS_SUCCESS, 0, WINE_TODO_SIZE | WINE_TODO_DATA, REG_NONE, L"C:" + }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, + STATUS_SUCCESS, 0, WINE_TODO_SIZE, REG_NONE, L"\x2323", 0, 2 * sizeof(WCHAR) }, /* DIRECT with a multi-string default value crashes on Windows */ /* { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", - &query_reg_values_direct_str, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C\0", sizeof(L"A\0B\0C\0") }}, + &query_reg_values_direct_str, REG_NONE, (WCHAR*)L"A\0B\0C\0", sizeof(L"A\0B\0C\0") }}, STATUS_SUCCESS, EXPECT_DEFAULT_DATA }, */ /* The default value is not used if it is not valid */ @@ -2871,10 +2896,6 @@ static void test_RtlQueryRegistryValues(void) L"Yellow", sizeof(L"Yellow")); ok(status == ERROR_SUCCESS, "Failed to create registry value Color: %lu\n", status); - query_reg_values_direct_str.MaximumLength = 32 * sizeof(WCHAR); - query_reg_values_direct_str.Buffer = pRtlAllocateHeap(GetProcessHeap(), 0, - query_reg_values_direct_str.MaximumLength); - for (i = 0; i < ARRAY_SIZE(query_reg_values_tests); i++) { struct query_reg_values_test *test = &query_reg_values_tests[i]; @@ -2893,9 +2914,14 @@ static void test_RtlQueryRegistryValues(void) query_routine_calls = 0; - query_reg_values_direct_str.Length = query_reg_values_direct_str.MaximumLength - sizeof(WCHAR); + query_reg_values_direct_str.MaximumLength = test->size_limit ? test->size_limit + : sizeof(query_reg_values_direct_str_buf); + if (query_reg_values_direct_str.MaximumLength >= sizeof(WCHAR)) + query_reg_values_direct_str.Length = query_reg_values_direct_str.MaximumLength - sizeof(WCHAR); + else + query_reg_values_direct_str.Length = 0; memset(query_reg_values_direct_str.Buffer, 0x23, query_reg_values_direct_str.Length); - query_reg_values_direct_str.Buffer[query_reg_values_direct_str.Length] = 0; + query_reg_values_direct_str.Buffer[query_reg_values_direct_str.Length / sizeof(WCHAR)] = 0; query_reg_values_direct_int = 1; @@ -2992,8 +3018,6 @@ static void test_RtlQueryRegistryValues(void) status = RegDeleteKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"WindowsDrive"); ok(status == ERROR_FILE_NOT_FOUND, "Registry value WindowsDrive should have been deleted already\n"); - - pRtlFreeHeap(GetProcessHeap(), 0, query_reg_values_direct_str.Buffer); } START_TEST(reg)

1 0

Alex Henrie : ntdll: Fix type and size of expanded strings in RtlQueryRegistryValues.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: c77a217d34a7fb64915ddae89261868172c85a6b URL: https://gitlab.winehq.org/wine/wine/-/commit/c77a217d34a7fb64915ddae8926186… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 20 23:16:19 2024 -0600 ntdll: Fix type and size of expanded strings in RtlQueryRegistryValues. --- dlls/ntdll/reg.c | 3 +-- dlls/ntdll/tests/reg.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a70f95a6807..d39c1a34bb7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -376,8 +376,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, dst.MaximumLength = res; dst.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, res * sizeof(WCHAR)); RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res); - status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, dst.Buffer, - dst.Length, pContext, pQuery->EntryContext); + status = pQuery->QueryRoutine(pQuery->Name, REG_SZ, dst.Buffer, res, pContext, pQuery->EntryContext); RtlFreeHeap(GetProcessHeap(), 0, dst.Buffer); } else /* REG_MULTI_SZ */ diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2bd77290ab9..e1ca45b9320 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2863,7 +2863,7 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DELETE deletes the value after reading it */ { {{ query_routine, RTL_QUERY_REGISTRY_DELETE, (WCHAR*)L"WindowsDrive" }}, - STATUS_SUCCESS, 1, WINE_TODO_TYPE | WINE_TODO_SIZE, REG_SZ, L"C:" + STATUS_SUCCESS, 1, 0, REG_SZ, L"C:" }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_SZ, (WCHAR*)L"Some default" }},

1 0

Rémi Bernon : server: Mark block as writable in mark_block_uninitialized.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 33a9097bb4dcccb9d21e4dbc7ef00f3d93bda960 URL: https://gitlab.winehq.org/wine/wine/-/commit/33a9097bb4dcccb9d21e4dbc7ef00f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 01:06:05 2024 +0200 server: Mark block as writable in mark_block_uninitialized. Before writing to it, it may have been marked as noaccess before in free_shared_object. --- server/object.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/object.c b/server/object.c index 3b72b576d50..36c9c60fb65 100644 --- a/server/object.c +++ b/server/object.c @@ -116,6 +116,11 @@ void mark_block_noaccess( void *ptr, size_t size ) /* mark a block of memory as uninitialized for debugging purposes */ void mark_block_uninitialized( void *ptr, size_t size ) { +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); +#endif memset( ptr, 0x55, size ); #if defined(VALGRIND_MAKE_MEM_UNDEFINED) VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));

1 0