Eric Pouech : dbghelp: Rename line_info's pc_offset field into address.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0187675065496f2090f0f2a36b233af5a96f2d8f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0187675065496f2090f0f2a36...

Author: Eric Pouech 
Date:   Fri Oct 29 15:36:51 2021 +0200

dbghelp: Rename line_info's pc_offset field into address.

It's actually an absolute address.

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

---

dlls/dbghelp/dbghelp_private.h |  2 +-
 dlls/dbghelp/symbol.c          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index 7a0f089877e..5682acadf65 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -519,7 +519,7 @@ struct line_info
                                 line_number;
     union
     {
-        ULONG_PTR                   pc_offset;   /* if is_source_file isn't set */
+        ULONG_PTR                   address;     /* absolute, if is_source_file isn't set */
         unsigned                    source_file; /* if is_source_file is set */
     } u;
 };
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 503432e461f..e4208bc2418 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -435,7 +435,7 @@ void symt_add_func_line(struct module* module, struct symt_function* func,
     dli->is_first       = 0; /* only a source file can be first */
     dli->is_last        = 1;
     dli->line_number    = line_num;
-    dli->u.pc_offset    = func->address + offset;
+    dli->u.address      = func->address + offset;
 }

/******************************************************************
@@ -1870,9 +1870,9 @@ 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.pc_offset > addr) continue;
+            if (found || dli->u.address > addr) continue;
             intl->line_number = dli->line_number;
-            intl->address     = dli->u.pc_offset;
+            intl->address     = dli->u.address;
             intl->key         = dli;
             found = TRUE;
             continue;
@@ -2013,7 +2013,7 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int
         if (!li->is_source_file)
         {
             intl->line_number = li->line_number;
-            intl->address     = li->u.pc_offset;
+            intl->address     = li->u.address;
             intl->key         = li;
             /* search source file */
             for (srcli = li; !srcli->is_source_file; srcli--);
@@ -2092,7 +2092,7 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int
         if (!li->is_source_file)
         {
             intl->line_number = li->line_number;
-            intl->address     = li->u.pc_offset;
+            intl->address     = li->u.address;
             intl->key         = li;
             return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
         }
@@ -2559,7 +2559,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland,
                 sci.Key = dli;
                 sci.Obj[0] = '\0'; /* FIXME */
                 sci.LineNumber = dli->line_number;
-                sci.Address = dli->u.pc_offset;
+                sci.Address = dli->u.address;
                 if (!cb(&sci, user)) break;
             }
         }