dbghelp: Rename some things to be less ELF-centric.
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index 5d3f401..289e24c 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -111,7 +111,7 @@
extern unsigned dbghelp_options;
/* some more Wine extensions */
-#define SYMOPT_WINE_WITH_ELF_MODULES 0x40000000
+#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000
enum location_kind {loc_error, /* reg is the error code */
loc_absolute, /* offset is the location */
@@ -413,10 +413,11 @@
extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data);
extern void* fetch_buffer(struct process* pcs, unsigned size);
+typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user);
+
/* elf_module.c */
#define ELF_NO_MAP ((const void*)0xffffffff)
-typedef BOOL (*elf_enum_modules_cb)(const WCHAR*, unsigned long addr, void* user);
-extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*);
+extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*);
extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum);
struct elf_file_map;
extern BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap);
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 3b6c7cc..52ada0e 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -1390,7 +1390,7 @@
*/
static BOOL elf_enum_modules_internal(const struct process* pcs,
const WCHAR* main_name,
- elf_enum_modules_cb cb, void* user)
+ enum_modules_cb cb, void* user)
{
struct r_debug dbg_hdr;
void* lm_addr;
@@ -1531,7 +1531,7 @@
* This function doesn't require that someone has called SymInitialize
* on this very process.
*/
-BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb cb, void* user)
+BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb cb, void* user)
{
struct process pcs;
struct elf_info elf_info;
@@ -1636,7 +1636,7 @@
return FALSE;
}
-BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb cb, void* user)
+BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb cb, void* user)
{
return FALSE;
}
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index a7af0f5..abccf2c 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -358,13 +358,13 @@
}
/******************************************************************
- * module_is_elf_container_loaded
+ * module_is_container_loaded
*
- * checks whether the ELF container, for a (supposed) PE builtin is
+ * checks whether the native container, for a (supposed) PE builtin is
* already loaded
*/
-static BOOL module_is_elf_container_loaded(const struct process* pcs,
- const WCHAR* ImageName, DWORD base)
+static BOOL module_is_container_loaded(const struct process* pcs,
+ const WCHAR* ImageName, DWORD base)
{
size_t len;
struct module* module;
@@ -525,7 +525,7 @@
if (wImageName)
{
module = module_is_already_loaded(pcs, wImageName);
- if (!module && module_is_elf_container_loaded(pcs, wImageName, BaseOfDll))
+ if (!module && module_is_container_loaded(pcs, wImageName, BaseOfDll))
{
/* force the loading of DLL as builtin */
module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll);
@@ -709,7 +709,7 @@
for (module = pcs->lmodules; module; module = module->next)
{
- if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF)
+ if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && module->type == DMT_ELF)
continue;
if (!EnumModulesCallback(module->module.ModuleName,
module->module.BaseOfImage, UserContext))
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 0810506..1686607 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1009,7 +1009,7 @@
}
/* not found in PE modules, retry on the ELF ones
*/
- if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES))
+ if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES))
{
for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested = pair.requested->next)
{
@@ -1336,7 +1336,7 @@
}
/* not found in PE modules, retry on the ELF ones
*/
- if (dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES)
+ if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)
{
for (module = pcs->lmodules; module; module = module->next)
{
