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

Alexandre Julliard : wow64: Add NtTerminateProcess CPU backend notifications.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: ae0f18544ed574d0b33478098c624f3d947638fb URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0f18544ed574d0b33478098c624f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 15:46:27 2024 +0200 wow64: Add NtTerminateProcess CPU backend notifications. --- dlls/ntdll/tests/wow64.c | 20 ++++++++++++++++++++ dlls/wow64/process.c | 7 ++++++- dlls/wow64/syscall.c | 2 ++ dlls/wow64/wow64_private.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 94420cdab4a..b8b1c11bb7d 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1841,6 +1841,26 @@ static void test_notifications( HMODULE module, CROSS_PROCESS_WORK_LIST *list ) WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); } + if ((ptr = hook_notification_function( module, "BTCpuProcessTerm", "ProcessTerm" ))) + { + struct expected_notification expect[2] = + { + { 3, { 0, 0, 0 } }, + { 3, { 0, 1, 0 } } + }; + + reset_results( results ); + status = NtTerminateProcess( (HANDLE)0xdead, 0xbeef ); + ok( status == STATUS_INVALID_HANDLE, "NtTerminateProcess failed %lx\n", status ); + expect_notifications( results, 0, NULL ); + + status = NtTerminateProcess( 0, 0xbeef ); + ok( !status, "NtTerminateProcess failed %lx\n", status ); + expect_notifications( results, 2, expect ); + + WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); + } + NtClose( mapping ); NtClose( file ); VirtualFree( code, 0, MEM_RELEASE ); diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 9b80d885b6a..d117c158096 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1061,7 +1061,12 @@ NTSTATUS WINAPI wow64_NtTerminateProcess( UINT *args ) HANDLE handle = get_handle( &args ); LONG exit_code = get_ulong( &args ); - return NtTerminateProcess( handle, exit_code ); + NTSTATUS status; + + if (!handle && pBTCpuProcessTerm) pBTCpuProcessTerm( handle, FALSE, 0 ); + status = NtTerminateProcess( handle, exit_code ); + if (!handle && pBTCpuProcessTerm) pBTCpuProcessTerm( handle, TRUE, status ); + return status; } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 5ddd46ba7b9..55433f13569 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -115,6 +115,7 @@ void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ) = NULL; NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; +void (WINAPI *pBTCpuProcessTerm)( HANDLE, BOOL, NTSTATUS ) = NULL; void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ) = NULL; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -814,6 +815,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuNotifyReadFile ); GET_PTR( BTCpuNotifyUnmapViewOfSection ); GET_PTR( BTCpuUpdateProcessorInformation ); + GET_PTR( BTCpuProcessTerm ); GET_PTR( BTCpuThreadTerm ); GET_PTR( __wine_get_unix_opcode ); diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index d5278443d5d..deca72d445c 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -49,6 +49,7 @@ extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG, BOOL extern void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ); +extern void (WINAPI *pBTCpuProcessTerm)( HANDLE, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ); struct object_attr64

1 0

