Skip to content

W
wine-winehq
Commit ed532a36 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dbghelp/tests: Review old-wow64 expected values.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com>
parent 76d92298
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 19 deletions
dlls/dbghelp/tests/dbghelp.c
View file @ ed532a36
...@@ -764,16 +764,34 @@ static void test_loaded_modules(void) ...@@ -764,16 +764,34 @@ static void test_loaded_modules(void)
ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation);
ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError());
todo_wine switch (get_process_kind(pi.hProcess))
ok(aggregation.count_32bit == 1 && aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n", {
aggregation.count_32bit, aggregation.count_64bit); default:
ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", ok(0, "Unknown process kind\n");
aggregation.count_exe, aggregation.count_ntdll); break;
todo_wine case PCSKIND_WINE_OLD_WOW64:
ok(aggregation.count_systemdir > 2 && aggregation.count_64bit == aggregation.count_systemdir && aggregation.count_wowdir == 1, todo_wine
"Wrong directory aggregation count %u %u\n", ok(aggregation.count_32bit == 1 && !aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n",
aggregation.count_systemdir, aggregation.count_wowdir); aggregation.count_32bit, aggregation.count_64bit);
todo_wine
ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 0, "Wrong kind aggregation count %u %u\n",
aggregation.count_exe, aggregation.count_ntdll);
todo_wine
ok(aggregation.count_systemdir == 0 && aggregation.count_wowdir == 1,
"Wrong directory aggregation count %u %u\n",
aggregation.count_systemdir, aggregation.count_wowdir);
break;
case PCSKIND_WOW64:
todo_wine
ok(aggregation.count_32bit == 1 && aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n",
aggregation.count_32bit, aggregation.count_64bit);
ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n",
aggregation.count_exe, aggregation.count_ntdll);
todo_wine
ok(aggregation.count_systemdir > 2 && aggregation.count_64bit == aggregation.count_systemdir && aggregation.count_wowdir == 1,
"Wrong directory aggregation count %u %u\n",
aggregation.count_systemdir, aggregation.count_wowdir);
}
ret = SymRefreshModuleList(pi.hProcess); ret = SymRefreshModuleList(pi.hProcess);
ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError());
...@@ -805,15 +823,34 @@ static void test_loaded_modules(void) ...@@ -805,15 +823,34 @@ static void test_loaded_modules(void)
ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2);
ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError());
ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n", switch (get_process_kind(pi.hProcess))
aggregation2.count_32bit, aggregation2.count_64bit); {
todo_wine case PCSKIND_ERROR:
ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 2, "Wrong kind aggregation count %u %u\n", break;
aggregation2.count_exe, aggregation2.count_ntdll); case PCSKIND_WINE_OLD_WOW64:
todo_wine todo_wine
ok(aggregation2.count_systemdir > 2 && aggregation2.count_64bit == aggregation2.count_systemdir && aggregation2.count_wowdir > 2, ok(aggregation2.count_32bit && !aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n",
"Wrong directory aggregation count %u %u\n", aggregation2.count_32bit, aggregation2.count_64bit);
aggregation2.count_systemdir, aggregation2.count_wowdir); todo_wine
ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 1, "Wrong kind aggregation count %u %u\n",
aggregation2.count_exe, aggregation2.count_ntdll);
todo_wine
ok(aggregation2.count_systemdir == 0 && aggregation2.count_32bit == aggregation2.count_wowdir + 1 && aggregation2.count_wowdir > 2,
"Wrong directory aggregation count %u %u\n",
aggregation2.count_systemdir, aggregation2.count_wowdir);
break;
default:
ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n",
aggregation2.count_32bit, aggregation2.count_64bit);
todo_wine
ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 2, "Wrong kind aggregation count %u %u\n",
aggregation2.count_exe, aggregation2.count_ntdll);
todo_wine
ok(aggregation2.count_systemdir > 2 && aggregation2.count_64bit == aggregation2.count_systemdir && aggregation2.count_wowdir > 2,
"Wrong directory aggregation count %u %u\n",
aggregation2.count_systemdir, aggregation2.count_wowdir);
break;
}
ret = SymRefreshModuleList(pi.hProcess); ret = SymRefreshModuleList(pi.hProcess);
ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError());
......
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