Skip to content

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

dbghelp: In Minidump, change a couple of internal names for consistency.

parent 2af9736f
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
dlls/dbghelp/minidump.c
View file @ b32cfb18
...@@ -57,8 +57,8 @@ struct dump_context ...@@ -57,8 +57,8 @@ struct dump_context
void* pcs_buffer; void* pcs_buffer;
SYSTEM_PROCESS_INFORMATION* spi; SYSTEM_PROCESS_INFORMATION* spi;
/* module information */ /* module information */
struct dump_module* module; struct dump_module* modules;
unsigned num_module; unsigned num_modules;
/* exception information */ /* exception information */
/* output information */ /* output information */
MINIDUMP_TYPE type; MINIDUMP_TYPE type;
...@@ -71,12 +71,12 @@ struct dump_context ...@@ -71,12 +71,12 @@ struct dump_context
}; };
/****************************************************************** /******************************************************************
* fetch_process_info * fetch_processes_info
* *
* reads system wide process information, and make spi point to the record * reads system wide process information, and make spi point to the record
* for process of id 'pid' * for process of id 'pid'
*/ */
static BOOL fetch_process_info(struct dump_context* dc) static BOOL fetch_processes_info(struct dump_context* dc)
{ {
ULONG buf_size = 0x1000; ULONG buf_size = 0x1000;
NTSTATUS nts; NTSTATUS nts;
...@@ -221,24 +221,24 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, ...@@ -221,24 +221,24 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name,
DWORD base, DWORD size, DWORD timestamp, DWORD checksum, DWORD base, DWORD size, DWORD timestamp, DWORD checksum,
BOOL is_elf) BOOL is_elf)
{ {
if (!dc->module) if (!dc->modules)
dc->module = HeapAlloc(GetProcessHeap(), 0, dc->modules = HeapAlloc(GetProcessHeap(), 0,
++dc->num_module * sizeof(*dc->module)); ++dc->num_modules * sizeof(*dc->modules));
else else
dc->module = HeapReAlloc(GetProcessHeap(), 0, dc->module, dc->modules = HeapReAlloc(GetProcessHeap(), 0, dc->modules,
++dc->num_module * sizeof(*dc->module)); ++dc->num_modules * sizeof(*dc->modules));
if (!dc->module) return FALSE; if (!dc->modules) return FALSE;
if (is_elf || if (is_elf ||
!GetModuleFileNameExW(dc->hProcess, (HMODULE)base, !GetModuleFileNameExW(dc->hProcess, (HMODULE)base,
dc->module[dc->num_module - 1].name, dc->modules[dc->num_modules - 1].name,
sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR))) sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR)))
lstrcpynW(dc->module[dc->num_module - 1].name, name, lstrcpynW(dc->modules[dc->num_modules - 1].name, name,
sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR)); sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR));
dc->module[dc->num_module - 1].base = base; dc->modules[dc->num_modules - 1].base = base;
dc->module[dc->num_module - 1].size = size; dc->modules[dc->num_modules - 1].size = size;
dc->module[dc->num_module - 1].timestamp = timestamp; dc->modules[dc->num_modules - 1].timestamp = timestamp;
dc->module[dc->num_module - 1].checksum = checksum; dc->modules[dc->num_modules - 1].checksum = checksum;
dc->module[dc->num_module - 1].is_elf = is_elf; dc->modules[dc->num_modules - 1].is_elf = is_elf;
return TRUE; return TRUE;
} }
...@@ -285,7 +285,7 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, ...@@ -285,7 +285,7 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base,
return TRUE; return TRUE;
} }
static void fetch_module_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->hProcess, fetch_pe_module_info_cb, dc);
/* Since we include ELF modules in a separate stream from the regular PE ones, /* Since we include ELF modules in a separate stream from the regular PE ones,
...@@ -410,10 +410,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ...@@ -410,10 +410,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size
RVA rva_base; RVA rva_base;
DWORD flags_out; DWORD flags_out;
for (i = nmod = 0; i < dc->num_module; i++) for (i = nmod = 0; i < dc->num_modules; i++)
{ {
if ((dc->module[i].is_elf && dump_elf) || if ((dc->modules[i].is_elf && dump_elf) ||
(!dc->module[i].is_elf && !dump_elf)) (!dc->modules[i].is_elf && !dump_elf))
nmod++; nmod++;
} }
...@@ -425,10 +425,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ...@@ -425,10 +425,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size
*/ */
rva_base = dc->rva; rva_base = dc->rva;
dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod;
for (i = 0; i < dc->num_module; i++) for (i = 0; i < dc->num_modules; i++)
{ {
if ((dc->module[i].is_elf && !dump_elf) || if ((dc->modules[i].is_elf && !dump_elf) ||
(!dc->module[i].is_elf && dump_elf)) (!dc->modules[i].is_elf && dump_elf))
continue; continue;
flags_out = ModuleWriteModule | ModuleWriteMiscRecord | ModuleWriteCvRecord; flags_out = ModuleWriteModule | ModuleWriteMiscRecord | ModuleWriteCvRecord;
...@@ -438,10 +438,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ...@@ -438,10 +438,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size
flags_out |= ModuleWriteTlsData; flags_out |= ModuleWriteTlsData;
if (dc->type & MiniDumpWithCodeSegs) if (dc->type & MiniDumpWithCodeSegs)
flags_out |= ModuleWriteCodeSegs; flags_out |= ModuleWriteCodeSegs;
ms->Length = (lstrlenW(dc->module[i].name) + 1) * sizeof(WCHAR); ms->Length = (lstrlenW(dc->modules[i].name) + 1) * sizeof(WCHAR);
if (sizeof(ULONG) + ms->Length > sizeof(tmp)) if (sizeof(ULONG) + ms->Length > sizeof(tmp))
FIXME("Buffer overflow!!!\n"); FIXME("Buffer overflow!!!\n");
lstrcpyW(ms->Buffer, dc->module[i].name); lstrcpyW(ms->Buffer, dc->modules[i].name);
if (dc->cb) if (dc->cb)
{ {
...@@ -453,10 +453,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ...@@ -453,10 +453,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size
cbin.CallbackType = ModuleCallback; cbin.CallbackType = ModuleCallback;
cbin.u.Module.FullPath = ms->Buffer; cbin.u.Module.FullPath = ms->Buffer;
cbin.u.Module.BaseOfImage = dc->module[i].base; cbin.u.Module.BaseOfImage = dc->modules[i].base;
cbin.u.Module.SizeOfImage = dc->module[i].size; cbin.u.Module.SizeOfImage = dc->modules[i].size;
cbin.u.Module.CheckSum = dc->module[i].checksum; cbin.u.Module.CheckSum = dc->modules[i].checksum;
cbin.u.Module.TimeDateStamp = dc->module[i].timestamp; cbin.u.Module.TimeDateStamp = dc->modules[i].timestamp;
memset(&cbin.u.Module.VersionInfo, 0, sizeof(cbin.u.Module.VersionInfo)); memset(&cbin.u.Module.VersionInfo, 0, sizeof(cbin.u.Module.VersionInfo));
cbin.u.Module.CvRecord = NULL; cbin.u.Module.CvRecord = NULL;
cbin.u.Module.SizeOfCvRecord = 0; cbin.u.Module.SizeOfCvRecord = 0;
...@@ -470,10 +470,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ...@@ -470,10 +470,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size
} }
if (flags_out & ModuleWriteModule) if (flags_out & ModuleWriteModule)
{ {
mdModule.BaseOfImage = dc->module[i].base; mdModule.BaseOfImage = dc->modules[i].base;
mdModule.SizeOfImage = dc->module[i].size; mdModule.SizeOfImage = dc->modules[i].size;
mdModule.CheckSum = dc->module[i].checksum; mdModule.CheckSum = dc->modules[i].checksum;
mdModule.TimeDateStamp = dc->module[i].timestamp; mdModule.TimeDateStamp = dc->modules[i].timestamp;
mdModule.ModuleNameRva = dc->rva; mdModule.ModuleNameRva = dc->rva;
ms->Length -= sizeof(WCHAR); ms->Length -= sizeof(WCHAR);
append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR));
...@@ -700,16 +700,16 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, ...@@ -700,16 +700,16 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile,
dc.hProcess = hProcess; dc.hProcess = hProcess;
dc.hFile = hFile; dc.hFile = hFile;
dc.pid = pid; dc.pid = pid;
dc.module = NULL; dc.modules = NULL;
dc.num_module = 0; dc.num_modules = 0;
dc.cb = CallbackParam; dc.cb = CallbackParam;
dc.type = DumpType; dc.type = DumpType;
dc.mem = NULL; dc.mem = NULL;
dc.num_mem = 0; dc.num_mem = 0;
dc.rva = 0; dc.rva = 0;
if (!fetch_process_info(&dc)) return FALSE; if (!fetch_processes_info(&dc)) return FALSE;
fetch_module_info(&dc); fetch_modules_info(&dc);
/* 1) init */ /* 1) init */
nStreams = 6 + (ExceptionParam ? 1 : 0) + nStreams = 6 + (ExceptionParam ? 1 : 0) +
...@@ -806,7 +806,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, ...@@ -806,7 +806,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile,
HeapFree(GetProcessHeap(), 0, dc.pcs_buffer); HeapFree(GetProcessHeap(), 0, dc.pcs_buffer);
HeapFree(GetProcessHeap(), 0, dc.mem); HeapFree(GetProcessHeap(), 0, dc.mem);
HeapFree(GetProcessHeap(), 0, dc.module); HeapFree(GetProcessHeap(), 0, dc.modules);
return TRUE; return TRUE;
} }
......
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