Alexandre Julliard : ntdll: Call the terminate thread callback on ARM64EC.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: c1b468ba48abd1219038c073341a414550605a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/c1b468ba48abd1219038c073341a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 14:28:32 2024 +0200 ntdll: Call the terminate thread callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 10 +++++++++- dlls/xtajit64/cpu.c | 9 +++++++++ dlls/xtajit64/xtajit64.spec | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index b5ecb643bdb..49d66b517dd 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -52,6 +52,7 @@ static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS) static void (WINAPI *pNotifyUnmapViewOfSection)(void*,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); +static void (WINAPI *pThreadTerm)(HANDLE,LONG); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); static BOOLEAN emulated_processor_features[PROCESSOR_FEATURE_MAX]; @@ -163,6 +164,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( NotifyUnmapViewOfSection ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); + GET_PTR( ThreadTerm ); GET_PTR( UpdateProcessorInformation ); #undef GET_PTR @@ -431,7 +433,7 @@ DEFINE_SYSCALL(NtSuspendThread, (HANDLE handle, ULONG *count)) DEFINE_SYSCALL(NtSystemDebugControl, (SYSDBG_COMMAND command, void *in_buff, ULONG in_len, void *out_buff, ULONG out_len, ULONG *retlen)) DEFINE_SYSCALL(NtTerminateJobObject, (HANDLE handle, NTSTATUS status)) DEFINE_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) -DEFINE_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) +DEFINE_WRAPPED_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) DEFINE_SYSCALL(NtTestAlert, (void)) DEFINE_SYSCALL(NtTraceControl, (ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size)) DEFINE_SYSCALL(NtUnloadDriver, (const UNICODE_STRING *name)) @@ -638,6 +640,12 @@ NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) return syscall_NtSetContextThread( handle, &arm_ctx ); } +NTSTATUS SYSCALL_API NtTerminateThread( HANDLE handle, LONG exit_code ) +{ + if (pThreadTerm) pThreadTerm( handle, exit_code ); + return syscall_NtTerminateThread( handle, exit_code ); +} + NTSTATUS SYSCALL_API NtUnmapViewOfSection( HANDLE process, void *addr ) { BOOL is_current = RtlIsCurrentProcess( process ); diff --git a/dlls/xtajit64/cpu.c b/dlls/xtajit64/cpu.c index 82d741dde82..91446aa1676 100644 --- a/dlls/xtajit64/cpu.c +++ b/dlls/xtajit64/cpu.c @@ -202,6 +202,15 @@ NTSTATUS WINAPI ThreadInit(void) } +/********************************************************************** + * ThreadTerm (xtajit64.@) + */ +void WINAPI ThreadTerm( HANDLE handle, LONG exit_code ) +{ + TRACE( "%p %lx\n", handle, exit_code ); +} + + /********************************************************************** * UpdateProcessorInformation (xtajit64.@) */ diff --git a/dlls/xtajit64/xtajit64.spec b/dlls/xtajit64/xtajit64.spec index 83d8e56dd2d..bfc6c41c4b0 100644 --- a/dlls/xtajit64/xtajit64.spec +++ b/dlls/xtajit64/xtajit64.spec @@ -16,5 +16,5 @@ #@ stub ProcessTerm #@ stub ResetToConsistentState @ stdcall ThreadInit() -#@ stub ThreadTerm +@ stdcall ThreadTerm(ptr long) @ stdcall UpdateProcessorInformation(ptr)

1 0

