Jacek Caban : dbghelp: Store process struct pointer in dump context.
Alexandre Julliard
julliard at winehq.org
Tue Mar 24 15:28:16 CDT 2020
Module: wine
Branch: master
Commit: 6b3018d03da983050516821caa2aada2f4814678
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3018d03da983050516821caa2aada2f4814678
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Mar 24 01:53:09 2020 +0100
dbghelp: Store process struct pointer in dump context.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/cpu_x86_64.c | 4 ++--
dlls/dbghelp/dbghelp_private.h | 2 +-
dlls/dbghelp/minidump.c | 49 ++++++++++++++++++++++++++----------------
3 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index 3c0b1d865e..676f18d00c 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -931,7 +931,7 @@ static BOOL x86_64_fetch_minidump_module(struct dump_context* dc, unsigned index
const RUNTIME_FUNCTION* rtf;
ULONG size;
- if (!(pcs = process_find_by_handle(dc->hProcess)) ||
+ if (!(pcs = process_find_by_handle(dc->process->handle)) ||
!(module = module_find_by_addr(pcs, dc->modules[index].base, DMT_UNKNOWN)))
return FALSE;
rtf = (const RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size);
@@ -949,7 +949,7 @@ static BOOL x86_64_fetch_minidump_module(struct dump_context* dc, unsigned index
/* we need to read into the other process */
/* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */
}
- if (ReadProcessMemory(dc->hProcess,
+ if (ReadProcessMemory(dc->process->handle,
(void*)(dc->modules[index].base + rtf->UnwindData),
&ui, sizeof(ui), NULL))
minidump_add_memory_block(dc, dc->modules[index].base + rtf->UnwindData,
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index 9415881c57..733fc487fe 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -498,7 +498,7 @@ struct dump_thread
struct dump_context
{
/* process & thread information */
- HANDLE hProcess;
+ struct process *process;
DWORD pid;
unsigned flags_out;
/* thread information */
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index 9922d08032..dcb09cfcac 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -93,7 +93,7 @@ static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr,
NT_TIB tib;
ADDRESS64 addr;
- if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL) &&
+ if (ReadProcessMemory(dc->process->handle, teb_addr, &tib, sizeof(tib), NULL) &&
dbghelp_current_cpu &&
dbghelp_current_cpu->get_addr(NULL /* FIXME */, ctx, cpu_addr_stack, &addr) && addr.Mode == AddrModeFlat)
{
@@ -170,9 +170,9 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx,
{
EXCEPTION_POINTERS ep;
- ReadProcessMemory(dc->hProcess, except->ExceptionPointers,
+ ReadProcessMemory(dc->process->handle, except->ExceptionPointers,
&ep, sizeof(ep), NULL);
- ReadProcessMemory(dc->hProcess, ep.ContextRecord,
+ ReadProcessMemory(dc->process->handle, ep.ContextRecord,
&lctx, sizeof(lctx), NULL);
pctx = &lctx;
}
@@ -215,7 +215,7 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name,
return FALSE;
}
if (is_elf ||
- !GetModuleFileNameExW(dc->hProcess, (HMODULE)(DWORD_PTR)base,
+ !GetModuleFileNameExW(dc->process->handle, (HMODULE)(DWORD_PTR)base,
dc->modules[dc->num_modules].name,
ARRAY_SIZE(dc->modules[dc->num_modules].name)))
lstrcpynW(dc->modules[dc->num_modules].name, name,
@@ -243,7 +243,7 @@ static BOOL WINAPI fetch_pe_module_info_cb(PCWSTR name, DWORD64 base, ULONG size
if (!validate_addr64(base)) return FALSE;
- if (pe_load_nt_header(dc->hProcess, base, &nth))
+ if (pe_load_nt_header(dc->process->handle, base, &nth))
add_module(user, name, base, size,
nth.FileHeader.TimeDateStamp, nth.OptionalHeader.CheckSum,
FALSE);
@@ -289,7 +289,7 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base,
/* NB: if we have a non-null base from the live-target use it. If we have
* a null base, then grab its base address from Mach-O file.
*/
- if (!macho_fetch_file_info(dc->hProcess, name, base, &rbase, &size, &checksum))
+ if (!macho_fetch_file_info(dc->process->handle, name, base, &rbase, &size, &checksum))
size = checksum = 0;
add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE);
return TRUE;
@@ -323,7 +323,7 @@ static void fetch_memory64_info(struct dump_context* dc)
MEMORY_BASIC_INFORMATION mbi;
addr = 0;
- while (VirtualQueryEx(dc->hProcess, (LPCVOID)addr, &mbi, sizeof(mbi)) != 0)
+ while (VirtualQueryEx(dc->process->handle, (LPCVOID)addr, &mbi, sizeof(mbi)) != 0)
{
/* Memory regions with state MEM_COMMIT will be added to the dump */
if (mbi.State == MEM_COMMIT)
@@ -340,14 +340,14 @@ static void fetch_memory64_info(struct dump_context* dc)
static void fetch_modules_info(struct dump_context* dc)
{
- EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc);
+ EnumerateLoadedModulesW64(dc->process->handle, fetch_pe_module_info_cb, dc);
/* Since we include ELF modules in a separate stream from the regular PE ones,
* we can always include those ELF modules (they don't eat lots of space)
* And it's always a good idea to have a trace of the loaded ELF modules for
* a given application in a post mortem debugging condition.
*/
- elf_enum_modules(dc->hProcess, fetch_elf_module_info_cb, dc);
- macho_enum_modules(dc->hProcess, fetch_macho_module_info_cb, dc);
+ elf_enum_modules(dc->process->handle, fetch_elf_module_info_cb, dc);
+ macho_enum_modules(dc->process->handle, fetch_macho_module_info_cb, dc);
}
static void fetch_module_versioninfo(LPCWSTR filename, VS_FIXEDFILEINFO* ffi)
@@ -447,11 +447,11 @@ static unsigned dump_exception_info(struct dump_context* dc,
{
EXCEPTION_POINTERS ep;
- ReadProcessMemory(dc->hProcess,
+ ReadProcessMemory(dc->process->handle,
except->ExceptionPointers, &ep, sizeof(ep), NULL);
- ReadProcessMemory(dc->hProcess,
+ ReadProcessMemory(dc->process->handle,
ep.ExceptionRecord, &rec, sizeof(rec), NULL);
- ReadProcessMemory(dc->hProcess,
+ ReadProcessMemory(dc->process->handle,
ep.ContextRecord, &ctx, sizeof(ctx), NULL);
prec = &rec;
pctx = &ctx;
@@ -537,7 +537,7 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf)
MINIDUMP_CALLBACK_OUTPUT cbout;
cbin.ProcessId = dc->pid;
- cbin.ProcessHandle = dc->hProcess;
+ cbin.ProcessHandle = dc->process->handle;
cbin.CallbackType = ModuleCallback;
cbin.u.Module.FullPath = ms->Buffer;
@@ -782,7 +782,7 @@ static unsigned dump_threads(struct dump_context* dc,
MINIDUMP_CALLBACK_OUTPUT cbout;
cbin.ProcessId = dc->pid;
- cbin.ProcessHandle = dc->hProcess;
+ cbin.ProcessHandle = dc->process->handle;
cbin.CallbackType = ThreadCallback;
cbin.u.Thread.ThreadId = dc->threads[i].tid;
cbin.u.Thread.ThreadHandle = 0; /* FIXME */
@@ -859,7 +859,7 @@ static unsigned dump_memory_info(struct dump_context* dc)
for (pos = 0; pos < dc->mem[i].size; pos += sizeof(tmp))
{
len = min(dc->mem[i].size - pos, sizeof(tmp));
- if (ReadProcessMemory(dc->hProcess,
+ if (ReadProcessMemory(dc->process->handle,
(void*)(DWORD_PTR)(dc->mem[i].base + pos),
tmp, len, NULL))
WriteFile(dc->hFile, tmp, len, &written, NULL);
@@ -917,7 +917,7 @@ static unsigned dump_memory64_info(struct dump_context* dc)
for (pos = 0; pos < dc->mem64[i].size; pos += sizeof(tmp))
{
len = min(dc->mem64[i].size - pos, sizeof(tmp));
- if (ReadProcessMemory(dc->hProcess,
+ if (ReadProcessMemory(dc->process->handle,
(void*)(ULONG_PTR)(dc->mem64[i].base + pos),
tmp, len, NULL))
WriteFile(dc->hFile, tmp, len, &written, NULL);
@@ -960,8 +960,18 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile,
MINIDUMP_DIRECTORY mdDir;
DWORD i, nStreams, idx_stream;
struct dump_context dc;
+ BOOL sym_initialized = FALSE;
+
+ if (!(dc.process = process_find_by_handle(hProcess)))
+ {
+ if (!(sym_initialized = SymInitializeW(hProcess, NULL, TRUE)))
+ {
+ WARN("failed to initialize process\n");
+ return FALSE;
+ }
+ dc.process = process_find_by_handle(hProcess);
+ }
- dc.hProcess = hProcess;
dc.hFile = hFile;
dc.pid = pid;
dc.modules = NULL;
@@ -1097,6 +1107,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile,
for (i = idx_stream; i < nStreams; i++)
writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir));
+ if (sym_initialized)
+ SymCleanup(hProcess);
+
HeapFree(GetProcessHeap(), 0, dc.mem);
HeapFree(GetProcessHeap(), 0, dc.mem64);
HeapFree(GetProcessHeap(), 0, dc.modules);
More information about the wine-cvs
mailing list