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

Alexandre Julliard : wow64: Access the BTCpuSimulate backend function pointer directly.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: 753875e80b45f00848c840da11b96de19a6084bc URL: https://gitlab.winehq.org/wine/wine/-/commit/753875e80b45f00848c840da11b96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 21 18:25:19 2024 +0100 wow64: Access the BTCpuSimulate backend function pointer directly. --- dlls/wow64/syscall.c | 53 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 298345e77e0..0087a684d47 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -100,7 +100,7 @@ static BOOLEAN (WINAPI *pBTCpuIsProcessorFeaturePresent)(UINT); static void (WINAPI *pBTCpuProcessInit)(void); static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *); static void (WINAPI *pBTCpuThreadInit)(void); -static void (WINAPI *pBTCpuSimulate)(void); +static void (WINAPI *pBTCpuSimulate)(void) __attribute__((used)); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ) = NULL; @@ -974,41 +974,48 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) * cpu_simulate */ #ifdef __aarch64__ -extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +extern void DECLSPEC_NORETURN cpu_simulate(void); __ASM_GLOBAL_FUNC( cpu_simulate, - "stp x29, x30, [sp, #-32]!\n\t" - ".seh_save_fplr_x 32\n\t" + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" ".seh_endprologue\n\t" - ".seh_handler cpu_simulate_handler, @except\n\t" - "str x0, [sp, #16]\n" + ".seh_handler cpu_simulate_handler, @except\n" ".Lcpu_simulate_loop:\n\t" - "ldr x0, [sp, #16]\n\t" - "blr x0\n\t" + "adrp x16, pBTCpuSimulate\n\t" + "ldr x16, [x16, :lo12:pBTCpuSimulate]\n\t" + "blr x16\n\t" "b .Lcpu_simulate_loop" ) __ASM_GLOBAL_FUNC( cpu_simulate_handler, - "stp x29, x30, [sp, #-32]!\n\t" - ".seh_save_fplr_x 32\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + "stp x19, x20, [sp, #16]\n\t" + ".seh_save_regp x19, 16\n\t" ".seh_endprologue\n\t" "mov x19, x0\n\t" /* record */ "mov x20, x1\n\t" /* frame */ - "stp x0, x2, [sp, #16]\n\t" /* record, context */ - "add x0, sp, #16\n\t" + "ldr w4, [x0, #4]\n\t" /* record->ExceptionFlags */ + "tst w4, #6\n\t" /* EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND */ + "b.ne 1f\n\t" + "stp x0, x2, [sp, #32]\n\t" /* record, context */ + "add x0, sp, #32\n\t" "bl Wow64PassExceptionToGuest\n\t" - "mov x20, x0\n\t" /* frame */ + "mov x0, x20\n\t" /* frame */ "adr x1, .Lcpu_simulate_loop\n\t" /* target */ - "mov x19, x2\n\t" /* record */ + "mov x2, x19\n\t" /* record */ "bl RtlUnwind\n\t" - "brk #1" ) + "1:\tmov w0, #1\n\t" /* ExceptionContinueSearch */ + "ldp x19, x20, [sp, #16]\n\t" + "ldp x29, x30, [sp], #48\n\t" + "ret" ) #else -extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +extern void DECLSPEC_NORETURN cpu_simulate(void); __ASM_GLOBAL_FUNC( cpu_simulate, "subq $0x28, %rsp\n\t" ".seh_stackalloc 0x28\n\t" ".seh_endprologue\n\t" ".seh_handler cpu_simulate_handler, @except\n\t" - "movq %rcx,0x20(%rsp)\n" ".Lcpu_simulate_loop:\n\t" - "call *0x20(%rsp)\n\t" + "call *pBTCpuSimulate(%rip)\n\t" "jmp .Lcpu_simulate_loop" ) __ASM_GLOBAL_FUNC( cpu_simulate_handler, "subq $0x38, %rsp\n\t" @@ -1098,7 +1105,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate( pBTCpuSimulate ); + cpu_simulate(); } break; @@ -1124,7 +1131,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.R3 = arg3; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate( pBTCpuSimulate ); + cpu_simulate(); } break; } @@ -1187,7 +1194,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate( pBTCpuSimulate ); + cpu_simulate(); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1212,7 +1219,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate( pBTCpuSimulate ); + cpu_simulate(); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1236,7 +1243,7 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) RtlRunOnceExecuteOnce( &init_done, process_init, NULL, NULL ); thread_init(); - cpu_simulate( pBTCpuSimulate ); + cpu_simulate(); }

