dbghelp/tests: Use msinfo32.exe instead of notepad.exe.

Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. (May not fully fix all the bugs below, but will get rid of a bunch of errors). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54535 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54536 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54537Signed-off-by: Eric Pouech <eric.pouech@gmail.com>

dbghelp/tests: Use msinfo32.exe instead of notepad.exe.
13afaa7c · Eric Pouech · Alexandre Julliard · 38e3a92e · 13afaa7c
Commit 13afaa7c authored Feb 21, 2023 by Eric Pouech Committed by Alexandre Julliard Mar 08, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

dbghelp.c dlls/dbghelp/tests/dbghelp.c +4 -4

No files found.
--- a/dlls/dbghelp/tests/dbghelp.c
+++ b/dlls/dbghelp/tests/dbghelp.c
@@ -381,7 +381,7 @@ static BOOL test_modules(void)
    ok(ret, "SymInitialize failed: %lu\n", GetLastError());

    GetSystemWow64DirectoryA(file_wow64, MAX_PATH);
-    strcat(file_wow64, "\\notepad.exe");
+    strcat(file_wow64, "\\msinfo32.exe");

    /* not always present */
    machine_wow = get_module_machine(file_wow64);
@@ -397,7 +397,7 @@ static BOOL test_modules(void)
    }

    GetSystemDirectoryA(file_system, MAX_PATH);
-    strcat(file_system, "\\notepad.exe");
+    strcat(file_system, "\\msinfo32.exe");

    base = SymLoadModule(GetCurrentProcess(), NULL, file_system, NULL, base1, 0);
    ok(base == base1, "SymLoadModule failed: %lu\n", GetLastError());
@@ -676,7 +676,7 @@ static void test_loaded_modules(void)

    ret = GetSystemDirectoryA(buffer, sizeof(buffer));
    ok(ret, "got error %lu\n", GetLastError());
-    strcat(buffer, "\\notepad.exe");
+    strcat(buffer, "\\msinfo32.exe");

    /* testing with child process of different machines */
    ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
@@ -744,7 +744,7 @@ static void test_loaded_modules(void)
    {
        ret = GetSystemWow64DirectoryA(buffer, sizeof(buffer));
        ok(ret, "got error %lu\n", GetLastError());
-        strcat(buffer, "\\notepad.exe");
+        strcat(buffer, "\\msinfo32.exe");

        SymSetOptions(SymGetOptions() & ~SYMOPT_INCLUDE_32BIT_MODULES);