Alexandre Julliard : ntdll: Call the terminate process callback on ARM64EC.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 917e4c97431f4e3390feac3d9447fe55964e0d90 URL: https://gitlab.winehq.org/wine/wine/-/commit/917e4c97431f4e3390feac3d9447fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 15:50:34 2024 +0200 ntdll: Call the terminate process callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 18 +++++++++++++++++- dlls/xtajit64/cpu.c | 9 +++++++++ dlls/xtajit64/xtajit64.spec | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 49d66b517dd..20eb5ff662e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -51,6 +51,7 @@ static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyUnmapViewOfSection)(void*,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); +static void (WINAPI *pProcessTerm)(HANDLE,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pThreadInit)(void); static void (WINAPI *pThreadTerm)(HANDLE,LONG); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); @@ -163,6 +164,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( NotifyMemoryProtect ); GET_PTR( NotifyUnmapViewOfSection ); GET_PTR( ProcessInit ); + GET_PTR( ProcessTerm ); GET_PTR( ThreadInit ); GET_PTR( ThreadTerm ); GET_PTR( UpdateProcessorInformation ); @@ -432,7 +434,7 @@ DEFINE_SYSCALL(NtSuspendProcess, (HANDLE handle)) DEFINE_SYSCALL(NtSuspendThread, (HANDLE handle, ULONG *count)) DEFINE_SYSCALL(NtSystemDebugControl, (SYSDBG_COMMAND command, void *in_buff, ULONG in_len, void *out_buff, ULONG out_len, ULONG *retlen)) DEFINE_SYSCALL(NtTerminateJobObject, (HANDLE handle, NTSTATUS status)) -DEFINE_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) +DEFINE_WRAPPED_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) DEFINE_WRAPPED_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) DEFINE_SYSCALL(NtTestAlert, (void)) DEFINE_SYSCALL(NtTraceControl, (ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size)) @@ -640,6 +642,20 @@ NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) return syscall_NtSetContextThread( handle, &arm_ctx ); } +NTSTATUS SYSCALL_API NtTerminateProcess( HANDLE handle, LONG exit_code ) +{ + NTSTATUS status; + + if (!handle && pProcessTerm) + { + pProcessTerm( handle, FALSE, 0 ); + status = syscall_NtTerminateProcess( handle, exit_code ); + pProcessTerm( handle, TRUE, status ); + return status; + } + return syscall_NtTerminateProcess( handle, exit_code ); +} + NTSTATUS SYSCALL_API NtTerminateThread( HANDLE handle, LONG exit_code ) { if (pThreadTerm) pThreadTerm( handle, exit_code ); diff --git a/dlls/xtajit64/cpu.c b/dlls/xtajit64/cpu.c index 91446aa1676..fec5f233eec 100644 --- a/dlls/xtajit64/cpu.c +++ b/dlls/xtajit64/cpu.c @@ -193,6 +193,15 @@ NTSTATUS WINAPI ProcessInit(void) } +/********************************************************************** + * ProcessTerm (xtajit64.@) + */ +void WINAPI ProcessTerm( HANDLE handle, BOOL is_post, NTSTATUS status ) +{ + TRACE( "%p\n", handle ); +} + + /********************************************************************** * ThreadInit (xtajit64.@) */ diff --git a/dlls/xtajit64/xtajit64.spec b/dlls/xtajit64/xtajit64.spec index bfc6c41c4b0..2da5d1dc49b 100644 --- a/dlls/xtajit64/xtajit64.spec +++ b/dlls/xtajit64/xtajit64.spec @@ -13,7 +13,7 @@ @ stdcall NotifyMemoryProtect(ptr long long long long) @ stdcall NotifyUnmapViewOfSection(ptr long long) @ stdcall ProcessInit() -#@ stub ProcessTerm +@ stdcall ProcessTerm(ptr long long) #@ stub ResetToConsistentState @ stdcall ThreadInit() @ stdcall ThreadTerm(ptr long)

1 0

Biswapriyo Nath : include: Fix typo with X3DAUDIO_EMITTER structure in x3daudio.h.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 2ade43faac40095bd01253600968778441d2f236 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ade43faac40095bd0125360096877… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jul 11 12:53:00 2024 +0000 include: Fix typo with X3DAUDIO_EMITTER structure in x3daudio.h. --- include/x3daudio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/x3daudio.h b/include/x3daudio.h index 26e2d1df728..e9685127e02 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -68,8 +68,8 @@ typedef struct X3DAUDIO_EMITTER { X3DAUDIO_DISTANCE_CURVE *pLPFDirectCurve; X3DAUDIO_DISTANCE_CURVE *pLPFReverbCurve; X3DAUDIO_DISTANCE_CURVE *pReverbCurve; - float CurveDistanceScalar; - float DopplerScalar; + float CurveDistanceScaler; + float DopplerScaler; } X3DAUDIO_EMITTER; typedef struct X3DAUDIO_DSP_SETTINGS {

1 0

Dmitry Timoshkov : crypt32: Make CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) work.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 23a042dd0611fd0cb8c2887f4b4b0d9a836a9237 URL: https://gitlab.winehq.org/wine/wine/-/commit/23a042dd0611fd0cb8c2887f4b4b0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 18 14:21:39 2023 +0300 crypt32: Make CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) work. 1. dwType (CERT_INFO_xxxx_FLAG) is not a mask. CERT_INFO_xxxx_FLAGs have values from 0 to 11, so for instance CERT_INFO_SUBJECT_FLAG is equal to 7 and CERT_INFO_ISSUER_FLAG is equal to 4. 2. CERT_COMPARE_xxxx have values from 0 to 10, so CERT_COMPARE_NAME is equal to 2 and CERT_COMPARE_SUBJECT_CERT is equal to 11, therefore combining CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT doesn't make sense. 3. Because of 1 and 2 CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) currently looks up a certificate by Subject instead of Issuer. Fixing just one of the problems above leads to test failures. Existing tests work because they use a self-signed certificate where Issuer and Subject are the same. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 373805e858f..7b1edaa2236 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1482,10 +1482,15 @@ static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType, CERT_NAME_BLOB *blob = (CERT_NAME_BLOB *)pvPara, *toCompare; BOOL ret; - if (dwType & CERT_INFO_SUBJECT_FLAG) + if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_SUBJECT_FLAG) toCompare = &pCertContext->pCertInfo->Subject; - else + else if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_ISSUER_FLAG) toCompare = &pCertContext->pCertInfo->Issuer; + else + { + ERR("dwType %08lx doesn't specify SUBJECT or ISSUER\n", dwType); + return FALSE; + } ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, toCompare, blob); return ret; @@ -1735,7 +1740,7 @@ static PCCERT_CONTEXT find_cert_by_issuer(HCERTSTORE store, DWORD dwType, } else found = cert_compare_certs_in_store(store, prev, - compare_cert_by_name, CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT, + compare_cert_by_name, CERT_FIND_SUBJECT_NAME, dwFlags, &subject->pCertInfo->Issuer); return found; } @@ -1747,7 +1752,7 @@ static BOOL compare_cert_by_name_str(PCCERT_CONTEXT pCertContext, DWORD len; BOOL ret = FALSE; - if (dwType & CERT_INFO_SUBJECT_FLAG) + if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_SUBJECT_FLAG) name = &pCertContext->pCertInfo->Subject; else name = &pCertContext->pCertInfo->Issuer;

