Eric Pouech : dbghelp: In SymGetLine* family, compute displacement relative to line_info's address.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3d6b65dd38e58fdef46d9c4fbafbaeecc2aa94ec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3d6b65dd38e58fdef46d9c4fb...

Author: Eric Pouech 
Date:   Fri Oct 29 15:37:17 2021 +0200

dbghelp: In SymGetLine* family, compute displacement relative to line_info's address.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

dlls/dbghelp/symbol.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 43f7b3fdec2..30e1c0d2bf7 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1853,7 +1853,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
                                PDWORD pdwDisplacement, struct internal_line_t* intl)
 {
     struct line_info*           dli = NULL;
-    BOOL                        found = FALSE;
+    struct line_info*           found_dli = NULL;
     int                         i;
     struct module_pair          pair;
     struct symt_ht*             symt;
@@ -1870,14 +1870,14 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
         dli = vector_at(&func->vlines, i);
         if (!dli->is_source_file)
         {
-            if (found || dli->u.address > addr) continue;
+            if (found_dli || dli->u.address > addr) continue;
             intl->line_number = dli->line_number;
             intl->address     = dli->u.address;
             intl->key         = dli;
-            found = TRUE;
+            found_dli = dli;
             continue;
         }
-        if (found)
+        if (found_dli)
         {
             BOOL ret;
             if (dbghelp_opt_native)
@@ -1891,7 +1891,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
                 ret = internal_line_set_nameW(pair.pcs, intl, dospath, TRUE);
                 HeapFree( GetProcessHeap(), 0, dospath );
             }
-            if (ret) *pdwDisplacement = intl->address - func->address;
+            if (ret) *pdwDisplacement = addr - found_dli->u.address;
             return ret;
         }
     }