Skip to content

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

dbghelp: Don't write minidump from running thread.

In case a minidump is written from current process, create a dedicated thread to write the minidump (and hide that thread from the minidump). Signed-off-by: 's avatarEric Pouech <epouech@codeweavers.com>
parent 56193155
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/dbghelp/dbghelp_private.h
View file @ f799bf02
...@@ -618,7 +618,9 @@ struct dump_context ...@@ -618,7 +618,9 @@ struct dump_context
struct dump_module* modules; struct dump_module* modules;
unsigned num_modules; unsigned num_modules;
unsigned alloc_modules; unsigned alloc_modules;
/* exception information */ /* outter information */
MINIDUMP_EXCEPTION_INFORMATION *except_param;
MINIDUMP_USER_STREAM_INFORMATION *user_stream;
/* output information */ /* output information */
MINIDUMP_TYPE type; MINIDUMP_TYPE type;
HANDLE hFile; HANDLE hFile;
......
dlls/dbghelp/tests/minidump.c
View file @ f799bf02
...@@ -463,13 +463,11 @@ static void test_current_process(void) ...@@ -463,13 +463,11 @@ static void test_current_process(void)
num_threads = minidump_get_number_of_threads(data); num_threads = minidump_get_number_of_threads(data);
ok(num_threads > 0, "Unexpected number of threads\n"); ok(num_threads > 0, "Unexpected number of threads\n");
minidump_check_threads(data, 11); minidump_check_threads(data, 2);
md = minidump_get_memory_description(data, (DWORD_PTR)&i); md = minidump_get_memory_description(data, (DWORD_PTR)&i);
todo_wine
ok(md.kind == MD_STACK, "Couldn't find automatic variable\n"); ok(md.kind == MD_STACK, "Couldn't find automatic variable\n");
md2 = minidump_get_memory_description(data, (DWORD_PTR)NtCurrentTeb()->Tib.StackBase - sizeof(void*)); md2 = minidump_get_memory_description(data, (DWORD_PTR)NtCurrentTeb()->Tib.StackBase - sizeof(void*));
todo_wine
ok(md2.kind == MD_STACK, "Couldn't find stack bottom\n"); ok(md2.kind == MD_STACK, "Couldn't find stack bottom\n");
ok(md.id == md2.id, "Should be on same stack\n"); ok(md.id == md2.id, "Should be on same stack\n");
...@@ -486,7 +484,6 @@ static void test_current_process(void) ...@@ -486,7 +484,6 @@ static void test_current_process(void)
minidump_walk_memory(data, &walker); minidump_walk_memory(data, &walker);
ok(walker.num_unknown == 0, "unexpected unknown memory locations\n"); ok(walker.num_unknown == 0, "unexpected unknown memory locations\n");
todo_wine
ok(walker.num_thread_stack == num_threads, "Unexpected number of stacks\n"); ok(walker.num_thread_stack == num_threads, "Unexpected number of stacks\n");
if (sizeof(void*) > 4 && (process_tests[i].dump_type & MiniDumpWithModuleHeaders)) if (sizeof(void*) > 4 && (process_tests[i].dump_type & MiniDumpWithModuleHeaders))
...@@ -810,8 +807,9 @@ static void test_exception(void) ...@@ -810,8 +807,9 @@ static void test_exception(void)
ok(except_info->ThreadContext.Rva, "Unexpected value\n"); ok(except_info->ThreadContext.Rva, "Unexpected value\n");
mctx = RVA_TO_ADDR(data, except_info->ThreadContext.Rva); mctx = RVA_TO_ADDR(data, except_info->ThreadContext.Rva);
ok(!memcmp(mctx, &ctx, sizeof(ctx)), "Unexpected value\n"); ok(!memcmp(mctx, &ctx, sizeof(ctx)), "Unexpected value\n");
minidump_check_threads(data, exception_tests[i].with_child ? 2 : (sizeof(void*) == 4 ? 7 : 6)); minidump_check_threads(data, 2);
minidump_close_for_read(data); minidump_close_for_read(data);
DeleteFileA("foo.mdmp");
winetest_pop_context(); winetest_pop_context();
if (exception_tests[i].with_child) if (exception_tests[i].with_child)
{ {
......
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