November 2021 - Wine-Commits

Eric Pouech : dbghelp/msc: Silence a couple of unneeded codeview entries while parsing PDB.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 7fec9fdcb25c090a380e53216420b609a3ad63a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fec9fdcb25c090a380e5321… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:26:35 2021 +0100 dbghelp/msc: Silence a couple of unneeded codeview entries while parsing PDB. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4e44655deb5..d62f06f5606 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2517,8 +2517,10 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_BUILDINFO: case S_FILESTATIC: case S_CALLEES: + case S_CALLERS: case S_UNAMESPACE: case S_INLINEES: + case S_POGODATA: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Eric Pouech : winedump: Define and dump POGO codeview record.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 25d2c954adea4f46dcb9bc0e02ca63bb8de111c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d2c954adea4f46dcb9bc0e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:25:28 2021 +0100 winedump: Define and dump POGO codeview record. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 10 ++++++++++ tools/winedump/msc.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index b0021ed3c25..5a09b9653a3 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2024,6 +2024,16 @@ union codeview_symbol unsigned short int csz; /* number of bytes in following array */ char rgsz[1]; /* array of null terminated strings (bounded by csz) */ } annotation_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int invocations; + __int64 dynCount; + unsigned numInstrs; + unsigned staInstLive; + } pogoinfo_v3; }; enum BinaryAnnotationOpcode diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 0fbcc3dba80..f0856b2a6a2 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1949,6 +1949,12 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long } break; + case S_POGODATA: + printf("PogoData V3 inv:%d dynCnt:%lld inst:%d staInst:%d\n", + sym->pogoinfo_v3.invocations, (long long)sym->pogoinfo_v3.dynCount, + sym->pogoinfo_v3.numInstrs, sym->pogoinfo_v3.staInstLive); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Martin Storsjö : ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 1fb4ce83f409539da74d994f5a37ed839ef6e9c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb4ce83f409539da74d994f… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Nov 15 16:02:09 2021 +0200 ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm. This fixes unwinding from functions ending with a call to a function that won't return. This matches what is done on the PE side in the call to lookup_function_info. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2017cf150db..ebc08984adf 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -229,7 +229,7 @@ extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { #ifdef HAVE_LIBUNWIND - DWORD ip = context->Pc; + DWORD ip = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); unw_context_t unw_context; unw_cursor_t cursor; unw_proc_info_t info;

1 0

Martin Storsjö : ntdll: Error out if unwinding isn't progressing on arm.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: d00c897749a06a5fe24e8e6d09acb5dc735469bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00c897749a06a5fe24e8e6d… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Nov 15 16:02:08 2021 +0200 ntdll: Error out if unwinding isn't progressing on arm. In PE builds of wine, there's no unwind info (as LLVM hasn't implemented generating SEH unwind info for ARM yet). On startup of wine, an exception of the type RPC_S_SERVER_UNAVAILABLE is raised. In a PE build of Wine, the unwind would get stuck in an infinite loop. This still loops for a short while; after returning the error STATUS_INVALID_DISPOSITION, KiUserExceptionDispatcher ends up calling RtlRaiseStatus with this status, which then tries to unwind again, getting stuck similarly. However by recursively trying to unwind multiple times, the process crashes fairly soon after running out of stack. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index fc37f917219..2017cf150db 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -255,13 +255,16 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa } if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { - TRACE( "no info found for %x ip %x-%x, assuming leaf function\n", - ip, info.start_ip, info.end_ip ); + NTSTATUS status = context->Pc != context->Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + TRACE( "no info found for %x ip %x-%x, %s\n", + ip, info.start_ip, info.end_ip, status == STATUS_SUCCESS ? + "assuming leaf function" : "error, stuck" ); dispatch->LanguageHandler = NULL; dispatch->EstablisherFrame = context->Sp; context->Pc = context->Lr; context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - return STATUS_SUCCESS; + return status; } TRACE( "ip %#x function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n",

1 0

Eric Pouech : winedump: Setup a context in symbol_dumper for S_SEPCODE.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 95c96399d87cd9f0034b33327ee45579671747f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c96399d87cd9f0034b3332… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:25:14 2021 +0100 winedump: Setup a context in symbol_dumper for S_SEPCODE. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index b566018ac89..0fbcc3dba80 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1935,6 +1935,7 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long sym->sepcode_v3.pParent, sym->sepcode_v3.pEnd, sym->sepcode_v3.sect, sym->sepcode_v3.off, sym->sepcode_v3.length, sym->sepcode_v3.sectParent, sym->sepcode_v3.offParent); + push_symbol_dumper(&sd, sym, sym->sepcode_v3.pEnd); break; case S_ANNOTATION:

