wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Ken Thomases : secur32: Extract schan_imp_send function.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: a5715ed6258db9fbfa7ad1ce6c442f82694f4ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5715ed6258db9fbfa7ad1ce6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:57:04 2011 -0500 secur32: Extract schan_imp_send function. --- dlls/secur32/schannel.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index a36106a..3a7113e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -71,6 +71,25 @@ MAKE_FUNCPTR(gnutls_transport_set_pull_function); MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR + +static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, + size_t *length) +{ + ssize_t ret = pgnutls_record_send(s, buffer, *length); + if (ret >= 0) + *length = ret; + else if (ret == GNUTLS_E_AGAIN) + return SEC_I_CONTINUE_NEEDED; + else + { + pgnutls_perror(ret); + return SEC_E_INTERNAL_ERROR; + } + + return SEC_E_OK; +} + + #define SCHAN_INVALID_HANDLE ~0UL enum schan_handle_type @@ -1097,7 +1116,6 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SIZE_T data_size; char *data; ssize_t sent = 0; - ssize_t ret; int idx; TRACE("context_handle %p, quality %d, message %p, message_seq_no %d\n", @@ -1130,19 +1148,18 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle while (sent < data_size) { - ret = pgnutls_record_send(ctx->session, data + sent, data_size - sent); - if (ret < 0) + size_t length = data_size - sent; + SECURITY_STATUS status = schan_imp_send(ctx->session, data + sent, &length); + if (status == SEC_I_CONTINUE_NEEDED) + break; + else if (status != SEC_E_OK) { - if (ret != GNUTLS_E_AGAIN) - { - pgnutls_perror(ret); - HeapFree(GetProcessHeap(), 0, data); - ERR("Returning SEC_E_INTERNAL_ERROR\n"); - return SEC_E_INTERNAL_ERROR; - } - else break; + HeapFree(GetProcessHeap(), 0, data); + ERR("Returning %d\n", status); + return status; } - sent += ret; + + sent += length; } TRACE("Sent %zd bytes\n", sent);

1 0

Ken Thomases : secur32: Remove outdated comment that schannel is unimplemented.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9942edacd4c06d8e2ada9b15f5b6f36a91cd08d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9942edacd4c06d8e2ada9b15f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:56:59 2011 -0500 secur32: Remove outdated comment that schannel is unimplemented. --- dlls/secur32/schannel.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7c385e7..a36106a 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * This file implements the schannel provider, or, the SSL/TLS implementations. - * FIXME: It should be rather obvious that this file is empty of any - * implementation. */ #include "config.h" #include "wine/port.h"

1 0

Eric Pouech : dbghelp: Set also reloc_delta information in module description for PE native modules .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0be7461fc8034e712d9ff9be72ce356b38b8f5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be7461fc8034e712d9ff9be7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:31:24 2011 +0100 dbghelp: Set also reloc_delta information in module description for PE native modules. --- dlls/dbghelp/pe_module.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 028eac7..6ab423a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -775,6 +775,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, module->module.SymType = SymDeferred; else pe_load_debug_info(pcs, module); + module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; } else {

1 0

Eric Pouech : dbghelp: In dwarf debug functions, use register name instead of register value.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 6d7c2e02d827ecacbaacf64c6a9cfe93df1e9879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7c2e02d827ecacbaacf64c6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:31:17 2011 +0100 dbghelp: In dwarf debug functions, use register name instead of register value. --- dlls/dbghelp/dwarf.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5d6fd25..1d5aa17 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -677,10 +677,12 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, */ if (!piece_found) { + DWORD cvreg = dwarf2_map_register(op - DW_OP_reg0); if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one reg (%d -> %d)\n", - loc->reg, dwarf2_map_register(op - DW_OP_reg0)); - loc->reg = dwarf2_map_register(op - DW_OP_reg0); + FIXME("Only supporting one reg (%s/%d -> %s/%d)\n", + dbghelp_current_cpu->fetch_regname(loc->reg), loc->reg, + dbghelp_current_cpu->fetch_regname(cvreg), cvreg); + loc->reg = cvreg; } loc->kind = loc_register; } @@ -692,10 +694,12 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, */ if (!piece_found) { + DWORD cvreg = dwarf2_map_register(op - DW_OP_breg0); if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one breg (%d -> %d)\n", - loc->reg, dwarf2_map_register(op - DW_OP_breg0)); - loc->reg = dwarf2_map_register(op - DW_OP_breg0); + FIXME("Only supporting one breg (%s/%d -> %s/%d)\n", + dbghelp_current_cpu->fetch_regname(loc->reg), loc->reg, + dbghelp_current_cpu->fetch_regname(cvreg), cvreg); + loc->reg = cvreg; } stack[++stk] = dwarf2_leb128_as_signed(ctx); loc->kind = loc_regrel; @@ -763,7 +767,8 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, break; case DW_OP_fbreg: if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one reg (%d -> -2)\n", loc->reg); + FIXME("Only supporting one reg (%s/%d -> -2)\n", + dbghelp_current_cpu->fetch_regname(loc->reg), loc->reg); if (frame && frame->kind == loc_register) { loc->kind = loc_regrel;

