dbghelp: Read process memory using target addresses, not debugger.

This fixes "wine winedbg --gdb winecfg" not working anymore. There was a regression since f40195cd, but the environment read was broken before. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dbghelp: Read process memory using target addresses, not debugger.
8ec843e7 · Rémi Bernon · Alexandre Julliard · 7d94c4f0 · 8ec843e7
Commit 8ec843e7 authored Dec 04, 2020 by Rémi Bernon Committed by Alexandre Julliard Dec 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dbghelp.c dlls/dbghelp/dbghelp.c +2 -2

No files found.
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -311,8 +311,8 @@ static BOOL check_live_target(struct process* pcs)
    {
        PEB peb;
        if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb, sizeof(peb), NULL)) return FALSE;
-        if (!ReadProcessMemory(pcs->handle, &peb.CloudFileFlags, &base, sizeof(base), NULL)) return FALSE;
+        if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + FIELD_OFFSET(PEB, CloudFileFlags), &base, sizeof(base), NULL)) return FALSE;
-        ReadProcessMemory(pcs->handle, &peb.ProcessParameters->Environment, &env, sizeof(env), NULL);
+        ReadProcessMemory(pcs->handle, (char *)peb.ProcessParameters + FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment), &env, sizeof(env), NULL);
    }
    /* read debuggee environment block */