dbghelp: Make symt_fill_func_line_info() and symt_get_func_line_next() static functions inside symbol.c.

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-09-07 09:26:36 +02:00 committed by Alexandre Julliard
parent c825fc45be
commit d459301de6
3 changed files with 7 additions and 9 deletions

View file

@ -772,10 +772,6 @@ extern struct symt_hierarchy_point*
enum SymTagEnum point, enum SymTagEnum point,
const struct location* loc, const struct location* loc,
const char* name) DECLSPEC_HIDDEN; const char* name) DECLSPEC_HIDDEN;
extern BOOL symt_fill_func_line_info(const struct module* module,
const struct symt_function* func,
DWORD64 addr, IMAGEHLP_LINE64* line) DECLSPEC_HIDDEN;
extern BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) DECLSPEC_HIDDEN;
extern struct symt_thunk* extern struct symt_thunk*
symt_new_thunk(struct module* module, symt_new_thunk(struct module* module,
struct symt_compiland* parent, struct symt_compiland* parent,

View file

@ -1193,14 +1193,16 @@ static void stabs_finalize_function(struct module* module, struct symt_function*
{ {
IMAGEHLP_LINE64 il; IMAGEHLP_LINE64 il;
struct location loc; struct location loc;
DWORD disp;
if (!func) return; if (!func) return;
symt_normalize_function(module, func); symt_normalize_function(module, func);
/* To define the debug-start of the function, we use the second line number. /* To define the debug-start of the function, we use the second line number.
* Not 100% bullet proof, but better than nothing * Not 100% bullet proof, but better than nothing
*/ */
if (symt_fill_func_line_info(module, func, func->address, &il) && il.SizeOfStruct = sizeof(il);
symt_get_func_line_next(module, &il)) if (SymGetLineFromAddr64(module->process->handle, func->address, &disp, &il) &&
SymGetLineNext64(module->process->handle, &il))
{ {
loc.kind = loc_absolute; loc.kind = loc_absolute;
loc.offset = il.Address - func->address; loc.offset = il.Address - func->address;

View file

@ -1521,8 +1521,8 @@ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symb
* *
* fills information about a file * fills information about a file
*/ */
BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func, static BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func,
DWORD64 addr, IMAGEHLP_LINE64* line) DWORD64 addr, IMAGEHLP_LINE64* line)
{ {
struct line_info* dli = NULL; struct line_info* dli = NULL;
BOOL found = FALSE; BOOL found = FALSE;
@ -1775,7 +1775,7 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line)
return TRUE; return TRUE;
} }
BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) static BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line)
{ {
struct line_info* li; struct line_info* li;