1 0

Eric Pouech : dbghelp: Relax some failure conditions in SymSetContext and SymSetScopeFromAddr.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 10a20b2d22a87db18ede005d25582c8c69bf164b URL: https://source.winehq.org/git/wine.git/?a=commit;h=10a20b2d22a87db18ede005d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:25:41 2021 +0100 dbghelp: Relax some failure conditions in SymSetContext and SymSetScopeFromAddr. They shouldn't fail if passed address is inside a module, even if it doesn't point to a function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 844ef00b8e9..c0b8837fbbf 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -607,18 +607,14 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, PIMAGEHLP_CONTEXT Context) { struct process* pcs; - BOOL same; - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; - same = pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && - pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && - pcs->ctx_frame.StackOffset == StackFrame->StackOffset; - - if (!SymSetScopeFromAddr(hProcess, StackFrame->InstructionOffset)) - return FALSE; + TRACE("(%p %p %p)\n", hProcess, StackFrame, Context); - pcs->ctx_frame = *StackFrame; - if (same) + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + if (pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && + pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && + pcs->ctx_frame.StackOffset == StackFrame->StackOffset && + pcs->ctx_frame.InstructionOffset == StackFrame->InstructionOffset) { TRACE("Setting same frame {rtn=%I64x frm=%I64x stk=%I64x}\n", pcs->ctx_frame.ReturnOffset, @@ -628,7 +624,11 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, return FALSE; } + if (!SymSetScopeFromAddr(hProcess, StackFrame->InstructionOffset)) + return FALSE; + pcs->ctx_frame = *StackFrame; /* Context is not (no longer?) used */ + return TRUE; } @@ -643,11 +643,11 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) TRACE("(%p %#I64x)\n", hProcess, addr); if (!module_init_pair(&pair, hProcess, addr)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; - if (sym->symt.tag != SymTagFunction) return FALSE; - pair.pcs->localscope_pc = addr; - pair.pcs->localscope_symt = &sym->symt; + if ((sym = symt_find_nearest(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) + pair.pcs->localscope_symt = &sym->symt; + else + pair.pcs->localscope_symt = NULL; return TRUE; }

1 0