1 0

Alexandre Julliard : wow64: Use a .seh handler in raise_exception().
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: d2c0efe16351259ad3f8b934d2e17743771c3564 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2c0efe16351259ad3f8b934d2e177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 21 18:11:36 2024 +0100 wow64: Use a .seh handler in raise_exception(). --- dlls/wow64/syscall.c | 135 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 56 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 1b52db370a3..2314e2973d8 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -184,7 +184,8 @@ static NTSTATUS get_context_return_value( void *wow_context ) /********************************************************************** * call_user_exception_dispatcher */ -static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32_ptr, void *ctx64_ptr ) +static void __attribute__((used)) call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32_ptr, + void *ctx64_ptr ) { switch (current_machine) { @@ -331,40 +332,82 @@ static void call_raise_user_exception_dispatcher( ULONG code ) /* based on RtlRaiseException: call NtRaiseException with context setup to return to caller */ -void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ); -#ifdef __x86_64__ -__ASM_GLOBAL_FUNC( raise_exception, - "sub $0x28,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x28\n\t") - __ASM_SEH(".seh_endprologue\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") - "movq %rcx,(%rsp)\n\t" - "movq %rdx,%rcx\n\t" - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "leaq 0x30(%rsp),%rax\n\t" /* orig stack pointer */ - "movq %rax,0x98(%rdx)\n\t" /* context->Rsp */ - "movq (%rsp),%rcx\n\t" /* original first parameter */ - "movq 0x28(%rsp),%rax\n\t" /* return address */ - "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ - "call " __ASM_NAME("NtRaiseException") ) -#elif defined(__aarch64__) +void WINAPI raise_exception( EXCEPTION_RECORD32 *rec32, void *ctx32, + BOOL first_chance, EXCEPTION_RECORD *rec ); +#ifdef __aarch64__ __ASM_GLOBAL_FUNC( raise_exception, - "stp x29, x30, [sp, #-32]!\n\t" - __ASM_SEH(".seh_save_fplr_x 32\n\t") - __ASM_SEH(".seh_endprologue\n\t") - __ASM_CFI(".cfi_def_cfa x29, 32\n\t") - __ASM_CFI(".cfi_offset x30, -24\n\t") - __ASM_CFI(".cfi_offset x29, -32\n\t") - "mov x29, sp\n\t" + "sub sp, sp, #0x390\n\t" /* sizeof(context) */ + ".seh_stackalloc 0x390\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + ".seh_endprologue\n\t" + ".seh_handler raise_exception_handler, @except\n\t" "stp x0, x1, [sp, #16]\n\t" - "mov x0, x1\n\t" - "bl " __ASM_NAME("RtlCaptureContext") "\n\t" - "ldp x0, x1, [sp, #16]\n\t" /* orig parameters */ - "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ - "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ - "add x4, sp, #32\n\t" /* orig stack pointer */ - "stp x4, x5, [x1, #0x100]\n\t" /* context->Sp, Pc */ - "bl " __ASM_NAME("NtRaiseException") ) + "stp x2, x3, [sp, #32]\n\t" + "add x0, sp, #48\n\t" + "bl RtlCaptureContext\n\t" + "add x1, sp, #48\n\t" /* context */ + "adr x2, 1f\n\t" /* return address */ + "str x2, [x1, #0x108]\n\t" /* context->Pc */ + "ldp x2, x0, [sp, #32]\n\t" /* first_chance, rec */ + "bl NtRaiseException\n" + "raise_exception_ret:\n\t" + "ldp x0, x1, [sp, #16]\n\t" /* rec32, ctx32 */ + "add x2, sp, #48\n\t" /* context */ + "bl call_user_exception_dispatcher\n" + "1:\tnop\n\t" + "ldp x29, x30, [sp], #48\n\t" + "add sp, sp, #0x390\n\t" + "ret" ) +__ASM_GLOBAL_FUNC( raise_exception_handler, + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" + "ldr w4, [x0, #4]\n\t" /* record->ExceptionFlags */ + "tst w4, #6\n\t" /* EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND */ + "b.ne 1f\n\t" + "mov x2, x0\n\t" /* rec */ + "mov x0, x1\n\t" /* frame */ + "adr x1, raise_exception_ret\n\t" + "bl RtlUnwind\n" + "1:\tmov w0, #1\n\t" /* ExceptionContinueSearch */ + "ldp x29, x30, [sp], #16\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( raise_exception, + "sub $0x4d8,%rsp\n\t" /* sizeof(context) + alignment */ + ".seh_stackalloc 0x4d8\n\t" + ".seh_endprologue\n\t" + ".seh_handler raise_exception_handler, @except\n\t" + "movq %rcx,0x4e0(%rsp)\n\t" + "movq %rdx,0x4e8(%rsp)\n\t" + "movq %r8,0x4f0(%rsp)\n\t" + "movq %r9,0x4f8(%rsp)\n\t" + "movq %rsp,%rcx\n\t" + "call RtlCaptureContext\n\t" + "movq %rsp,%rdx\n\t" /* context */ + "leaq 1f(%rip),%rax\n\t" /* return address */ + "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ + "movq 0x4f8(%rsp),%rcx\n\t" /* rec */ + "movq 0x4f0(%rsp),%r8\n\t" /* first_chance */ + "call NtRaiseException\n" + "raise_exception_ret:\n\t" + "mov 0x4e0(%rsp),%rcx\n\t" /* rec32 */ + "mov 0x4e8(%rsp),%rdx\n\t" /* ctx32 */ + "movq %rsp,%r8\n\t" /* context */ + "call call_user_exception_dispatcher\n" + "1:\tnop\n\t" + "add $0x4d8,%rsp\n\t" + "ret" ) +__ASM_GLOBAL_FUNC( raise_exception_handler, + "sub $0x28,%rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + "movq %rcx,%r8\n\t" /* rec */ + "movq %rdx,%rcx\n\t" /* frame */ + "leaq raise_exception_ret(%rip),%rdx\n\t" + "call RtlUnwind\n\t" + "int3" ) #endif @@ -563,20 +606,8 @@ NTSTATUS WINAPI wow64_NtRaiseException( UINT *args ) void *context32 = get_ptr( &args ); BOOL first_chance = get_ulong( &args ); - EXCEPTION_RECORD *rec = exception_record_32to64( rec32 ); - CONTEXT context; - pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, context32 ); - - __TRY - { - raise_exception( rec, &context, first_chance ); - } - __EXCEPT_ALL - { - call_user_exception_dispatcher( rec32, context32, &context ); - } - __ENDTRY + raise_exception( rec32, context32, first_chance, exception_record_32to64( rec32 )); return STATUS_SUCCESS; } @@ -1357,7 +1388,6 @@ void WINAPI Wow64ProcessPendingCrossProcessItems(void) NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) { EXCEPTION_RECORD32 rec32; - CONTEXT context; BOOL first_chance = TRUE; union { @@ -1441,14 +1471,7 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) } exception_record_64to32( &rec32, rec ); - __TRY - { - raise_exception( rec, &context, first_chance ); - } - __EXCEPT_ALL - { - call_user_exception_dispatcher( &rec32, &ctx32, NULL ); - } - __ENDTRY + raise_exception( &rec32, &ctx32, first_chance, rec ); + return STATUS_SUCCESS; }

1 0

Piotr Caban : advapi32/tests: Merge RegLoadKey and RegUnLoadKey tests.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: cdc842f60d17c0135b9b7e48834355c9fe231ded URL: https://gitlab.winehq.org/wine/wine/-/commit/cdc842f60d17c0135b9b7e48834355… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 21 14:26:07 2024 +0100 advapi32/tests: Merge RegLoadKey and RegUnLoadKey tests. --- dlls/advapi32/tests/registry.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 27ee3fbbe30..2430e2330dd 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1560,29 +1560,6 @@ static void test_reg_save_key(void) } static void test_reg_load_key(void) -{ - DWORD ret; - HKEY hkHandle; - - if (!set_privileges(SE_RESTORE_NAME, TRUE) || - !set_privileges(SE_BACKUP_NAME, FALSE)) - { - win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); - return; - } - - ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); - - set_privileges(SE_RESTORE_NAME, FALSE); - - ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &hkHandle); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); - - RegCloseKey(hkHandle); -} - -static void test_reg_unload_key(void) { UNICODE_STRING key_name; OBJECT_ATTRIBUTES attr; @@ -1597,7 +1574,10 @@ static void test_reg_unload_key(void) return; } - ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Test", 0, KEY_READ, &key); + ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &key); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); /* try to unload though the key handle is live */ @@ -4988,7 +4968,6 @@ START_TEST(registry) test_classesroot_mask(); test_reg_save_key(); test_reg_load_key(); - test_reg_unload_key(); test_reg_load_app_key(); test_reg_copy_tree(); test_reg_delete_tree();

1 0

Piotr Caban : advapi32/tests: Remove all files created by RegLoadKey tests.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: 98bd248778b8dd0d052e4e68146ac22fd9021af0 URL: https://gitlab.winehq.org/wine/wine/-/commit/98bd248778b8dd0d052e4e68146ac2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 21 19:27:40 2024 +0100 advapi32/tests: Remove all files created by RegLoadKey tests. --- dlls/advapi32/tests/registry.c | 56 ++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2430e2330dd..f85c73ed4f2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1542,25 +1542,40 @@ static BOOL set_privileges(LPCSTR privilege, BOOL set) return TRUE; } -static void test_reg_save_key(void) +static void delete_dir(const char *path) { - DWORD ret; - - if (!set_privileges(SE_BACKUP_NAME, TRUE) || - !set_privileges(SE_RESTORE_NAME, FALSE)) + char file[2 * MAX_PATH], *p; + WIN32_FIND_DATAA fd; + HANDLE hfind; + BOOL r; + + strcpy(file, path); + p = file + strlen(file); + p[0] = '\\'; + p[1] = '*'; + p[2] = 0; + hfind = FindFirstFileA(file, &fd); + if (hfind != INVALID_HANDLE_VALUE) { - win_skip("Failed to set SE_BACKUP_NAME privileges, skipping tests\n"); - return; + do + { + if (!strcmp(fd.cFileName, ".") || !strcmp(fd.cFileName, "..")) + continue; + + strcpy(p + 1, fd.cFileName); + r = DeleteFileA(file); + ok(r, "DeleteFile failed on %s: %ld\n", debugstr_a(file), GetLastError()); + } while(FindNextFileA(hfind, &fd)); + FindClose(hfind); } - ret = RegSaveKeyA(hkey_main, "saved_key", NULL); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); - - set_privileges(SE_BACKUP_NAME, FALSE); + r = RemoveDirectoryA(path); + ok(r, "RemoveDirectory failed: %ld\n", GetLastError()); } static void test_reg_load_key(void) { + char saved_key[2 * MAX_PATH], *p; UNICODE_STRING key_name; OBJECT_ATTRIBUTES attr; NTSTATUS status; @@ -1568,13 +1583,21 @@ static void test_reg_load_key(void) HKEY key; if (!set_privileges(SE_RESTORE_NAME, TRUE) || - !set_privileges(SE_BACKUP_NAME, FALSE)) + !set_privileges(SE_BACKUP_NAME, TRUE)) { win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); return; } - ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); + GetTempPathA(MAX_PATH, saved_key); + strcat(saved_key, "\\wine_reg_test"); + CreateDirectoryA(saved_key, NULL); + strcat(saved_key, "\\saved_key"); + + ret = RegSaveKeyA(hkey_main, saved_key, NULL); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + + ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", saved_key); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &key); @@ -1600,9 +1623,11 @@ static void test_reg_load_key(void) ok(ret == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %ld\n", ret); set_privileges(SE_RESTORE_NAME, FALSE); + set_privileges(SE_BACKUP_NAME, FALSE); - DeleteFileA("saved_key"); - DeleteFileA("saved_key.LOG"); + p = strrchr(saved_key, '\\'); + *p = 0; + delete_dir(saved_key); } /* Helper function to wait for a file blocked by the registry to be available */ @@ -4966,7 +4991,6 @@ START_TEST(registry) test_classesroot(); test_classesroot_enum(); test_classesroot_mask(); - test_reg_save_key(); test_reg_load_key(); test_reg_load_app_key(); test_reg_copy_tree();

1 0

Rémi Bernon : server: Avoid removing thread twice from its desktop thread list.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: 5d91ab65faf9ffab3e36619aedb870a6aa17410d URL: https://gitlab.winehq.org/wine/wine/-/commit/5d91ab65faf9ffab3e36619aedb870… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 21 18:49:56 2024 +0100 server: Avoid removing thread twice from its desktop thread list. --- server/winstation.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 3af4c365ec3..80126ad5d60 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -403,21 +403,24 @@ static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) } /* remove a user of the desktop and start the close timeout if necessary */ -static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) +static void remove_desktop_user( struct desktop *desktop, struct thread *thread ) { struct process *process; - list_remove( &thread->desktop_entry ); + assert( desktop->users > 0 ); + desktop->users--; - if (!thread->process->is_system) - { - assert( desktop->users > 0 ); - desktop->users--; + /* if we have one remaining user, it has to be the manager of the desktop window */ + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); +} - /* if we have one remaining user, it has to be the manager of the desktop window */ - if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } +/* remove a thread from the list of threads attached to a desktop */ +static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) +{ + list_remove( &thread->desktop_entry ); + + if (!thread->process->is_system) remove_desktop_user( desktop, thread ); if (desktop == desktop->winstation->input_desktop) { @@ -546,7 +549,8 @@ void release_thread_desktop( struct thread *thread, int close ) if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ else { - remove_desktop_thread( desktop, thread ); + if (close) remove_desktop_thread( desktop, thread ); + else remove_desktop_user( desktop, thread ); release_object( desktop ); }

1 0

Piotr Caban : winedump: Fix REG_DWORD dumping with no data.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: d7aaf51459dbbc029a47dfbeb4d78e705ff25e6d URL: https://gitlab.winehq.org/wine/wine/-/commit/d7aaf51459dbbc029a47dfbeb4d78e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 21 16:18:27 2024 +0100 winedump: Fix REG_DWORD dumping with no data. --- tools/winedump/reg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index f100eb47171..29478e06592 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -279,8 +279,11 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) } break; case REG_DWORD: - assert(data_size == sizeof(DWORD)); - printf("dword:%08x", *(unsigned int *)data); + assert(data_size == sizeof(DWORD) || !data_size); + if (data_size) + printf("dword:%08x", *(unsigned int *)data); + else + printf("hex(4):"); break; case REG_MULTI_SZ: printf("str(7):\"");

1 0

Piotr Caban : advapi32/tests: Remove all files created by RegLoadAppKey tests.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: b13477deb437a6c5b0b73753408adf1220438a8b URL: https://gitlab.winehq.org/wine/wine/-/commit/b13477deb437a6c5b0b73753408adf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 21 20:21:16 2024 +0100 advapi32/tests: Remove all files created by RegLoadAppKey tests. --- dlls/advapi32/tests/registry.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2407eddd813..2afebb3365b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1673,31 +1673,26 @@ static void wait_file_available(char *path) static void test_reg_load_app_key(void) { DWORD ret, size; - char temppath[MAX_PATH], hivefilepath[MAX_PATH]; + char hivefilepath[2 * MAX_PATH], *p; const BYTE test_data[] = "Hello World"; BYTE output[sizeof(test_data)]; HKEY appkey = NULL; - GetTempPathA(sizeof(temppath), temppath); - GetTempFileNameA(temppath, "key", 0, hivefilepath); - DeleteFileA(hivefilepath); - - if (!set_privileges(SE_BACKUP_NAME, TRUE) || - !set_privileges(SE_RESTORE_NAME, FALSE)) + if (!set_privileges(SE_BACKUP_NAME, TRUE)) { win_skip("Failed to set SE_BACKUP_NAME privileges, skipping tests\n"); return; } + GetTempPathA(MAX_PATH, hivefilepath); + strcat(hivefilepath, "\\wine_reg_test"); + CreateDirectoryA(hivefilepath, NULL); + strcat(hivefilepath, "\\saved_key"); + ret = RegSaveKeyA(hkey_main, hivefilepath, NULL); - if (ret != ERROR_SUCCESS) - { - win_skip("Failed to save test key 0x%lx\n", ret); - return; - } + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); set_privileges(SE_BACKUP_NAME, FALSE); - set_privileges(SE_RESTORE_NAME, FALSE); /* Test simple key load */ /* Check if the changes are saved */ @@ -1726,8 +1721,10 @@ static void test_reg_load_app_key(void) RegCloseKey(appkey); wait_file_available(hivefilepath); - ret = DeleteFileA(hivefilepath); - ok(ret, "couldn't delete hive file %ld\n", GetLastError()); + + p = strrchr(hivefilepath, '\\'); + *p = 0; + delete_dir(hivefilepath); } /* tests that show that RegConnectRegistry and

1 0

Piotr Caban : advapi32/tests: Test if modifications are saved in RegUnLoadKey.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: cc62cdc1fd025c0c6f728ee82502315f9e8a05e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc62cdc1fd025c0c6f728ee8250231… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 21 14:54:13 2024 +0100 advapi32/tests: Test if modifications are saved in RegUnLoadKey. --- dlls/advapi32/tests/registry.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index f85c73ed4f2..2407eddd813 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1575,11 +1575,11 @@ static void delete_dir(const char *path) static void test_reg_load_key(void) { - char saved_key[2 * MAX_PATH], *p; + char saved_key[2 * MAX_PATH], buf[16], *p; UNICODE_STRING key_name; OBJECT_ATTRIBUTES attr; NTSTATUS status; - DWORD ret; + DWORD ret, size; HKEY key; if (!set_privileges(SE_RESTORE_NAME, TRUE) || @@ -1603,6 +1603,9 @@ static void test_reg_load_key(void) ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &key); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + ret = RegSetValueExA(key, "test", 0, REG_SZ, (BYTE *)"value", 6); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + /* try to unload though the key handle is live */ pRtlInitUnicodeString(&key_name, L"\\REGISTRY\\Machine\\Test"); InitializeObjectAttributes(&attr, &key_name, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -1614,6 +1617,27 @@ static void test_reg_load_key(void) ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + /* check if modifications are saved */ + ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", saved_key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + + size = sizeof(buf); + ret = RegGetValueA(key, NULL, "test", RRF_RT_REG_SZ, NULL, buf, &size); + todo_wine ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + if (ret == ERROR_SUCCESS) + { + ok(size == 6, "size = %ld\n", size); + ok(!strcmp(buf, "value"), "buf = %s\n", buf); + } + + RegCloseKey(key); + + ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + pRtlInitUnicodeString(&key_name, L"\\REGISTRY\\User\\.Default"); InitializeObjectAttributes(&attr, &key_name, OBJ_CASE_INSENSITIVE, NULL, NULL); status = pNtUnloadKey(&attr);

1 0

Rémi Bernon : ntoskrnl.exe: Open symbolic link with DELETE before making them temporary.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: f67b4f6bf45481cc59561b4498b4c7f174cb84bd URL: https://gitlab.winehq.org/wine/wine/-/commit/f67b4f6bf45481cc59561b4498b4c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 21 10:08:51 2024 +0100 ntoskrnl.exe: Open symbolic link with DELETE before making them temporary. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d2407d99448..7aaf66dd6db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1793,7 +1793,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!(status = NtOpenSymbolicLinkObject( &handle, 0, &attr ))) + if (!(status = NtOpenSymbolicLinkObject( &handle, DELETE, &attr ))) { NtMakeTemporaryObject( handle ); NtClose( handle );

1 0

Rémi Bernon : mfplat/mediatype: Use MFCreateWaveFormatExFromMFMediaType in init_am_media_type_audio_format.
by Alexandre Julliard March 21, 2024

March 21, 2024

Module: wine Branch: master Commit: 552cec94772a077065be9001e2df5db2245dec0a URL: https://gitlab.winehq.org/wine/wine/-/commit/552cec94772a077065be9001e2df5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 11 15:00:30 2024 +0100 mfplat/mediatype: Use MFCreateWaveFormatExFromMFMediaType in init_am_media_type_audio_format. --- dlls/mfplat/mediatype.c | 60 +++++-------------------------------------------- 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f584e1aae26..df1334d51ff 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3992,7 +3992,7 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons static HRESULT init_am_media_type_audio_format(AM_MEDIA_TYPE *am_type, UINT32 user_size, IMFMediaType *media_type) { - UINT32 num_channels, value; + UINT32 num_channels; HRESULT hr; if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo) @@ -4003,7 +4003,7 @@ static HRESULT init_am_media_type_audio_format(AM_MEDIA_TYPE *am_type, UINT32 us if (IsEqualGUID(&am_type->formattype, &FORMAT_WaveFormatEx) || IsEqualGUID(&am_type->formattype, &GUID_NULL)) { - WAVEFORMATEX *format; + UINT32 flags = 0; if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, &num_channels))) num_channels = 0; @@ -4012,59 +4012,11 @@ static HRESULT init_am_media_type_audio_format(AM_MEDIA_TYPE *am_type, UINT32 us || SUCCEEDED(IMFMediaType_GetItem(media_type, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, NULL)) || SUCCEEDED(IMFMediaType_GetItem(media_type, &MF_MT_AUDIO_SAMPLES_PER_BLOCK, NULL)) || num_channels > 2) - { - WAVEFORMATEXTENSIBLE *format_ext; - - am_type->cbFormat = sizeof(*format_ext) + user_size; - if (!(am_type->pbFormat = CoTaskMemAlloc(am_type->cbFormat))) - return E_OUTOFMEMORY; - format_ext = (WAVEFORMATEXTENSIBLE *)am_type->pbFormat; - memset(format_ext, 0, sizeof(*format_ext)); - - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_CHANNEL_MASK, &value))) - format_ext->dwChannelMask = value; - else if (num_channels < ARRAY_SIZE(default_channel_mask)) - format_ext->dwChannelMask = default_channel_mask[num_channels]; - - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) - format_ext->Samples.wValidBitsPerSample = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_BLOCK, &value))) - format_ext->Samples.wSamplesPerBlock = value; - format_ext->SubFormat = am_type->subtype; - - format = &format_ext->Format; - format->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - format->cbSize = sizeof(*format_ext) - sizeof(*format) + user_size; - - if (user_size && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, - (BYTE *)(format_ext + 1), user_size, NULL))) - return hr; - } - else - { - am_type->cbFormat = sizeof(*format) + user_size; - if (!(am_type->pbFormat = CoTaskMemAlloc(am_type->cbFormat))) - return E_OUTOFMEMORY; - format = (WAVEFORMATEX *)am_type->pbFormat; - memset(format, 0, sizeof(*format)); - - format->wFormatTag = am_type->subtype.Data1; - format->cbSize = user_size; - - if (user_size && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, - (BYTE *)(format + 1), user_size, NULL))) - return hr; - } + flags = MFWaveFormatExConvertFlag_ForceExtensible; - format->nChannels = num_channels; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value))) - format->nSamplesPerSec = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value))) - format->nAvgBytesPerSec = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) - format->nBlockAlign = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) - format->wBitsPerSample = value; + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(media_type, (WAVEFORMATEX **)&am_type->pbFormat, + (UINT32 *)&am_type->cbFormat, flags))) + return hr; am_type->subtype = get_am_subtype_for_mf_subtype(am_type->subtype); am_type->formattype = FORMAT_WaveFormatEx;

1 0