Thomas Faber : dbghelp: Use _NT_ALT_SYMBOL_PATH.
Alexandre Julliard
julliard at winehq.org
Mon Nov 15 16:01:29 CST 2021
Module: wine
Branch: master
Commit: 40dfd9b8b140490604eaae1ccb3abcb14ce12db3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=40dfd9b8b140490604eaae1ccb3abcb14ce12db3
Author: Thomas Faber <thomas.faber at reactos.org>
Date: Fri Nov 12 20:17:01 2021 -0500
dbghelp: Use _NT_ALT_SYMBOL_PATH.
Signed-off-by: Thomas Faber <thomas.faber at reactos.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/dbghelp.c | 6 +++---
dlls/dbghelp/tests/dbghelp.c | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index 063fe4cdc6d..d854f6287a0 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -183,9 +183,9 @@ static WCHAR* make_default_search_path(void)
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);
+ alt_sym_path_len = GetEnvironmentVariableW(L"_NT_ALT_SYMBOL_PATH", NULL, 0);
- /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALTERNATE_SYMBOL_PATH%]".
+ /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALT_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,
@@ -204,7 +204,7 @@ static WCHAR* make_default_search_path(void)
if (alt_sym_path_len)
{
*p++ = L';';
- GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", p, alt_sym_path_len);
+ GetEnvironmentVariableW(L"_NT_ALT_SYMBOL_PATH", p, alt_sym_path_len);
p += alt_sym_path_len - 1;
}
*p = L'\0';
diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c
index a42e83aa2c8..b7e828281cd 100644
--- a/dlls/dbghelp/tests/dbghelp.c
+++ b/dlls/dbghelp/tests/dbghelp.c
@@ -171,7 +171,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:\\;Y:\\"), "Got search path '%s', expected '.;X:\\;Y:\\'\n", search_path);
/* With just _NT_ALT_SYMBOL_PATH */
@@ -180,7 +179,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, ".;Y:\\"), "Got search path '%s', expected '.;Y:\\'\n", search_path);
/* Restore original search path */
More information about the wine-cvs
mailing list