1 0

Eric Pouech : dbghelp: When managing DW_OP_deref_size, always ensure we read the size parameter.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: a26ed126769d26a9e75f00856a6f5851cdc2cbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26ed126769d26a9e75f00856… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:31:11 2011 +0100 dbghelp: When managing DW_OP_deref_size, always ensure we read the size parameter. --- dlls/dbghelp/dwarf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 95160dc..5d6fd25 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -853,7 +853,8 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } else { - loc->kind = loc_dwarf2_block; + dwarf2_parse_byte(ctx); + loc->kind = loc_dwarf2_block; } break; case DW_OP_stack_value:

1 0

Eric Pouech : dbghelp: Fix unwinding on x86-64 (correct frame and context).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9ae6350c5801508dcc606d2a1c1b0d071db8b56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae6350c5801508dcc606d2a1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:31:05 2011 +0100 dbghelp: Fix unwinding on x86-64 (correct frame and context). --- dlls/dbghelp/cpu_x86_64.c | 97 ++++++++++++++++++++++++++++----------------- 1 files changed, 61 insertions(+), 36 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 20167f4..375c0d8 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -111,12 +111,12 @@ enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ #define __CurrentMode 0 -#define __CurrentSwitch 1 -#define __NextSwitch 2 +#define __CurrentCount 1 +/* #define __ 2 (unused) */ #define curr_mode (frame->Reserved[__CurrentMode]) -#define curr_switch (frame->Reserved[__CurrentSwitch]) -#define next_switch (frame->Reserved[__NextSwitch]) +#define curr_count (frame->Reserved[__CurrentCount]) +/* #define ??? (frame->Reserved[__]) (unused) */ #ifdef __x86_64__ union handler_data @@ -468,22 +468,58 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, return default_unwind(csw, context); } +/* fetch_next_frame() + * + * modify (at least) context.{rip, rsp, rbp} using unwind information + * either out of PE exception handlers, debug info (dwarf), or simple stack unwind + */ +static BOOL fetch_next_frame(struct cpu_stack_walk* csw, CONTEXT* context, + DWORD_PTR curr_pc, void** prtf) +{ + DWORD_PTR cfa; + RUNTIME_FUNCTION* rtf; + DWORD64 base; + + if (!curr_pc || !(base = sw_module_base(csw, curr_pc))) return FALSE; + rtf = sw_table_access(csw, curr_pc); + if (prtf) *prtf = rtf; + if (rtf) + { + return interpret_function_table_entry(csw, context, rtf, base); + } + else if (dwarf2_virtual_unwind(csw, curr_pc, context, &cfa)) + { + context->Rsp = cfa; + TRACE("next function rip=%016lx\n", context->Rip); + TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx); + TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp); + TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + context->R8, context->R9, context->R10, context->R11); + TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + context->R12, context->R13, context->R14, context->R15); + return TRUE; + } + else + return default_unwind(csw, context); +} + static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { - DWORD64 base; - DWORD_PTR cfa; - unsigned deltapc = 0; + unsigned deltapc = curr_count <= 1 ? 0 : 1; /* sanity check */ if (curr_mode >= stm_done) return FALSE; assert(!csw->is32); - TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s\n", + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), - curr_mode == stm_start ? "start" : "64bit"); + curr_mode == stm_start ? "start" : "64bit", + wine_dbgstr_longlong(curr_count)); if (curr_mode == stm_start) { @@ -496,7 +532,6 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, /* Init done */ curr_mode = stm_64bit; - curr_switch = 0; frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat; /* don't set up AddrStack on first call. Either the caller has set it up, or * we will get it in the next frame @@ -506,51 +541,41 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, else { if (context->Rsp != frame->AddrStack.Offset) FIXME("inconsistent Stack Pointer\n"); + if (context->Rip != frame->AddrPC.Offset) FIXME("inconsistent Instruction Pointer\n"); if (frame->AddrReturn.Offset == 0) goto done_err; - frame->AddrPC = frame->AddrReturn; - deltapc = 1; - } - - if (!frame->AddrPC.Offset || !(base = sw_module_base(csw, frame->AddrPC.Offset))) goto done_err; - frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); - frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; - if (frame->FuncTableEntry) - { - if (!interpret_function_table_entry(csw, context, frame->FuncTableEntry, base)) + if (!fetch_next_frame(csw, context, frame->AddrPC.Offset - deltapc, &frame->FuncTableEntry)) goto done_err; + deltapc = 1; } - else if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, &cfa)) - { - context->Rsp = cfa; - TRACE("next function rip=%016lx\n", context->Rip); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", - context->Rax, context->Rbx, context->Rcx, context->Rdx); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", - context->Rsi, context->Rdi, context->Rbp, context->Rsp); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", - context->R8, context->R9, context->R10, context->R11); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", - context->R12, context->R13, context->R14, context->R15); - } - else if (!default_unwind(csw, context)) goto done_err; memset(&frame->Params, 0, sizeof(frame->Params)); /* set frame information */ frame->AddrStack.Offset = context->Rsp; frame->AddrFrame.Offset = context->Rbp; - frame->AddrReturn.Offset = context->Rip; + frame->AddrPC.Offset = context->Rip; + if (1) + { + CONTEXT newctx = *context; + + if (!fetch_next_frame(csw, &newctx, frame->AddrPC.Offset - deltapc, NULL)) + goto done_err; + frame->AddrReturn.Mode = AddrModeFlat; + frame->AddrReturn.Offset = newctx.Rip; + } frame->Far = TRUE; frame->Virtual = TRUE; + curr_count++; - TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s FuncTable=%p\n", + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s FuncTable=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : "64bit", + wine_dbgstr_longlong(curr_count), frame->FuncTableEntry); return TRUE;

1 0

Eric Pouech : dbghelp: For the internal functions on x86_64 stack unwinding , only rely on CONTEXT information, and manage STACKFRAME64 updates in outer functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: b3d7643c96257596a8fb1586d35219160f86827e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d7643c96257596a8fb1586d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:59 2011 +0100 dbghelp: For the internal functions on x86_64 stack unwinding, only rely on CONTEXT information, and manage STACKFRAME64 updates in outer functions. --- dlls/dbghelp/cpu_x86_64.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 7b719ce..20167f4 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -349,21 +349,18 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc) } } -static BOOL default_unwind(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +static BOOL default_unwind(struct cpu_stack_walk* csw, CONTEXT* context) { - if (!sw_read_mem(csw, frame->AddrStack.Offset, - &frame->AddrReturn.Offset, sizeof(DWORD64))) + if (!sw_read_mem(csw, context->Rsp, &context->Rip, sizeof(DWORD64))) { - WARN("Cannot read new frame offset %s\n", wine_dbgstr_longlong(frame->AddrStack.Offset)); + WARN("Cannot read new frame offset %s\n", wine_dbgstr_longlong(context->Rsp)); return FALSE; } - context->Rip = frame->AddrReturn.Offset; - frame->AddrStack.Offset += sizeof(DWORD64); context->Rsp += sizeof(DWORD64); return TRUE; } -static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, +static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, CONTEXT* context, RUNTIME_FUNCTION* function, DWORD64 base) { char buffer[sizeof(UNWIND_INFO) + 256 * sizeof(UNWIND_CODE)]; @@ -375,9 +372,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, LPSTACKFR /* FIXME: we have some assumptions here */ assert(context); - if (context->Rsp != frame->AddrStack.Offset) FIXME("unconsistent Stack Pointer\n"); - if (context->Rip != frame->AddrPC.Offset) FIXME("unconsistent Instruction Pointer\n"); - dump_unwind_info(csw->hProcess, sw_module_base(csw, frame->AddrPC.Offset), frame->FuncTableEntry); + dump_unwind_info(csw->hProcess, sw_module_base(csw, context->Rip), function); newframe = context->Rsp; for (;;) { @@ -399,15 +394,15 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, LPSTACKFR newframe = get_int_reg(context, info->FrameRegister) - info->FrameOffset * 16; /* check if in prolog */ - if (frame->AddrPC.Offset >= base + function->BeginAddress && - frame->AddrPC.Offset < base + function->BeginAddress + info->SizeOfProlog) + if (context->Rip >= base + function->BeginAddress && + context->Rip < base + function->BeginAddress + info->SizeOfProlog) { - prolog_offset = frame->AddrPC.Offset - base - function->BeginAddress; + prolog_offset = context->Rip - base - function->BeginAddress; } else { prolog_offset = ~0; - if (is_inside_epilog(csw, frame->AddrPC.Offset)) + if (is_inside_epilog(csw, context->Rip)) { FIXME("epilog management not fully done\n"); /* interpret_epilog((const BYTE*)frame->AddrPC.Offset, context); */ @@ -470,8 +465,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, LPSTACKFR &handler_data, sizeof(handler_data))) return FALSE; function = &handler_data.chain; /* restart with the chained info */ } - frame->AddrStack.Offset = context->Rsp; - return default_unwind(csw, frame, context); + return default_unwind(csw, context); } static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) @@ -511,6 +505,8 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, } else { + if (context->Rsp != frame->AddrStack.Offset) FIXME("inconsistent Stack Pointer\n"); + if (frame->AddrReturn.Offset == 0) goto done_err; frame->AddrPC = frame->AddrReturn; deltapc = 1; @@ -521,13 +517,12 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; if (frame->FuncTableEntry) { - if (!interpret_function_table_entry(csw, frame, context, frame->FuncTableEntry, base)) + if (!interpret_function_table_entry(csw, context, frame->FuncTableEntry, base)) goto done_err; } else if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, &cfa)) { - frame->AddrStack.Offset = context->Rsp = cfa; - frame->AddrReturn.Offset = context->Rip; + context->Rsp = cfa; TRACE("next function rip=%016lx\n", context->Rip); TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", context->Rax, context->Rbx, context->Rcx, context->Rdx); @@ -538,10 +533,15 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", context->R12, context->R13, context->R14, context->R15); } - else if (!default_unwind(csw, frame, context)) goto done_err; + else if (!default_unwind(csw, context)) goto done_err; memset(&frame->Params, 0, sizeof(frame->Params)); + /* set frame information */ + frame->AddrStack.Offset = context->Rsp; + frame->AddrFrame.Offset = context->Rbp; + frame->AddrReturn.Offset = context->Rip; + frame->Far = TRUE; frame->Virtual = TRUE;

