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

Alexandre Julliard : wow64: Access the BTCpuSimulate backend function pointer directly.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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

Piotr Caban : winedump: Fix REG_DWORD dumping with no data.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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: Merge RegLoadKey and RegUnLoadKey tests.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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 21 Mar '24

21 Mar '24

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

Piotr Caban : advapi32/tests: Test if modifications are saved in RegUnLoadKey.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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

Piotr Caban : advapi32/tests: Remove all files created by RegLoadAppKey tests.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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

Rémi Bernon : server: Avoid removing thread twice from its desktop thread list.
by Alexandre Julliard 21 Mar '24

21 Mar '24

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

Eric Pouech : winedbg: Add ability to set executable name.
by Alexandre Julliard 21 Mar '24

21 Mar '24

Module: wine Branch: master Commit: 8a65cdd13d431ed47f778639decc6d345d1a99f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a65cdd13d431ed47f778639decc6d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Mar 20 10:21:28 2024 +0100 winedbg: Add ability to set executable name. Either from command line option, or as a command. Mostly handy for scripting. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/dbg.y | 3 ++- programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/tgt_active.c | 7 +++++++ programs/winedbg/winedbg.c | 14 +++++++++----- programs/winedbg/winedbg.man.in | 2 ++ 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index fc9a2977041..6e71d310c22 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -58,7 +58,7 @@ static void parser(const char*); %token <string> tPATH tIDENTIFIER tSTRING tINTVAR %token <integer> tNUM tFORMAT %token <type> tTYPEDEF -%token tSYMBOLFILE tRUN tATTACH tDETACH tKILL tMAINTENANCE tTYPE tMINIDUMP +%token tSYMBOLFILE tEXECFILE tRUN tATTACH tDETACH tKILL tMAINTENANCE tTYPE tMINIDUMP %token tNOPROCESS tWOW /* can be prefixed by module name */ @@ -146,6 +146,7 @@ command: | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } + | tEXECFILE pathname { dbg_set_exec_file($2); } | run_command | list_command | disassemble_command diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index dd7fb0db76f..a05a27dfc79 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -224,6 +224,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <INITIAL>rwatch|rwatc|rwat { BEGIN(NOCMD); return tRWATCH; } <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(AWORD_EXPECTED); return tRUN;} +<INITIAL,NOPROCESS>exec-file { BEGIN(PATH_EXPECTED); return tEXECFILE;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } <INITIAL>kill|kil|ki|k { BEGIN(NOCMD); return tKILL; } <INITIAL,NOPROCESS>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c65b9bfae67..49cab156df1 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -474,6 +474,7 @@ struct list_string char* string; struct list_string* next; }; +extern void dbg_set_exec_file(const char *path); extern void dbg_run_debuggee(struct list_string* ls); extern void dbg_wait_next_exception(DWORD cont, int count, int mode); extern enum dbg_start dbg_active_attach(int argc, char* argv[]); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 9587ef450d2..209d82374c6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -87,6 +87,7 @@ BOOL dbg_attach_debuggee(DWORD pid) SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); dbg_curr_process->active_debuggee = TRUE; + dbg_printf("WineDbg attached to pid %04lx\n", dbg_curr_pid); return TRUE; } @@ -670,6 +671,7 @@ static BOOL dbg_start_debuggee(LPSTR cmdLine) free(dbg_last_cmd_line); dbg_last_cmd_line = cmdLine; } + dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid); return TRUE; } @@ -755,6 +757,11 @@ static char *dbg_build_command_line( char **argv ) return ret; } +void dbg_set_exec_file(const char *path) +{ + free(dbg_executable); + dbg_executable = strdup(path); +} void dbg_run_debuggee(struct list_string* ls) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 39ce6cbf8a9..b642284f73b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -637,11 +637,8 @@ void dbg_start_interactive(const char* filename, HANDLE hFile) struct dbg_process* p; struct dbg_process* p2; - if (dbg_curr_process) - { - dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid); - if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception(); - } + if (dbg_curr_process && dbg_curr_process->active_debuggee) + dbg_active_wait_for_first_exception(); dbg_interactiveP = TRUE; parser_handle(filename, hFile); @@ -759,6 +756,13 @@ int main(int argc, char** argv) argc--; argv++; continue; } + if (!strcmp(argv[0], "--exec") && argc > 1) + { + argc--; argv++; + dbg_set_exec_file(argv[0]); + argc--; argv++; + continue; + } if (!strcmp(argv[0], "--file") && argc > 1) { argc--; argv++; diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index c58696ba1c9..1380832537f 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -61,6 +61,8 @@ When in \fBdefault\fR mode, the following options are available: \fBwinedbg\fR will execute the command \fIstring\fR as if it was keyed on winedbg command line, and then will exit. This can be handy for getting the pid of running processes (winedbg --command "info proc"). +.IP \fB--exec\ \fIfilename\fR +Sets the executable name, without starting the executable. .IP \fB--file\ \fIfilename\fR \fBwinedbg\fR will execute the list of commands contained in file filename as if they were keyed on winedbg command line, and then

1 0

Eric Pouech : winedbg: Extend 'attach' command to load minidump files.
by Alexandre Julliard 21 Mar '24

21 Mar '24

Module: wine Branch: master Commit: 2e46d81c64f9ced49b93502b70cedd9d0c92be2f URL: https://gitlab.winehq.org/wine/wine/-/commit/2e46d81c64f9ced49b93502b70cedd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Mar 5 10:15:49 2024 +0100 winedbg: Extend 'attach' command to load minidump files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/dbg.y | 3 ++- programs/winedbg/debugger.h | 3 ++- programs/winedbg/tgt_minidump.c | 28 +++++++++++++++++++--------- programs/winedbg/winedbg.c | 2 +- programs/winedbg/winedbg.man.in | 24 +++++++++++++----------- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 6e71d310c22..f3af249ee07 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -141,10 +141,11 @@ command: | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE, NULL); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } + | tATTACH pathname { minidump_reload($2); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tTHREAD tNUM { dbg_set_curr_thread($2); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } - | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} + | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL); } | tECHO tSTRING { dbg_printf("%s\n", $2); } | tEXECFILE pathname { dbg_set_exec_file($2); } | run_command diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 49cab156df1..096fc1e84b0 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -488,7 +488,8 @@ extern void fetch_module_name(void* name_addr, void* mod_addr, WCHAR /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); -extern enum dbg_start minidump_reload(int argc, char* argv[]); +extern enum dbg_start minidump_reload(const char *); +extern enum dbg_start minidump_start(int argc, char* argv[]); /* tgt_module.c */ extern enum dbg_start tgt_module_load(const char* name, BOOL keep); diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index ac8d9be71b2..c2594251d67 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -307,7 +307,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) const char *str; char tmp[128]; - dbg_printf("WineDbg starting on minidump on pid %04lx\n", pid); + dbg_printf("WineDbg starting minidump on pid %04lx\n", pid); switch (msi->ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_UNKNOWN: @@ -564,23 +564,23 @@ static void cleanup(struct tgt_process_minidump_data* data) static struct be_process_io be_process_minidump_io; -enum dbg_start minidump_reload(int argc, char* argv[]) +enum dbg_start minidump_reload(const char* filename) { struct tgt_process_minidump_data* data; enum dbg_start ret = start_error_parse; - /* try the form <myself> minidump-file */ - if (argc != 1) return start_error_parse; - - WINE_TRACE("Processing Minidump file %s\n", argv[0]); - + if (dbg_curr_process) + { + dbg_printf("Already attached to a process. Use 'detach' or 'kill' before loading a minidump file'\n"); + return start_error_init; + } data = malloc(sizeof(struct tgt_process_minidump_data)); if (!data) return start_error_init; data->mapping = NULL; data->hMap = NULL; data->hFile = INVALID_HANDLE_VALUE; - if ((data->hFile = CreateFileA(argv[0], GENERIC_READ, FILE_SHARE_READ, NULL, + if ((data->hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((data->hMap = CreateFileMappingA(data->hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) && ((data->mapping = MapViewOfFile(data->hMap, FILE_MAP_READ, 0, 0, 0)) != NULL)) @@ -594,7 +594,7 @@ enum dbg_start minidump_reload(int argc, char* argv[]) } __EXCEPT_PAGE_FAULT { - dbg_printf("Unexpected fault while reading minidump %s\n", argv[0]); + dbg_printf("Unexpected fault while reading minidump %s\n", filename); dbg_curr_pid = 0; } __ENDTRY; @@ -603,6 +603,16 @@ enum dbg_start minidump_reload(int argc, char* argv[]) return ret; } +enum dbg_start minidump_start(int argc, char* argv[]) +{ + /* try the form <myself> minidump-file */ + if (argc != 1) return start_error_parse; + + WINE_TRACE("Processing Minidump file %s\n", argv[0]); + + return minidump_reload(argv[0]); +} + static BOOL tgt_process_minidump_close_process(struct dbg_process* pcs, BOOL kill) { struct tgt_process_minidump_data* data = private_data(pcs); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index b642284f73b..c7f14e8238f 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -786,7 +786,7 @@ int main(int argc, char** argv) } if (!argc) ds = start_ok; else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse && - (ds = minidump_reload(argc, argv)) == start_error_parse) + (ds = minidump_start(argc, argv)) == start_error_parse) ds = dbg_active_launch(argc, argv); switch (ds) { diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 1380832537f..ec9b1bb37ea 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -138,18 +138,26 @@ Exits the debugger. Attach to a Wine process (\fIN\fR is its Windows ID, numeric or hexadecimal). IDs can be obtained using the \fBinfo\ process\fR command. Note the \fBinfo\ process\fR command returns hexadecimal values -.IP +.IP \fBattach\ \fIfile.mdmp\fR +Reload the state of a debuggee from the minidump \fIfile.mdmp\fR. +See the \fBminidump\fR command to save such a file. .IP \fBdetach\fR -Detach from a Wine-process. -.IP \fBthread\ \fIN\fR -Change the current thread to \fIN\fR (its Windows TID, numeric or hexadecimal). -.IP +Detach the current Wine-process. The process is no longer debugged by WineDbg, +but is still running (for a live target). +.IP \fBkill\fR +Kills the current Wine-process. The process is no longer debugged by WineDbg, +and is also terminated (for a live target). +.IP \fBminidump\fR\ \fIfile.mdmp\fR +Saves the debugging context of the debuggee into a minidump file called +\fIfile.mdmp\fR. .IP \fBrun\fR Re-run the same process with the same arguments. Note: all breakpoints of precedent process are no longer available. .IP \fBrun\ \fIarg1\ arg2...\fR Re-run the same process with arguments \fIarg1\ arg2...\fR. Note: all breakpoints of precedent process are no longer available. +.IP \fBthread\ \fIN\fR +Change the current thread to \fIN\fR (its Windows TID, numeric or hexadecimal). .PP \fIHelp commands\fR .IP \fBhelp\fR @@ -355,12 +363,6 @@ When specifying an identifier, if several symbols with this name exist, the debugger will prompt for the symbol you want to use. Pick up the one you want from its number. .PP -\fIMisc.\fR -.PP -.BI "minidump " file.mdmp -saves the debugging context of the debuggee into a minidump file called -\fIfile.mdmp\fR. -.PP \fIInformation on Wine internals\fR .IP \fBinfo\ class\fR Lists all Windows classes registered in Wine

1 0

Eric Pouech : winedbg: Flush expr buffer upon internal exception.
by Alexandre Julliard 21 Mar '24

21 Mar '24

Module: wine Branch: master Commit: 97e584b695edf487f5b3dc767ef3b2b436a3b246 URL: https://gitlab.winehq.org/wine/wine/-/commit/97e584b695edf487f5b3dc767ef3b2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Mar 8 11:20:43 2024 +0100 winedbg: Flush expr buffer upon internal exception. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/dbg.y | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index f3af249ee07..6f4bb10fed8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -630,6 +630,7 @@ void parser_handle(const char* filename, HANDLE input) } __ENDTRY; lexeme_flush(); + expr_free_all(); } while (!ret_ok); dbg_parser = prev;

1 0