1 0

Alex Henrie : ntdll: Double-null-terminate registry multi-strings in RtlQueryRegistryValues.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 8285539b40a225919af16a8cc66f96fbf8787fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8285539b40a225919af16a8cc66f96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 10 22:37:21 2024 -0600 ntdll: Double-null-terminate registry multi-strings in RtlQueryRegistryValues. This reverts most of commit 2821a850d401dfabc5d76a4f40b0d6a42045fc5e which was a partial and ultimately improper solution. --- dlls/ntdll/reg.c | 32 ++++++++++++++++++++++---------- dlls/ntdll/tests/reg.c | 18 ++++++++++++++---- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 934124a0360..fb16f6d2dc6 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -254,6 +254,16 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, type = pInfo->Type; data = (WCHAR*)((char*)pInfo + pInfo->DataOffset); len = pInfo->DataLength; + + /* Ensure that multi-strings from the registry are double-null-terminated */ + if (type == REG_MULTI_SZ) + { + while (len < 2 * sizeof(WCHAR) || data[len / sizeof(WCHAR) - 2] || data[len / sizeof(WCHAR) - 1]) + { + data[len / sizeof(WCHAR)] = 0; + len += sizeof(WCHAR); + } + } } else { @@ -275,10 +285,13 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, break; case REG_MULTI_SZ: - for (wstr = data; *wstr; wstr += count) + wstr = data; + for (;;) { count = wcslen(wstr) + 1; len += count * sizeof(WCHAR); + if (!*wstr) break; + wstr += count; } break; } @@ -322,7 +335,6 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (!(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) return STATUS_INVALID_PARAMETER; - len += sizeof(WCHAR); if (str->Buffer == NULL) { str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); @@ -330,10 +342,8 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } else if (str->MaximumLength < len) return STATUS_BUFFER_TOO_SMALL; - len -= sizeof(WCHAR); memcpy(str->Buffer, data, len); - str->Buffer[len / sizeof(WCHAR)] = 0; - str->Length = len; + str->Length = (len >= sizeof(WCHAR) ? len - sizeof(WCHAR) : len); break; default: @@ -379,7 +389,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } else /* REG_MULTI_SZ */ { - for (offset = 0; offset < len; offset += count) + for (offset = 0; offset + 2 * sizeof(WCHAR) < len; offset += count) { wstr = (WCHAR*)((char*)data + offset); count = (wcslen(wstr) + 1) * sizeof(WCHAR); @@ -544,9 +554,10 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, if (status == STATUS_NO_MORE_ENTRIES) break; if (status == STATUS_BUFFER_OVERFLOW || - status == STATUS_BUFFER_TOO_SMALL) + status == STATUS_BUFFER_TOO_SMALL || + (status == STATUS_SUCCESS && pInfo->Type == REG_MULTI_SZ && buflen < len + 2 * sizeof(L'\0'))) { - buflen = len; + buflen = len + 2 * sizeof(L'\0'); RtlFreeHeap(GetProcessHeap(), 0, pInfo); pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); NtEnumerateValueKey(handle, i, KeyValueFullInformation, @@ -578,9 +589,10 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, status = NtQueryValueKey(handle, &Value, KeyValueFullInformation, pInfo, buflen, &len); if (status == STATUS_BUFFER_OVERFLOW || - status == STATUS_BUFFER_TOO_SMALL) + status == STATUS_BUFFER_TOO_SMALL || + (status == STATUS_SUCCESS && pInfo->Type == REG_MULTI_SZ && buflen < len + 2 * sizeof(L'\0'))) { - buflen = len; + buflen = len + 2 * sizeof(L'\0'); RtlFreeHeap(GetProcessHeap(), 0, pInfo); pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); status = NtQueryValueKey(handle, &Value, diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b9047c41972..3f41856e4d1 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2770,7 +2770,7 @@ static struct query_reg_values_test query_reg_values_tests[] = }, { {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope" }}, - STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") + STATUS_SUCCESS, 1, 0, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") }, /* The default value is used if the registry value does not exist */ { @@ -2789,6 +2789,16 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0%PATH%\0" }}, STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", + NULL, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") }}, + STATUS_SUCCESS, 2, EXPECT_DEFAULT_DATA | SPLIT_MULTI + }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", + NULL, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") - sizeof(L'\0') }}, + STATUS_SUCCESS, 2, EXPECT_DEFAULT_DATA | SPLIT_MULTI + }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_DWORD, (WCHAR*)0xdeadbeef }}, STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA @@ -2866,8 +2876,8 @@ static struct query_reg_values_test query_reg_values_tests[] = }, */ { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (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") }}, - STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_SIZE + &query_reg_values_direct_str, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") - sizeof(L'\0') }}, + STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA }, /* The default value is not used if it is not valid */ { @@ -2920,7 +2930,7 @@ static void test_RtlQueryRegistryValues(void) ok(status == ERROR_SUCCESS, "Failed to create registry value WindowsDrive: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"CapitalsOfEurope", REG_MULTI_SZ, - L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%")); + L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%") - sizeof(L'\0')); ok(status == ERROR_SUCCESS, "Failed to create registry value CapitalsOfEurope: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"MeaningOfLife32", REG_DWORD,