Eric Pouech : dbghelp/dwarf: Fix computation of some location attributes.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 82ea35cbb566e6466f270a267bfd3bb7428aa98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ea35cbb566e6466f270a26… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:26:21 2021 +0100 dbghelp/dwarf: Fix computation of some location attributes. Dwarf4 clarified that only FORM_sec_offset can refer to location lists, fix dwarf2_compute_location_attr accordingly. This fixes the 'fixme:dwarf2_parse_udt_member: Found register, while not expecting it' messages. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d6b8de7400a..9d60aeb5ad4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1059,18 +1059,31 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, switch (xloc.form) { + case DW_FORM_data4: + if (ctx->head.version < 4) + { + loc->kind = loc_dwarf2_location_list; + loc->reg = Wine_DW_no_register; + loc->offset = xloc.u.uvalue; + return TRUE; + } + /* fall through */ case DW_FORM_data1: case DW_FORM_data2: case DW_FORM_udata: case DW_FORM_sdata: loc->kind = loc_absolute; loc->reg = 0; loc->offset = xloc.u.uvalue; return TRUE; - case DW_FORM_data4: - loc->kind = loc_dwarf2_location_list; - loc->reg = Wine_DW_no_register; - loc->offset = xloc.u.uvalue; - return TRUE; - case DW_FORM_data8: case DW_FORM_sec_offset: + case DW_FORM_data8: + if (ctx->head.version >= 4) + { + loc->kind = loc_absolute; + loc->reg = 0; + loc->offset = xloc.u.lluvalue; + return TRUE; + } + /* fall through */ + case DW_FORM_sec_offset: loc->kind = loc_dwarf2_location_list; loc->reg = Wine_DW_no_register; loc->offset = xloc.u.lluvalue; @@ -1701,8 +1714,9 @@ static void dwarf2_parse_udt_member(dwarf2_debug_info_t* di, { if (loc.kind != loc_absolute) { - FIXME("Found register, while not expecting it\n"); - loc.offset = 0; + FIXME("Unexpected offset computation for member %s in %ls!%s\n", + name.u.string, di->unit_ctx->module_ctx->module->modulename, parent->hash_elt.name); + loc.offset = 0; } else TRACE("found member_location at %s -> %lu\n",

1 0

Thomas Faber : dbghelp: Accept NULL search path in SymSetSearchPath.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 06f1c40f17ad09aa7ab72f44c705be78dcf6daf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f1c40f17ad09aa7ab72f44… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 18:11:48 2021 -0500 dbghelp: Accept NULL search path in SymSetSearchPath. Fixes a crash when starting kernrate.exe. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 87 +++++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index c0b8837fbbf..428ea10e2d3 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -175,6 +175,36 @@ struct cpu* cpu_find(DWORD machine) return NULL; } +static WCHAR* make_default_search_path(void) +{ + WCHAR* search_path; + unsigned size; + unsigned len; + + search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR)); + while ((size = GetCurrentDirectoryW(len, search_path)) >= len) + search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (len *= 2) * sizeof(WCHAR)); + search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1) * sizeof(WCHAR)); + + len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); + if (len) + { + search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); + search_path[size] = ';'; + GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", search_path + size + 1, len); + size += 1 + len; + } + len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); + if (len) + { + search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); + search_path[size] = ';'; + GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", search_path + size + 1, len); + } + + return search_path; +} + /****************************************************************** * SymSetSearchPathW (DBGHELP.@) * @@ -182,14 +212,24 @@ struct cpu* cpu_find(DWORD machine) BOOL WINAPI SymSetSearchPathW(HANDLE hProcess, PCWSTR searchPath) { struct process* pcs = process_find_by_handle(hProcess); + WCHAR* search_path_buffer; if (!pcs) return FALSE; - if (!searchPath) return FALSE; + if (searchPath) + { + search_path_buffer = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(searchPath) + 1) * sizeof(WCHAR)); + if (!search_path_buffer) return FALSE; + lstrcpyW(search_path_buffer, searchPath); + } + else + { + search_path_buffer = make_default_search_path(); + if (!search_path_buffer) return FALSE; + } HeapFree(GetProcessHeap(), 0, pcs->search_path); - pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(searchPath) + 1) * sizeof(WCHAR)), - searchPath); + pcs->search_path = search_path_buffer; return TRUE; } @@ -201,16 +241,19 @@ BOOL WINAPI SymSetSearchPath(HANDLE hProcess, PCSTR searchPath) { BOOL ret = FALSE; unsigned len; - WCHAR* sp; + WCHAR* sp = NULL; - len = MultiByteToWideChar(CP_ACP, 0, searchPath, -1, NULL, 0); - if ((sp = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if (searchPath) { + len = MultiByteToWideChar(CP_ACP, 0, searchPath, -1, NULL, 0); + sp = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!sp) return FALSE; MultiByteToWideChar(CP_ACP, 0, searchPath, -1, sp, len); - - ret = SymSetSearchPathW(hProcess, sp); - HeapFree(GetProcessHeap(), 0, sp); } + + ret = SymSetSearchPathW(hProcess, sp); + + HeapFree(GetProcessHeap(), 0, sp); return ret; } @@ -428,29 +471,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP } else { - unsigned size; - unsigned len; - - pcs->search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR)); - while ((size = GetCurrentDirectoryW(len, pcs->search_path)) >= len) - pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (len *= 2) * sizeof(WCHAR)); - pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1) * sizeof(WCHAR)); - - len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); - if (len) - { - pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - pcs->search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", pcs->search_path + size + 1, len); - size += 1 + len; - } - len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); - if (len) - { - pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - pcs->search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", pcs->search_path + size + 1, len); - } + pcs->search_path = make_default_search_path(); } pcs->lmodules = NULL;

1 0

Thomas Faber : dbghelp: Use . instead of concrete path for search path.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: bb2802984dac940b0b8f91f64e67d3f4bf2b78e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2802984dac940b0b8f91f6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 18:17:53 2021 -0500 dbghelp: Use . instead of concrete path for search path. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 45 +++++++++++++++++++++++++------------------- dlls/dbghelp/tests/dbghelp.c | 4 ---- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 428ea10e2d3..063fe4cdc6d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -178,29 +178,36 @@ struct cpu* cpu_find(DWORD machine) static WCHAR* make_default_search_path(void) { WCHAR* search_path; - unsigned size; - unsigned len; - - search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR)); - while ((size = GetCurrentDirectoryW(len, search_path)) >= len) - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (len *= 2) * sizeof(WCHAR)); - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1) * sizeof(WCHAR)); - - len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); - if (len) + WCHAR* p; + unsigned sym_path_len; + unsigned alt_sym_path_len; + + sym_path_len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); + alt_sym_path_len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); + + /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALTERNATE_SYMBOL_PATH%]". + * If the variables exist, the lengths include a null-terminator. We use that + * space for the semicolons, and only add the initial dot and the final null. */ + search_path = HeapAlloc(GetProcessHeap(), 0, + (1 + sym_path_len + alt_sym_path_len + 1) * sizeof(WCHAR)); + if (!search_path) return NULL; + + p = search_path; + *p++ = L'.'; + if (sym_path_len) { - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", search_path + size + 1, len); - size += 1 + len; + *p++ = L';'; + GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", p, sym_path_len); + p += sym_path_len - 1; } - len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); - if (len) + + if (alt_sym_path_len) { - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", search_path + size + 1, len); + *p++ = L';'; + GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", p, alt_sym_path_len); + p += alt_sym_path_len - 1; } + *p = L'\0'; return search_path; } diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 06c21ec288c..a42e83aa2c8 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -141,7 +141,6 @@ static void test_search_path(void) * We unset both variables earlier so should simply get "." */ ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); /* Set an arbitrary search path */ @@ -156,7 +155,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); /* With _NT_SYMBOL_PATH */ @@ -165,7 +163,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, ".;X:\\"), "Got search path '%s', expected '.;X:\\'\n", search_path); /* With both _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH */ @@ -192,7 +189,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); }

