Commit 40dfd9b8 authored by Thomas Faber's avatar Thomas Faber Committed by Alexandre Julliard

dbghelp: Use _NT_ALT_SYMBOL_PATH.

parent bb280298
...@@ -183,9 +183,9 @@ static WCHAR* make_default_search_path(void) ...@@ -183,9 +183,9 @@ static WCHAR* make_default_search_path(void)
unsigned alt_sym_path_len; unsigned alt_sym_path_len;
sym_path_len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); 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 * 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. */ * space for the semicolons, and only add the initial dot and the final null. */
search_path = HeapAlloc(GetProcessHeap(), 0, search_path = HeapAlloc(GetProcessHeap(), 0,
...@@ -204,7 +204,7 @@ static WCHAR* make_default_search_path(void) ...@@ -204,7 +204,7 @@ static WCHAR* make_default_search_path(void)
if (alt_sym_path_len) if (alt_sym_path_len)
{ {
*p++ = L';'; *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 += alt_sym_path_len - 1;
} }
*p = L'\0'; *p = L'\0';
......
...@@ -171,7 +171,6 @@ static void test_search_path(void) ...@@ -171,7 +171,6 @@ static void test_search_path(void)
ok(ret == TRUE, "ret = %d\n", ret); ok(ret == TRUE, "ret = %d\n", ret);
ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path));
ok(ret == TRUE, "ret = %d\n", ret); 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); ok(!strcmp(search_path, ".;X:\\;Y:\\"), "Got search path '%s', expected '.;X:\\;Y:\\'\n", search_path);
/* With just _NT_ALT_SYMBOL_PATH */ /* With just _NT_ALT_SYMBOL_PATH */
...@@ -180,7 +179,6 @@ static void test_search_path(void) ...@@ -180,7 +179,6 @@ static void test_search_path(void)
ok(ret == TRUE, "ret = %d\n", ret); ok(ret == TRUE, "ret = %d\n", ret);
ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path));
ok(ret == TRUE, "ret = %d\n", ret); ok(ret == TRUE, "ret = %d\n", ret);
todo_wine
ok(!strcmp(search_path, ".;Y:\\"), "Got search path '%s', expected '.;Y:\\'\n", search_path); ok(!strcmp(search_path, ".;Y:\\"), "Got search path '%s', expected '.;Y:\\'\n", search_path);
/* Restore original search path */ /* Restore original search path */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment