October 2021 - Wine-Commits

Alistair Leslie-Hughes : msdasql: Add IConvertType interface for ICommandText.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: fed2ca76c18ddfff01428593faa3b8063d614b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fed2ca76c18ddfff01428593… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:48 2021 +1100 msdasql: Add IConvertType interface for ICommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index eabdcacc968..3ee4b72a1d1 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -280,6 +280,7 @@ struct command ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; IColumnsInfo IColumnsInfo_iface; + IConvertType IConvertType_iface; LONG refs; }; @@ -298,6 +299,11 @@ static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); } +static inline struct command *impl_from_IConvertType( IConvertType *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IConvertType_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -319,6 +325,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IConvertType, riid)) + { + *ppv = &command->IConvertType_iface; + } if(*ppv) { @@ -510,6 +520,39 @@ static struct IColumnsInfoVtbl columninfoVtbl = colsinfo_MapColumnIDs }; +static HRESULT WINAPI converttype_QueryInterface(IConvertType *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI converttype_AddRef(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI converttype_Release(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI converttype_CanConvert(IConvertType *iface, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + struct command *command = impl_from_IConvertType( iface ); + FIXME("%p, %u, %d, 0x%08x\n", command, from, to, flags); + return E_NOTIMPL; +} + +static struct IConvertTypeVtbl converttypeVtbl = +{ + converttype_QueryInterface, + converttype_AddRef, + converttype_Release, + converttype_CanConvert +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -529,6 +572,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; + command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d4c6930bc8e..7d14928e50b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,9 +130,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandText_Release(comand_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IConvertType_Release(convertype); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConvertType_Release(convertype); hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Eric Pouech : dbghelp/dwarf: Store line numbers and file info for inlined functions.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 7bde153afe83480e9ccf958543fd2152cab8b1c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bde153afe83480e9ccf9585… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 29 15:37:44 2021 +0200 dbghelp/dwarf: Store line numbers and file info for inlined functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index eab6609cdf4..269cfadd56c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2515,6 +2515,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, const struct vector* v, unsigned file, unsigned line) { struct symt_function* func; + struct symt_inlinesite* inlined; struct symt_ht* symt; unsigned* psrc; @@ -2526,6 +2527,19 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, if (symt_check_tag(&symt->symt, SymTagFunction)) { func = (struct symt_function*)symt; + for (inlined = func->next_inlinesite; inlined; inlined = inlined->func.next_inlinesite) + { + int i; + for (i = 0; i < inlined->vranges.num_elts; ++i) + { + struct addr_range* ar = (struct addr_range*)vector_at(&inlined->vranges, i); + if (ar->low <= address && address < ar->high) + { + symt_add_func_line(module, &inlined->func, *psrc, line, address); + return; /* only add to lowest matching inline site */ + } + } + } symt_add_func_line(module, func, *psrc, line, address); } }

1 0

Eric Pouech : dbghelp: In SymGetLine* family, compute displacement relative to line_info's address.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 3d6b65dd38e58fdef46d9c4fbafbaeecc2aa94ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6b65dd38e58fdef46d9c4f… Author: Eric Pouech <eric.pouech(a)gmail.com> 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 <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; } }

1 0

Rémi Bernon : server: Remove dr7 PTRACE_POKEUSER workaround.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 75bccf99d1f90555c998f2c9b907ed9292ce47f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75bccf99d1f90555c998f2c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 18:35:14 2021 +0200 server: Remove dr7 PTRACE_POKEUSER workaround. It is needed for Linux Kernel version 4.18, and has been fixed in 4.19. Also see https://bugzilla.kernel.org/show_bug.cgi?id=200965 for a more detailed description of the regression and the fix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46472 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index b9dd9e9539a..1875e1dfd56 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -627,9 +627,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (!suspend_for_ptrace( thread )) return; - /* force all breakpoint lengths to 1, workaround for kernel bug 200965 */ - ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0x11110055 ); - switch (context->machine) { case IMAGE_FILE_MACHINE_I386:

1 0

Rémi Bernon : server: Clear dr7 before setting other registers.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 4db8cdc267efd62fc7349912fe352cf214c012f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4db8cdc267efd62fc7349912… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 18:35:13 2021 +0200 server: Clear dr7 before setting other registers. Resetting their length to make sure we pass alignment checks both for their current values and for the new values we'll write. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46472 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index bcd0fe48f16..b9dd9e9539a 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -633,8 +633,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign switch (context->machine) { case IMAGE_FILE_MACHINE_I386: - /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; @@ -646,7 +645,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case IMAGE_FILE_MACHINE_AMD64: - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error;

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 5f93c683ab0163cb34482fe18549cf249b8b074b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f93c683ab0163cb34482fe1… Author: Chilung Chan <eason066(a)gmail.com> Date: Fri Oct 29 22:00:52 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 1519 +++++++++++++++++++++-------------------------------------- 1 file changed, 544 insertions(+), 975 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f93c683ab0163cb3448…

1 0

Eric Pouech : dbghelp: Silence a couple more CV entries.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: c967245ba85b88f5befbfbadd02a9c5c0352747a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c967245ba85b88f5befbfbad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 29 15:38:11 2021 +0200 dbghelp: Silence a couple more CV entries. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 191e33e781f..a1f009cf678 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2022,6 +2022,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_INLINESITE_END: case S_FILESTATIC: case S_CALLEES: + case S_UNAMESPACE: + case S_INLINEES: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Eric Pouech : dbghelp: Silence a couple of C++ oriented requests in SymGetTypeInfo().
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: ec0af6dc3e603b4b65d33c2a9e15a5947b765768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0af6dc3e603b4b65d33c2a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 29 15:37:57 2021 +0200 dbghelp: Silence a couple of C++ oriented requests in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3a7ebfb6a0a..b7eb49116e2 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -991,10 +991,26 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(DWORD) = symt_ptr2index(module, ((const struct symt_array*)type)->index_type); break; - case TI_GET_CLASSPARENTID: - /* FIXME: we don't support properly C++ for now, pretend this symbol doesn't - * belong to a parent class + case TI_GET_SYMINDEX: + /* not very useful as it is... + * native sometimes (eg for UDT) return id of another instance + * of the same UDT definition... maybe forward declaration? */ + X(DWORD) = symt_ptr2index(module, type); + break; + + /* FIXME: we don't support properly C++ for now */ + case TI_GET_VIRTUALBASECLASS: + case TI_GET_VIRTUALTABLESHAPEID: + case TI_GET_VIRTUALBASEPOINTEROFFSET: + case TI_GET_CLASSPARENTID: + case TI_GET_THISADJUST: + case TI_GET_VIRTUALBASEOFFSET: + case TI_GET_VIRTUALBASEDISPINDEX: + case TI_GET_IS_REFERENCE: + case TI_GET_INDIRECTVIRTUALBASECLASS: + case TI_GET_VIRTUALBASETABLETYPE: + case TI_GET_OBJECTPOINTERTYPE: return FALSE; #undef X

1 0

Eric Pouech : dbghelp: Implement SymGetLineFromInlineContext(W) for inlined frame.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 27f133732fb95453cc3f96547ac0b57ff23a2049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f133732fb95453cc3f9654… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 29 15:37:31 2021 +0200 dbghelp: Implement SymGetLineFromInlineContext(W) for inlined frame. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 52 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 30e1c0d2bf7..7747aaae2ae 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1844,28 +1844,14 @@ static BOOL internal_line_set_nameW(struct process* pcs, struct internal_line_t* return TRUE; } -/****************************************************************** - * get_line_from_addr - * - * fills source file information from an address - */ -static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, - PDWORD pdwDisplacement, struct internal_line_t* intl) +static BOOL get_line_from_function(struct module_pair* pair, struct symt_function* func, DWORD64 addr, + PDWORD pdwDisplacement, struct internal_line_t* intl) { struct line_info* dli = NULL; struct line_info* found_dli = NULL; int i; - struct module_pair pair; - struct symt_ht* symt; - struct symt_function* func; - if (!module_init_pair(&pair, hProcess, addr)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; - - if (symt->symt.tag != SymTagFunction) return FALSE; - func = (struct symt_function*)symt; - - for (i=vector_length(&func->vlines)-1; i>=0; i--) + for (i = vector_length(&func->vlines) - 1; i >= 0; i--) { dli = vector_at(&func->vlines, i); if (!dli->is_source_file) @@ -1883,12 +1869,12 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, if (dbghelp_opt_native) { /* Return native file paths when using winedbg */ - ret = internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, dli->u.source_file), FALSE); + ret = internal_line_set_nameA(pair->pcs, intl, (char*)source_get(pair->effective, dli->u.source_file), FALSE); } else { - WCHAR *dospath = wine_get_dos_file_name(source_get(pair.effective, dli->u.source_file)); - ret = internal_line_set_nameW(pair.pcs, intl, dospath, TRUE); + WCHAR *dospath = wine_get_dos_file_name(source_get(pair->effective, dli->u.source_file)); + ret = internal_line_set_nameW(pair->pcs, intl, dospath, TRUE); HeapFree( GetProcessHeap(), 0, dospath ); } if (ret) *pdwDisplacement = addr - found_dli->u.address; @@ -1898,6 +1884,24 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, return FALSE; } +/****************************************************************** + * get_line_from_addr + * + * fills source file information from an address + */ +static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, + PDWORD pdwDisplacement, struct internal_line_t* intl) +{ + struct module_pair pair; + struct symt_ht* symt; + + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction && symt->symt.tag != SymTagInlineSite) return FALSE; + return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, intl); +} + /*********************************************************************** * SymGetSymNext64 (DBGHELP.@) */ @@ -2699,9 +2703,17 @@ BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ct static BOOL get_line_from_inline_context(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, struct internal_line_t* intl) { + struct module_pair pair; + struct symt_inlinesite* inlined; + + if (!module_init_pair(&pair, hProcess, mod_addr ? mod_addr : addr)) return FALSE; switch (IFC_MODE(inline_ctx)) { case IFC_MODE_INLINE: + inlined = symt_find_inlined_site(pair.effective, addr, inline_ctx); + if (inlined && get_line_from_function(&pair, &inlined->func, addr, disp, intl)) + return TRUE; + /* fall through: check if we can find line info at top function level */ case IFC_MODE_IGNORE: case IFC_MODE_REGULAR: return get_line_from_addr(hProcess, addr, disp, intl);

1 0

Eric Pouech : dbghelp: Make symt_add_func_line() last parameter an absolute address.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 1c5989465e72d90b10c1c21105c99ba6f0f9b2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5989465e72d90b10c1c211… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 29 15:37:04 2021 +0200 dbghelp: Make symt_add_func_line() last parameter an absolute address. It used to be an offset to the start of function, but it's actually stored as an absolute address afterwards. This avoids unnecessary computations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/coff.c | 7 +------ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 5 ++--- dlls/dbghelp/stabs.c | 4 ++-- dlls/dbghelp/symbol.c | 8 ++++---- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 8684a493310..cc005a3bbc5 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -421,16 +421,11 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) { if (coff_files.files[j].entries[l+1]->tag == SymTagFunction) { - /* - * Add the line number. This is always relative to the - * start of the function, so we need to subtract that offset - * first. - */ symt_add_func_line(msc_dbg->module, (struct symt_function*)coff_files.files[j].entries[l+1], coff_files.files[j].compiland->source, linepnt->Linenumber, - msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress - addr); + msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress); } break; } diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1ea8d2df773..eab6609cdf4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2526,7 +2526,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, if (symt_check_tag(&symt->symt, SymTagFunction)) { func = (struct symt_function*)symt; - symt_add_func_line(module, func, *psrc, line, address - func->address); + symt_add_func_line(module, func, *psrc, line, address); } } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c557cb24636..191e33e781f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1454,8 +1454,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B break; } } - symt_add_func_line(msc_dbg->module, func, source, - linenos[k], addr - func->address); + symt_add_func_line(msc_dbg->module, func, source, linenos[k], addr); } } } @@ -1519,7 +1518,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const { symt_add_func_line(msc_dbg->module, func, source, lines_blk->l[i].lineno ^ 0x80000000, - lines_blk->l[i].offset); + func->address + lines_blk->l[i].offset); } break; case LT2_FILES_BLOCK: /* skip */ diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 9d7d5131fc4..647a71ec258 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1168,7 +1168,7 @@ static void pending_flush(struct pending_list* pending, struct module* module, if (module->type == DMT_MACHO) pending->objs[i].u.line.offset -= func->address - pending->objs[i].u.line.load_offset; symt_add_func_line(module, func, pending->objs[i].u.line.source_idx, - pending->objs[i].u.line.line_num, pending->objs[i].u.line.offset); + pending->objs[i].u.line.line_num, func->address + pending->objs[i].u.line.offset); break; default: ERR("Unknown pending object tag %u\n", (unsigned)pending->objs[i].tag); @@ -1492,7 +1492,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (module->type == DMT_MACHO) offset -= curr_func->address - load_offset; symt_add_func_line(module, curr_func, source_idx, - stab_ptr->n_desc, offset); + stab_ptr->n_desc, curr_func->address + offset); } else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, n_value, load_offset); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e4208bc2418..43f7b3fdec2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -391,7 +391,7 @@ struct symt_inlinesite* symt_new_inlinesite(struct module* module, } void symt_add_func_line(struct module* module, struct symt_function* func, - unsigned source_idx, int line_num, ULONG_PTR offset) + unsigned source_idx, int line_num, ULONG_PTR addr) { struct line_info* dli; unsigned vlen; @@ -401,8 +401,8 @@ void symt_add_func_line(struct module* module, struct symt_function* func, if (func == NULL || !(dbghelp_options & SYMOPT_LOAD_LINES)) return; - TRACE_(dbghelp_symt)("(%p)%s:%lx %s:%u\n", - func, func->hash_elt.name, offset, + TRACE_(dbghelp_symt)("(%p)%s:%Ix %s:%u\n", + func, func->hash_elt.name, addr, source_get(module, source_idx), line_num); assert(func->symt.tag == SymTagFunction || func->symt.tag == SymTagInlineSite); @@ -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.address = func->address + offset; + dli->u.address = addr; } /******************************************************************

1 0