ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Fix SymInitialize for a live 32bit target from a 64bit caller in WOW64. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-08-31 13:20:39 +02:00 committed by Alexandre Julliard
parent 4a03ffc1ef
commit 1cddd8d571
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/dbghelp/dbghelp.c
View File

@ -286,7 +286,7 @@ const WCHAR *process_getenv(const struct process *process, const WCHAR *name)
* check_live_target * check_live_target
* *
*/ */
static BOOL check_live_target(struct process* pcs) static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64)
{ {
PROCESS_BASIC_INFORMATION pbi; PROCESS_BASIC_INFORMATION pbi;
ULONG_PTR base = 0, env = 0; ULONG_PTR base = 0, env = 0;
@ -300,11 +300,17 @@ static BOOL check_live_target(struct process* pcs)
if (!pcs->is_64bit) if (!pcs->is_64bit)
{ {
const char* peb32_addr;
DWORD env32; DWORD env32;
PEB32 peb32; PEB32 peb32;
C_ASSERT(sizeof(void*) != 4 || FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment) == 0x48); C_ASSERT(sizeof(void*) != 4 || FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment) == 0x48);
if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb32, sizeof(peb32), NULL)) return FALSE; peb32_addr = (const char*)pbi.PebBaseAddress;
if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; if (!wow64 && child_wow64)
/* current process is 64bit, while child process is 32 bit, need to read 32bit PEB */
peb32_addr += 0x1000;
if (!ReadProcessMemory(pcs->handle, peb32_addr, &peb32, sizeof(peb32), NULL)) return FALSE;
if (!ReadProcessMemory(pcs->handle, peb32_addr + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE;
if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32; if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32;
} }
else else
@ -454,7 +460,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP
pcs->next = process_first; pcs->next = process_first;
process_first = pcs; process_first = pcs;
if (check_live_target(pcs)) if (check_live_target(pcs, wow64, child_wow64))
{ {
if (fInvadeProcess) if (fInvadeProcess)
EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess);