mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 07:44:47 +00:00
dbghelp: Implemented 64 bit versions of EnumerateLoadedModules.
This commit is contained in:
parent
b2557f25d9
commit
883732281e
|
@ -3,8 +3,8 @@
|
||||||
@ stdcall EnumDirTree(long str str ptr ptr ptr)
|
@ stdcall EnumDirTree(long str str ptr ptr ptr)
|
||||||
@ stub EnumDirTreeW
|
@ stub EnumDirTreeW
|
||||||
@ stdcall EnumerateLoadedModules(long ptr ptr)
|
@ stdcall EnumerateLoadedModules(long ptr ptr)
|
||||||
@ stub EnumerateLoadedModules64
|
@ stdcall EnumerateLoadedModules64(long ptr ptr)
|
||||||
@ stub EnumerateLoadedModulesW64
|
@ stdcall EnumerateLoadedModulesW64(long ptr ptr)
|
||||||
@ stdcall ExtensionApiVersion()
|
@ stdcall ExtensionApiVersion()
|
||||||
@ stdcall FindDebugInfoFile(str str ptr)
|
@ stdcall FindDebugInfoFile(str str ptr)
|
||||||
@ stdcall FindDebugInfoFileEx(str str ptr ptr ptr)
|
@ stdcall FindDebugInfoFileEx(str str ptr ptr ptr)
|
||||||
|
|
|
@ -620,12 +620,12 @@ BOOL WINAPI SymEnumerateModules64(HANDLE hProcess,
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* EnumerateLoadedModules (DBGHELP.@)
|
* EnumerateLoadedModules64 (DBGHELP.@)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess,
|
BOOL WINAPI EnumerateLoadedModules64(HANDLE hProcess,
|
||||||
PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
|
PENUMLOADED_MODULES_CALLBACK64 EnumLoadedModulesCallback,
|
||||||
PVOID UserContext)
|
PVOID UserContext)
|
||||||
{
|
{
|
||||||
HMODULE* hMods;
|
HMODULE* hMods;
|
||||||
char base[256], mod[256];
|
char base[256], mod[256];
|
||||||
|
@ -649,7 +649,7 @@ BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess,
|
||||||
!GetModuleBaseNameA(hProcess, hMods[i], base, sizeof(base)))
|
!GetModuleBaseNameA(hProcess, hMods[i], base, sizeof(base)))
|
||||||
continue;
|
continue;
|
||||||
module_fill_module(base, mod, sizeof(mod));
|
module_fill_module(base, mod, sizeof(mod));
|
||||||
EnumLoadedModulesCallback(mod, (DWORD)mi.lpBaseOfDll, mi.SizeOfImage,
|
EnumLoadedModulesCallback(mod, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage,
|
||||||
UserContext);
|
UserContext);
|
||||||
}
|
}
|
||||||
HeapFree(GetProcessHeap(), 0, hMods);
|
HeapFree(GetProcessHeap(), 0, hMods);
|
||||||
|
@ -657,6 +657,68 @@ BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess,
|
||||||
return sz != 0 && i == sz;
|
return sz != 0 && i == sz;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/******************************************************************
|
||||||
|
* EnumerateLoadedModules (DBGHELP.@)
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
struct enum_load_mod64_32
|
||||||
|
{
|
||||||
|
PENUMLOADED_MODULES_CALLBACK cb;
|
||||||
|
PVOID user;
|
||||||
|
};
|
||||||
|
|
||||||
|
static BOOL CALLBACK enum_load_mod64_32(PSTR name, DWORD64 base, ULONG size,
|
||||||
|
PVOID user)
|
||||||
|
{
|
||||||
|
struct enum_load_mod64_32* x = user;
|
||||||
|
return x->cb(name, (DWORD)base, size, x->user);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess,
|
||||||
|
PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
|
||||||
|
PVOID UserContext)
|
||||||
|
{
|
||||||
|
struct enum_load_mod64_32 x;
|
||||||
|
|
||||||
|
x.cb = EnumLoadedModulesCallback;
|
||||||
|
x.user = UserContext;
|
||||||
|
|
||||||
|
return EnumerateLoadedModules64(hProcess, enum_load_mod64_32, &x);
|
||||||
|
}
|
||||||
|
|
||||||
|
/******************************************************************
|
||||||
|
* EnumerateLoadedModulesW64 (DBGHELP.@)
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
struct enum_load_mod64_W64
|
||||||
|
{
|
||||||
|
PENUMLOADED_MODULES_CALLBACKW64 cb;
|
||||||
|
PVOID user;
|
||||||
|
WCHAR module[MAX_PATH];
|
||||||
|
};
|
||||||
|
|
||||||
|
static BOOL CALLBACK enum_load_mod64_W64(PSTR name, DWORD64 base, ULONG size,
|
||||||
|
PVOID user)
|
||||||
|
{
|
||||||
|
struct enum_load_mod64_W64* x = user;
|
||||||
|
|
||||||
|
MultiByteToWideChar(CP_ACP, 0, name, -1,
|
||||||
|
x->module, sizeof(x->module) / sizeof(WCHAR));
|
||||||
|
return x->cb(x->module, base, size, x->user);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess,
|
||||||
|
PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback,
|
||||||
|
PVOID UserContext)
|
||||||
|
{
|
||||||
|
struct enum_load_mod64_W64 x;
|
||||||
|
|
||||||
|
x.cb = EnumLoadedModulesCallback;
|
||||||
|
x.user = UserContext;
|
||||||
|
|
||||||
|
return EnumerateLoadedModules64(hProcess, enum_load_mod64_W64, &x);
|
||||||
|
}
|
||||||
|
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* SymGetModuleInfo (DBGHELP.@)
|
* SymGetModuleInfo (DBGHELP.@)
|
||||||
*
|
*
|
||||||
|
|
|
@ -758,6 +758,8 @@ typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PSTR, ULONG, ULONG, PVOID)
|
||||||
BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID);
|
BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID);
|
||||||
typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PSTR, DWORD64, ULONG, PVOID);
|
typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PSTR, DWORD64, ULONG, PVOID);
|
||||||
BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID);
|
BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID);
|
||||||
|
typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PWSTR, DWORD64, ULONG, PVOID);
|
||||||
|
BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID);
|
||||||
typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, ULONG, PVOID);
|
typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, ULONG, PVOID);
|
||||||
BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID);
|
BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID);
|
||||||
typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PSTR, DWORD64, PVOID);
|
typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PSTR, DWORD64, PVOID);
|
||||||
|
|
Loading…
Reference in a new issue