1 0

Alex Henrie : ntdll/tests: Remove unused WINE_TODO_DATA flag.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 3b8774b016962a24806f9915f7d9fa57b0744fd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b8774b016962a24806f9915f7d9fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 10 22:37:21 2024 -0600 ntdll/tests: Remove unused WINE_TODO_DATA flag. --- dlls/ntdll/tests/reg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3f41856e4d1..f264f42e98d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2547,7 +2547,6 @@ struct query_reg_values_test WINE_TODO_NAME = 0x40, WINE_TODO_TYPE = 0x80, WINE_TODO_SIZE = 0x100, - WINE_TODO_DATA = 0x200, } flags; ULONG expected_type; @@ -2611,7 +2610,6 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, todo_wine_if(test->flags & WINE_TODO_SIZE) ok(value_data_size == expected_size, "Expected size %lu, got %lu\n", expected_size, value_data_size); - todo_wine_if(test->flags & WINE_TODO_DATA && !(test->flags & SPLIT_MULTI && query_routine_calls == 0)) if (expected_data == query->DefaultData || expected_data == NULL) ok(value_data == expected_data, "Expected data %p, got %p\n", expected_data, value_data); else @@ -3024,7 +3022,6 @@ static void test_RtlQueryRegistryValues(void) if (expected_data) { - todo_wine_if(test->flags & WINE_TODO_DATA) ok(!memcmp(query_reg_values_direct_str.Buffer, expected_data, expected_size), "Expected data %s, got %s\n", debugstr_w(expected_data), debugstr_w(query_reg_values_direct_str.Buffer));

1 0

Rémi Bernon : win32u: Check the surface layered nature when reusing window surface.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 800bb91323af078a44e75c5ac341f63df7fbf812 URL: https://gitlab.winehq.org/wine/wine/-/commit/800bb91323af078a44e75c5ac341f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 win32u: Check the surface layered nature when reusing window surface. --- dlls/win32u/window.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ad4d49ca034..7edbbba29bb 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1832,10 +1832,11 @@ static BOOL get_default_window_surface( HWND hwnd, const RECT *surface_rect, str return TRUE; } -static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, +static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, BOOL create_layered, + const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, RECT *surface_rect ) { - BOOL shaped, needs_surface, layered, ulw_layered = FALSE; + BOOL shaped, needs_surface, create_opaque, is_layered; struct window_surface *new_surface; RECT dummy; HRGN shape; @@ -1852,14 +1853,21 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, if (!get_surface_rect( visible_rect, surface_rect )) needs_surface = FALSE; if (!get_default_window_surface( hwnd, surface_rect, &new_surface )) return NULL; + is_layered = new_surface && new_surface->alpha_mask; + create_opaque = !(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED); + + if ((create_opaque && is_layered) || (create_layered && !is_layered)) + { + window_surface_release( new_surface ); + new_surface = &dummy_surface; + window_surface_add_ref( new_surface ); + } + if (!needs_surface || IsRectEmpty( visible_rect )) needs_surface = FALSE; /* use default surface */ else needs_surface = !user_driver->pCreateWindowSurface( hwnd, surface_rect, &new_surface ); - if ((layered = !!(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) - ulw_layered = !NtUserGetLayeredWindowAttributes( hwnd, NULL, NULL, NULL ); - /* create or update window surface for top-level windows if the driver doesn't implement CreateWindowSurface */ - if (needs_surface && new_surface == &dummy_surface && (!layered || !ulw_layered)) + if (needs_surface && new_surface == &dummy_surface && (create_opaque && !create_layered)) { window_surface_release( new_surface ); create_offscreen_window_surface( hwnd, surface_rect, &new_surface ); @@ -2203,7 +2211,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_ TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - surface = create_window_surface( hwnd, swp_flags, &window_rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, swp_flags, TRUE, &window_rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, 0, swp_flags, surface, &window_rect, &client_rect, &visible_rect, NULL ); if (surface) window_surface_release( surface ); @@ -3521,7 +3529,7 @@ BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) calc_ncsize( winpos, &old_window_rect, &old_client_rect, &new_window_rect, &new_client_rect, valid_rects, parent_x, parent_y ); - surface = create_window_surface( winpos->hwnd, winpos->flags, &new_window_rect, &new_client_rect, + surface = create_window_surface( winpos->hwnd, winpos->flags, FALSE, &new_window_rect, &new_client_rect, &visible_rect, &surface_rect ); if (!apply_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, surface, &new_window_rect, &new_client_rect, &visible_rect, valid_rects )) @@ -4320,7 +4328,7 @@ void update_window_state( HWND hwnd ) get_window_rects( hwnd, COORDS_PARENT, &window_rect, &client_rect, get_thread_dpi() ); valid_rects[0] = valid_rects[1] = client_rect; - surface = create_window_surface( hwnd, swp_flags, &window_rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, swp_flags, FALSE, &window_rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, 0, swp_flags, surface, &window_rect, &client_rect, &visible_rect, valid_rects ); if (surface) window_surface_release( surface ); @@ -5364,7 +5372,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, if (cs.x > 0x7fffffff - cx) rect.right = 0x7fffffff; if (cs.y > 0x7fffffff - cy) rect.bottom = 0x7fffffff; - surface = create_window_surface( hwnd, SWP_NOZORDER | SWP_NOACTIVATE, &rect, &rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, SWP_NOZORDER | SWP_NOACTIVATE, FALSE, &rect, &rect, &visible_rect, &surface_rect ); if (!apply_window_pos( hwnd, 0, SWP_NOZORDER | SWP_NOACTIVATE, surface, &rect, &rect, &visible_rect, NULL )) { if (surface) window_surface_release( surface ); @@ -5403,7 +5411,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, send_message( hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&client_rect ); map_window_points( 0, parent, (POINT *)&client_rect, 2, win_dpi ); - surface = create_window_surface( hwnd, SWP_NOACTIVATE, &rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, SWP_NOACTIVATE, FALSE, &rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, insert_after, SWP_NOACTIVATE, surface, &rect, &client_rect, &visible_rect, NULL ); if (surface) window_surface_release( surface ); }

1 0

Jacek Caban : mshtml: Store document node instead of GeckoBrowser in DOMImplementation.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 6d837052658be985d33bdabc9c7295552e27ad70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d837052658be985d33bdabc9c7295… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 21:19:21 2024 +0200 mshtml: Store document node instead of GeckoBrowser in DOMImplementation. --- dlls/mshtml/omnavigator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 7ba92cca10e..04779b76a1e 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -48,7 +48,7 @@ typedef struct { IHTMLDOMImplementation2 IHTMLDOMImplementation2_iface; nsIDOMDOMImplementation *implementation; - GeckoBrowser *browser; + HTMLDocumentNode *doc; } HTMLDOMImplementation; static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation(IHTMLDOMImplementation *iface) @@ -119,7 +119,7 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen FIXME("(%p)->(%s %p)\n", This, debugstr_w(title), new_document); - if(!This->browser) + if(!This->doc || !This->doc->browser) return E_UNEXPECTED; nsAString_InitDepend(&title_str, title); @@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen return E_FAIL; } - hres = create_document_node(doc, This->browser, NULL, dispex_compat_mode(&This->dispex), &new_document_node); + hres = create_document_node(doc, This->doc->browser, NULL, dispex_compat_mode(&This->dispex), &new_document_node); nsIDOMDocument_Release(doc); if(FAILED(hres)) return hres; @@ -197,7 +197,7 @@ static void HTMLDOMImplementation_unlink(DispatchEx *dispex) static void HTMLDOMImplementation_destructor(DispatchEx *dispex) { HTMLDOMImplementation *This = HTMLDOMImplementation_from_DispatchEx(dispex); - assert(!This->browser); + assert(!This->doc); free(This); } @@ -240,7 +240,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; - dom_implementation->browser = doc_node->browser; + dom_implementation->doc = doc_node; init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, doc_node->window, doc_node->document_mode); @@ -258,7 +258,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa void detach_dom_implementation(IHTMLDOMImplementation *iface) { HTMLDOMImplementation *dom_implementation = impl_from_IHTMLDOMImplementation(iface); - dom_implementation->browser = NULL; + dom_implementation->doc = NULL; } typedef struct {

1 0

Jacek Caban : mshtml/tests: Add script context test.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 57af3f1e72122644db3ba5e37b5c44f0f0c0721e URL: https://gitlab.winehq.org/wine/wine/-/commit/57af3f1e72122644db3ba5e37b5c44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 21:20:14 2024 +0200 mshtml/tests: Add script context test. --- dlls/mshtml/tests/es5.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index b04c13de984..3d00f39cbc3 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2658,3 +2658,33 @@ sync_test("builtin_func", function() { ok(f.call(o, "test", 1) === false, 'f.call(o, "test", 1) = ' + f.call(o, "test", 1)); ok("" + f === "\nfunction hasFeature() {\n [native code]\n}\n", "f = " + f); }); + +async_test("script_global", function() { + // Created documents share script global, so their objects are instances of Object from + // the current script context. + var doc = document.implementation.createHTMLDocument("test"); + todo_wine. + ok(doc instanceof Object, "created doc is not an instance of Object"); + todo_wine. + ok(doc.implementation instanceof Object, "created doc.implementation is not an instance of Object"); + + document.body.innerHTML = ""; + var iframe = document.createElement("iframe"); + + // Documents created in iframe use iframe's script global, so their objects are not instances of + // current script context Object. + iframe.onload = guard(function() { + var doc = iframe.contentWindow.document; + ok(!(doc instanceof Object), "doc is an instance of Object"); + ok(!(doc.implementation instanceof Object), "doc.implementation is an instance of Object"); + + doc = doc.implementation.createHTMLDocument("test"); + ok(!(doc instanceof Object), "created iframe doc is an instance of Object"); + ok(!(doc.implementation instanceof Object), "created iframe doc.implementation is an instance of Object"); + + next_test(); + }); + + iframe.src = "about:blank"; + document.body.appendChild(iframe); +});

1 0