1 0

Thomas Faber : dbghelp/tests: Add tests for SymSetSearchPath.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

Module: wine Branch: master Commit: 6bedd7cce6eda193646dd87487d59302bce4c88e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bedd7cce6eda193646dd874… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Oct 3 17:18:57 2020 +0200 dbghelp/tests: Add tests for SymSetSearchPath. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/dbghelp.c | 73 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index a243d047d18..06c21ec288c 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -132,12 +132,83 @@ static void test_stack_walk(void) #endif /* __i386__ || __x86_64__ */ +static void test_search_path(void) +{ + char search_path[128]; + BOOL ret; + + /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALT_SYMBOL_PATH%]". + * We unset both variables earlier so should simply get "." */ + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); + + /* Set an arbitrary search path */ + ret = SymSetSearchPath(GetCurrentProcess(), "W:\\"); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + ok(!strcmp(search_path, "W:\\"), "Got search path '%s', expected 'W:\\'\n", search_path); + + /* Setting to NULL resets to the default */ + ret = SymSetSearchPath(GetCurrentProcess(), NULL); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); + + /* With _NT_SYMBOL_PATH */ + SetEnvironmentVariableA("_NT_SYMBOL_PATH", "X:\\"); + ret = SymSetSearchPath(GetCurrentProcess(), NULL); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, ".;X:\\"), "Got search path '%s', expected '.;X:\\'\n", search_path); + + /* With both _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH */ + SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", "Y:\\"); + ret = SymSetSearchPath(GetCurrentProcess(), NULL); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, ".;X:\\;Y:\\"), "Got search path '%s', expected '.;X:\\;Y:\\'\n", search_path); + + /* With just _NT_ALT_SYMBOL_PATH */ + SetEnvironmentVariableA("_NT_SYMBOL_PATH", NULL); + ret = SymSetSearchPath(GetCurrentProcess(), NULL); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, ".;Y:\\"), "Got search path '%s', expected '.;Y:\\'\n", search_path); + + /* Restore original search path */ + SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL); + ret = SymSetSearchPath(GetCurrentProcess(), NULL); + ok(ret == TRUE, "ret = %d\n", ret); + ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); + ok(ret == TRUE, "ret = %d\n", ret); + todo_wine + ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); +} + START_TEST(dbghelp) { - BOOL ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); + BOOL ret; + + /* Don't let the user's environment influence our symbol path */ + SetEnvironmentVariableA("_NT_SYMBOL_PATH", NULL); + SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL); + + ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); ok(ret, "got error %u\n", GetLastError()); test_stack_walk(); + test_search_path(); ret = SymCleanup(GetCurrentProcess()); ok(ret, "got error %u\n", GetLastError());

1 0