1 0

Eric Pouech : dbghelp: In msc unwinding code (from FPO extended data), take care of cases where several variables are stored in the same hash.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ab9cc3e9dcff562d5488795d05423e5be946ab8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9cc3e9dcff562d5488795d0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:53 2011 +0100 dbghelp: In msc unwinding code (from FPO extended data), take care of cases where several variables are stored in the same hash. --- dlls/dbghelp/msc.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5c630a0..7d64239 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2924,10 +2924,15 @@ static BOOL pev_get_val(struct pevaluator* pev, const char* str, DWORD_PTR* val case '$': case '.': hash_table_iter_init(&pev->values, &hti, str); - if (!(ptr = hash_table_iter_up(&hti))) - return PEV_ERROR1(pev, "get_zvalue: no value found (%s)", str); - *val = GET_ENTRY(ptr, struct zvalue, elt)->value; - return TRUE; + while ((ptr = hash_table_iter_up(&hti))) + { + if (!strcmp(GET_ENTRY(ptr, struct zvalue, elt)->elt.name, str)) + { + *val = GET_ENTRY(ptr, struct zvalue, elt)->value; + return TRUE; + } + } + return PEV_ERROR1(pev, "get_zvalue: no value found (%s)", str); default: *val = strtol(str, &n, 10); if (n == str || *n != '\0') @@ -2974,7 +2979,15 @@ static BOOL pev_set_value(struct pevaluator* pev, const char* name, DWORD_PTR v void* ptr; hash_table_iter_init(&pev->values, &hti, name); - if (!(ptr = hash_table_iter_up(&hti))) + while ((ptr = hash_table_iter_up(&hti))) + { + if (!strcmp(GET_ENTRY(ptr, struct zvalue, elt)->elt.name, name)) + { + GET_ENTRY(ptr, struct zvalue, elt)->value = val; + break; + } + } + if (!ptr) { struct zvalue* zv = pool_alloc(&pev->pool, sizeof(*zv)); if (!zv) return PEV_ERROR(pev, "set_value: out of memory"); @@ -2983,7 +2996,6 @@ static BOOL pev_set_value(struct pevaluator* pev, const char* name, DWORD_PTR v zv->elt.name = pool_strdup(&pev->pool, name); hash_table_add(&pev->values, &zv->elt); } - else GET_ENTRY(ptr, struct zvalue, elt)->value = val; return TRUE; } @@ -3158,7 +3170,7 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, fpoext[i].str_offset < strsize ? wine_dbgstr_a(strbase + 12 + fpoext[i].str_offset) : "<out of bounds>"); if (fpoext[i].str_offset < strsize) - ret = pdb_parse_cmd_string(csw, fpoext, strbase + 12 + fpoext[i].str_offset, cpair); + ret = pdb_parse_cmd_string(csw, &fpoext[i], strbase + 12 + fpoext[i].str_offset, cpair); else ret = FALSE; break;

1 0

Eric Pouech : dbghelp: In i386 stackwalk implementation, store the frame index in the private information.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 20b229a2a8ba349a5c8942025877b637ea5bf678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b229a2a8ba349a5c8942025… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:46 2011 +0100 dbghelp: In i386 stackwalk implementation, store the frame index in the private information. --- dlls/dbghelp/cpu_i386.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 03d53b3..09d88a6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -135,14 +135,18 @@ static BOOL fetch_next_frame32(struct cpu_stack_walk* csw, enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; /* indexes in Reserved array */ -#define __CurrentMode 0 -#define __CurrentSwitch 1 -#define __NextSwitch 2 +#define __CurrentModeCount 0 +#define __CurrentSwitch 1 +#define __NextSwitch 2 -#define curr_mode (frame->Reserved[__CurrentMode]) +#define curr_mode (frame->Reserved[__CurrentModeCount] & 0x0F) +#define curr_count (frame->Reserved[__CurrentModeCount] >> 4) #define curr_switch (frame->Reserved[__CurrentSwitch]) #define next_switch (frame->Reserved[__NextSwitch]) +#define set_curr_mode(m) {frame->Reserved[__CurrentModeCount] &= ~0x0F; frame->Reserved[__CurrentModeCount] |= (m & 0x0F);} +#define inc_curr_count() (frame->Reserved[__CurrentModeCount] += 0x10) + static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { STACK32FRAME frame32; @@ -153,7 +157,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val16; DWORD val32; BOOL do_switch; - unsigned deltapc = 1; + unsigned deltapc; #ifdef __i386__ CONTEXT _context; #endif @@ -161,14 +165,25 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO /* sanity check */ if (curr_mode >= stm_done) return FALSE; - TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%p nSwitch=%p\n", + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s cSwitch=%p nSwitch=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), + wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); + /* if we're at first call (which doesn't actually unwind, it just computes ReturnPC, + * or if we're doing the first real unwind (count == 1), then we can directly use + * eip. otherwise, eip is *after* the insn that actually made the call to + * previous frame, so decrease eip by delta pc (1!) so that we're inside previous + * insn. + * Doing so, we ensure that the pc used for unwinding is always inside the function + * we want to use for next frame + */ + deltapc = curr_count <= 1 ? 0 : 1; + #ifdef __i386__ if (!context) { @@ -196,8 +211,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } /* Init done */ - curr_mode = (frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit; - deltapc = 0; + set_curr_mode((frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit); /* cur_switch holds address of WOW32Reserved field in TEB in debuggee * address space @@ -307,7 +321,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO goto done_err; } curr_switch = (DWORD_PTR)frame16.frame32; - curr_mode = stm_32bit; + set_curr_mode(stm_32bit); if (!sw_read_mem(csw, curr_switch, &ch, sizeof(ch))) curr_switch = 0; } @@ -365,7 +379,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO if (!sw_read_mem(csw, sw_xlat_addr(csw, &tmp), &ch, sizeof(ch))) curr_switch = 0; - curr_mode = stm_16bit; + set_curr_mode(stm_16bit); } } else @@ -483,17 +497,19 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO else frame->FuncTableEntry = NULL; - TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%p nSwitch=%p FuncTable=%p\n", + inc_curr_count(); + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s cSwitch=%p nSwitch=%p FuncTable=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), + wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch, frame->FuncTableEntry); return TRUE; done_err: - curr_mode = stm_done; + set_curr_mode(stm_done); return FALSE; }

1 0

Eric Pouech : dbghelp: When doing a stack backtrace on i386 with dwarf or pdb unwinders, get the PC from the right frame.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 16e8816505be4ede891d0e45d11a6aa8e29039be URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e8816505be4ede891d0e45d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:40 2011 +0100 dbghelp: When doing a stack backtrace on i386 with dwarf or pdb unwinders, get the PC from the right frame. --- dlls/dbghelp/cpu_i386.c | 159 +++++++++++++++++++++++----------------------- programs/winedbg/stack.c | 5 +- 2 files changed, 81 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16e8816505be4ede891d0…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011