December 2006 - Wine-commits

Eric Pouech : dbghelp: Fixed value stored for register relative information
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 16db2566c6b7419cecb632188394054bab72bc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16db2566c6b7419cecb632188… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:20 2006 +0100 dbghelp: Fixed value stored for register relative information (regression spotted by Peter Oberndorfer). --- dlls/dbghelp/dwarf.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 876d310..aaab3fb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -673,6 +673,19 @@ compute_location(dwarf2_traverse_context case DW_OP_reg20: case DW_OP_reg21: case DW_OP_reg22: case DW_OP_reg23: case DW_OP_reg24: case DW_OP_reg25: case DW_OP_reg26: case DW_OP_reg27: case DW_OP_reg28: case DW_OP_reg29: case DW_OP_reg30: case DW_OP_reg31: + /* dbghelp APIs don't know how to cope with this anyway + * (for example 'long long' stored in two registers) + * FIXME: We should tell winedbg how to deal with it (sigh) + */ + if (!piece_found) + { + 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); + } + loc->kind = loc_register; + break; case DW_OP_breg0: case DW_OP_breg1: case DW_OP_breg2: case DW_OP_breg3: case DW_OP_breg4: case DW_OP_breg5: case DW_OP_breg6: case DW_OP_breg7: case DW_OP_breg8: case DW_OP_breg9: case DW_OP_breg10: case DW_OP_breg11: @@ -688,17 +701,12 @@ compute_location(dwarf2_traverse_context if (!piece_found) { if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one reg (%d -> %d)\n", - loc->reg, op - DW_OP_reg0); - loc->reg = dwarf2_map_register(op - DW_OP_reg0); - } - if (op >= DW_OP_breg0 && op <= DW_OP_breg31) - { - stack[++stk] = dwarf2_leb128_as_signed(ctx); - loc->kind = loc_regrel; + FIXME("Only supporting one reg (%d -> %d)\n", + loc->reg, dwarf2_map_register(op - DW_OP_breg0)); + loc->reg = dwarf2_map_register(op - DW_OP_breg0); } - else - loc->kind = loc_register; + stack[++stk] = dwarf2_leb128_as_signed(ctx); + loc->kind = loc_regrel; break; case DW_OP_fbreg: if (loc->reg != Wine_DW_no_register)

1 0

Eric Pouech : winedbg: Now that local variable computation depends on instruction
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 932ad65c8332877d547c041f1240dbe64f05fe31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932ad65c8332877d547c041f1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:27 2006 +0100 winedbg: Now that local variable computation depends on instruction pointer value, be sure to have the relevant insn ptr value when fetching the stack frames (spotted by Peter Oberndorfer). --- programs/winedbg/break.c | 113 +++++++++++++++++++++-------------------- programs/winedbg/debugger.h | 3 +- programs/winedbg/tgt_active.c | 5 +- 3 files changed, 63 insertions(+), 58 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 3a4c1e5..c99454c 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -723,59 +723,31 @@ static BOOL should_stop(int bpnum) * Determine if we should continue execution after a SIGTRAP signal when * executing in the given mode. */ -BOOL break_should_continue(ADDRESS64* addr, DWORD code, int* count, BOOL* is_break) +BOOL break_should_continue(ADDRESS64* addr, DWORD code) { DWORD oldval = 0; enum dbg_exec_mode mode = dbg_curr_thread->exec_mode; - *is_break = FALSE; - /* If not single-stepping, back up to the break instruction */ - if (code == EXCEPTION_BREAKPOINT) - addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, TRUE); - - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); - dbg_curr_process->bp[0].enabled = FALSE; /* disable the step-over breakpoint */ - - if (dbg_curr_thread->stopped_xpoint > 0) - { - if (!should_stop(dbg_curr_thread->stopped_xpoint)) return TRUE; - - dbg_printf("Stopped on breakpoint %d at ", dbg_curr_thread->stopped_xpoint); - print_address(&dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].addr, TRUE); - dbg_printf("\n"); - return FALSE; - } - if(dbg_curr_thread->stopped_xpoint < 0) - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint > 0) { - /* If not single-stepping, do not back up over the break instruction */ - if (code == EXCEPTION_BREAKPOINT) - addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, FALSE); - if (!should_stop(dbg_curr_thread->stopped_xpoint)) return TRUE; - dbg_printf("Stopped on breakpoint %d at ", dbg_curr_thread->stopped_xpoint); - print_address(&dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].addr, TRUE); - dbg_printf("\n"); - return FALSE; - } - - if(dbg_curr_thread->stopped_xpoint < 0) - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); - if (dbg_curr_thread->stopped_xpoint > 0) - { - /* If not single-stepping, do not back up over the break instruction */ - if (code == EXCEPTION_BREAKPOINT) - addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, FALSE); - - if (!should_stop(dbg_curr_thread->stopped_xpoint)) return TRUE; - - dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); - print_address(addr, TRUE); - dbg_printf(" values: old=%lu new=%lu\n", - oldval, dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); + switch (dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].xpoint_type) + { + case be_xpoint_break: + case be_xpoint_watch_exec: + dbg_printf("Stopped on breakpoint %d at ", dbg_curr_thread->stopped_xpoint); + print_address(&dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].addr, TRUE); + dbg_printf("\n"); + break; + case be_xpoint_watch_read: + case be_xpoint_watch_write: + dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); + print_address(addr, TRUE); + dbg_printf(" values: old=%lu new=%lu\n", + oldval, dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); + } return FALSE; } @@ -787,16 +759,12 @@ BOOL break_should_continue(ADDRESS64* ad if (mode == dbg_exec_step_over_line || mode == dbg_exec_step_into_line) { if (symbol_get_function_line_status(addr) == dbg_on_a_line_number) - { - (*count)--; - } + dbg_curr_thread->exec_count--; } else if (mode == dbg_exec_step_over_insn || mode == dbg_exec_step_into_insn) - { - (*count)--; - } + dbg_curr_thread->exec_count--; - if (*count > 0 || mode == dbg_exec_finish) + if (dbg_curr_thread->exec_count > 0 || mode == dbg_exec_finish) { /* * We still need to execute more instructions. @@ -804,6 +772,45 @@ BOOL break_should_continue(ADDRESS64* ad return TRUE; } + /* no breakpoint, continue if in continuous mode */ + return mode == dbg_exec_cont || mode == dbg_exec_finish; +} + +/*********************************************************************** + * break_ajust_pc + * + * Adjust PC to the address where the trap (if any) actually occured + * Also sets dbg_curr_thread->stopped_xpoint + */ +void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break) +{ + DWORD oldval = 0; + + *is_break = FALSE; + + /* If not single-stepping, back up to the break instruction */ + if (code == EXCEPTION_BREAKPOINT) + addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, TRUE); + + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); + dbg_curr_process->bp[0].enabled = FALSE; /* disable the step-over breakpoint */ + + if (dbg_curr_thread->stopped_xpoint > 0) return; + + if (dbg_curr_thread->stopped_xpoint < 0) + { + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); + if (dbg_curr_thread->stopped_xpoint < 0) + dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + if (dbg_curr_thread->stopped_xpoint > 0) + { + /* If not single-stepping, do not back up over the break instruction */ + if (code == EXCEPTION_BREAKPOINT) + addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, FALSE); + return; + } + } + /* If there's no breakpoint and we are not single-stepping, then * either we must have encountered a break insn in the Windows program * or someone is trying to stop us @@ -812,11 +819,7 @@ BOOL break_should_continue(ADDRESS64* ad { *is_break = TRUE; addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, FALSE); - return FALSE; } - - /* no breakpoint, continue if in continuous mode */ - return mode == dbg_exec_cont || mode == dbg_exec_finish; } /*********************************************************************** diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 43abb60..6e4c010 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -279,7 +279,8 @@ extern void break_delete_xpo extern void break_delete_xpoints_from_module(unsigned long base); extern void break_enable_xpoint(int num, BOOL enable); extern void break_info(void); -extern BOOL break_should_continue(ADDRESS64* addr, DWORD code, int* count, BOOL* is_break); +extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break); +extern BOOL break_should_continue(ADDRESS64* addr, DWORD code); extern void break_suspend_execution(void); extern void break_restart_execution(int count); extern int break_add_condition(int bpnum, struct expr* exp); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d87f4c2..b88f6ff 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -143,13 +143,14 @@ static unsigned dbg_exception_prolog(BOO /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(dbg_curr_process->handle, 0, 0, 0, 0, 0); + if (is_debug) break_adjust_pc(&addr, rec->ExceptionCode, &is_break); /* * Do a quiet backtrace so that we have an idea of what the situation * is WRT the source files. */ stack_fetch_frames(); - if (is_debug && - break_should_continue(&addr, rec->ExceptionCode, &dbg_curr_thread->exec_count, &is_break)) + + if (is_debug && !is_break && break_should_continue(&addr, rec->ExceptionCode)) return FALSE; if (addr.Mode != dbg_curr_thread->addr_mode)

1 0

Eric Pouech : winedbg: Remove some hassle from sgv_cb, and handle line number displacement where needed.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 4c634078b386817e1479f7bf2d15c73dff65e6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c634078b386817e1479f7bf2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:03 2006 +0100 winedbg: Remove some hassle from sgv_cb, and handle line number displacement where needed. --- programs/winedbg/symbol.c | 115 +++++++++++++++++++++++++-------------------- 1 files changed, 64 insertions(+), 51 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index b1a71ec..3b144b1 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -32,34 +32,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); -static BOOL symbol_get_debug_start(DWORD mod_base, DWORD typeid, ULONG64* start) +static BOOL symbol_get_debug_start(const struct dbg_type* func, ULONG64* start) { DWORD count, tag; char buffer[sizeof(TI_FINDCHILDREN_PARAMS) + 256 * sizeof(DWORD)]; TI_FINDCHILDREN_PARAMS* fcp = (TI_FINDCHILDREN_PARAMS*)buffer; int i; - struct dbg_type type; + struct dbg_type child; - if (!typeid) return FALSE; /* native dbghelp not always fills the info field */ - type.module = mod_base; - type.id = typeid; + if (!func->id) return FALSE; /* native dbghelp not always fills the info field */ - if (!types_get_info(&type, TI_GET_CHILDRENCOUNT, &count)) return FALSE; + if (!types_get_info(func, TI_GET_CHILDRENCOUNT, &count)) return FALSE; fcp->Start = 0; while (count) { fcp->Count = min(count, 256); - if (types_get_info(&type, TI_FINDCHILDREN, fcp)) + if (types_get_info(func, TI_FINDCHILDREN, fcp)) { for (i = 0; i < min(fcp->Count, count); i++) { - type.id = fcp->ChildId[i]; - types_get_info(&type, TI_GET_SYMTAG, &tag); + child.module = func->module; + child.id = fcp->ChildId[i]; + types_get_info(&child, TI_GET_SYMTAG, &tag); if (tag != SymTagFuncDebugStart) continue; - return types_get_info(&type, TI_GET_ADDRESS, start); + return types_get_info(&child, TI_GET_ADDRESS, start); } count -= min(count, 256); fcp->Start += 256; + fcp->Start += 256; } } return FALSE; @@ -73,13 +73,12 @@ struct sgv_data /* FIXME: NUMDBGV should be made variable */ struct dbg_lvalue lvalue; DWORD flags; + DWORD sym_info; } syms[NUMDBGV]; /* out : will be filled in with various found symbols */ int num; /* out : number of found symbols */ int num_thunks; /* out : number of thunks found */ const char* name; /* in : name of symbol to look up */ - int lineno; /* in (opt): line number in filename where to look up symbol */ - unsigned bp_disp : 1, /* in : whether if we take into account func address or func first displayable insn */ - do_thunks : 1; /* in : whether we return thunks tags */ + unsigned do_thunks : 1; /* in : whether we return thunks tags */ ULONG64 frame_offset; /* in : frame for local & parameter variables look up */ }; @@ -87,7 +86,6 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* { struct sgv_data* sgv = (struct sgv_data*)ctx; ULONG64 addr; - IMAGEHLP_LINE il; unsigned cookie = DLV_TARGET, insp; if (sym->Flags & SYMFLAG_REGISTER) @@ -114,34 +112,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* } else { - DWORD disp; - il.SizeOfStruct = sizeof(il); - SymGetLineFromAddr(dbg_curr_process->handle, sym->Address, &disp, &il); - - if (sgv->lineno == -1) - { - if (!sgv->bp_disp || - !symbol_get_debug_start(sym->ModBase, sym->info, &addr)) - addr = sym->Address; - } - else - { - addr = 0; - do - { - if (sgv->lineno == il.LineNumber) - { - addr = il.Address; - break; - } - } while (SymGetLineNext(dbg_curr_process->handle, &il)); - if (!addr) - { - WINE_FIXME("No line (%d) found for %s (setting to symbol)\n", - sgv->lineno, sgv->name); - addr = sym->Address; - } - } + addr = sym->Address; } if (sgv->num >= NUMDBGV) @@ -174,8 +145,9 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sgv->syms[insp].lvalue.type.module = sym->ModBase; sgv->syms[insp].lvalue.type.id = sym->TypeIndex; sgv->syms[insp].flags = sym->Flags; + sgv->syms[insp].sym_info = sym->info; sgv->num++; - + return TRUE; } @@ -193,7 +165,7 @@ enum sym_get_lval symbol_get_lvalue(cons struct dbg_lvalue* rtn, BOOL bp_disp) { struct sgv_data sgv; - int i = 0; + int i; char buffer[512]; DWORD opt; IMAGEHLP_STACK_FRAME ihsf; @@ -207,8 +179,6 @@ enum sym_get_lval symbol_get_lvalue(cons sgv.num = 0; sgv.num_thunks = 0; sgv.name = &buffer[2]; - sgv.lineno = lineno; - sgv.bp_disp = bp_disp ? TRUE : FALSE; sgv.do_thunks = DBG_IVAR(AlwaysShowThunks); if (strchr(name, '!')) @@ -261,6 +231,48 @@ enum sym_get_lval symbol_get_lvalue(cons return sglv_unknown; } + /* recompute potential offsets for functions (linenumber, skip prolog) */ + for (i = 0; i < sgv.num; i++) + { + if (sgv.syms[i].flags & (SYMFLAG_REGISTER|SYMFLAG_REGREL|SYMFLAG_LOCAL|SYMFLAG_THUNK)) + continue; + + if (lineno == -1) + { + struct dbg_type type; + ULONG64 addr; + + type.module = sgv.syms[i].lvalue.type.module; + type.id = sgv.syms[i].sym_info; + if (bp_disp && symbol_get_debug_start(&type, &addr)) + sgv.syms[i].lvalue.addr.Offset = addr; + } + else + { + DWORD disp; + IMAGEHLP_LINE il; + BOOL found = FALSE; + + il.SizeOfStruct = sizeof(il); + SymGetLineFromAddr(dbg_curr_process->handle, + (DWORD)memory_to_linear_addr(&sgv.syms[i].lvalue.addr), + &disp, &il); + do + { + if (lineno == il.LineNumber) + { + sgv.syms[i].lvalue.addr.Offset = il.Address; + found = TRUE; + break; + } + } while (SymGetLineNext(dbg_curr_process->handle, &il)); + if (!found) + WINE_FIXME("No line (%d) found for %s (setting to symbol start)\n", + lineno, name); + } + } + + i = 0; if (dbg_interactiveP) { if (sgv.num - sgv.num_thunks > 1 || /* many symbols non thunks (and showing only non thunks) */ @@ -329,8 +341,6 @@ BOOL symbol_is_local(const char* name) sgv.num = 0; sgv.num_thunks = 0; sgv.name = name; - sgv.lineno = 0; - sgv.bp_disp = FALSE; sgv.do_thunks = FALSE; if (stack_get_current_frame(&ihsf)) @@ -411,6 +421,7 @@ enum dbg_line_status symbol_get_function DWORD lin = (DWORD)memory_to_linear_addr(addr); char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* sym = (SYMBOL_INFO*)buffer; + struct dbg_type func; il.SizeOfStruct = sizeof(il); sym->SizeOfStruct = sizeof(SYMBOL_INFO); @@ -438,8 +449,12 @@ enum dbg_line_status symbol_get_function if (!SymGetLineFromAddr(dbg_curr_process->handle, lin, &disp, &il)) return dbg_no_line_info; - if (symbol_get_debug_start(sym->ModBase, sym->info, &start) && lin < start) + func.module = sym->ModBase; + func.id = sym->info; + + if (symbol_get_debug_start(&func, &start) && lin < start) return dbg_not_on_a_line_number; + if (!sym->Size) sym->Size = 0x100000; if (il.FileName && il.FileName[0] && disp < sym->Size) return (disp == 0) ? dbg_on_a_line_number : dbg_not_on_a_line_number; @@ -465,8 +480,6 @@ BOOL symbol_get_line(const char* filenam sgv.num = 0; sgv.num_thunks = 0; sgv.name = &buffer[2]; - sgv.lineno = -1; - sgv.bp_disp = FALSE; sgv.do_thunks = FALSE; buffer[0] = '*';

1 0

Eric Pouech : winedbg: Added some black magic to still handle register values on non
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: d6d8682d711d5f1500832f5c5095f4df85a06c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d8682d711d5f1500832f5c5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:08 2006 +0100 winedbg: Added some black magic to still handle register values on non current frame for some of the registers we know of (frame pointer, stack pointer). --- programs/winedbg/be_alpha.c | 7 +++++++ programs/winedbg/be_cpu.h | 4 ++++ programs/winedbg/be_i386.c | 12 ++++++++++++ programs/winedbg/be_ppc.c | 7 +++++++ programs/winedbg/be_x86_64.c | 13 +++++++++++++ programs/winedbg/debugger.h | 5 +++++ programs/winedbg/memory.c | 18 ++++++++++++------ programs/winedbg/stack.c | 35 +++++++++++++++++++++++++++++++---- 8 files changed, 91 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 6bc9cd8..e3072ae 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -29,6 +29,12 @@ static unsigned be_alpha_get_addr(HANDLE return FALSE; } +static unsigned be_alpha_get_register_info(int regno, enum be_cpu_addr* kind) +{ + dbg_printf("not done\n"); + return FALSE; +} + static void be_alpha_single_step(CONTEXT* ctx, unsigned enable) { dbg_printf("not done\n"); @@ -148,6 +154,7 @@ struct backend_cpu be_alpha = be_cpu_linearize, be_cpu_build_addr, be_alpha_get_addr, + be_alpha_get_register_info, be_alpha_single_step, be_alpha_print_context, be_alpha_print_segment_info, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 4111dff..db3e0cd 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -43,6 +43,10 @@ struct backend_cpu */ unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, enum be_cpu_addr, ADDRESS64* addr); + + /* returns which kind of information a given register number refers to */ + unsigned (*get_register_info)(int regno, enum be_cpu_addr* kind); + /* ------------------------------------------------------------------------------- * context manipulation * ------------------------------------------------------------------------------- */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index dc8f824..f15121d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -111,6 +111,17 @@ static unsigned be_i386_get_addr(HANDLE return FALSE; } +static unsigned be_i386_get_register_info(int regno, enum be_cpu_addr* kind) +{ + switch (regno) + { + case CV_REG_EIP: *kind = be_cpu_addr_pc; return TRUE; + case CV_REG_EBP: *kind = be_cpu_addr_frame; return TRUE; + case CV_REG_ESP: *kind = be_cpu_addr_stack; return TRUE; + } + return FALSE; +} + static void be_i386_single_step(CONTEXT* ctx, unsigned enable) { if (enable) ctx->EFlags |= STEP_FLAG; @@ -739,6 +750,7 @@ struct backend_cpu be_i386 = be_i386_linearize, be_i386_build_addr, be_i386_get_addr, + be_i386_get_register_info, be_i386_single_step, be_i386_print_context, be_i386_print_segment_info, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 24e75e5..2e8826e 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -38,6 +38,12 @@ static unsigned be_ppc_get_addr(HANDLE h return FALSE; } +static unsigned be_ppc_get_register_info(int regno, enum be_cpu_addr* kind) +{ + dbg_printf("not done\n"); + return FALSE; +} + static void be_ppc_single_step(CONTEXT* ctx, unsigned enable) { #ifndef MSR_SE @@ -172,6 +178,7 @@ struct backend_cpu be_ppc = be_cpu_linearize, be_cpu_build_addr, be_ppc_get_addr, + be_ppc_get_register_info, be_ppc_single_step, be_ppc_print_context, be_ppc_print_segment_info, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 9a40a8c..3400f72 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -46,6 +46,18 @@ static unsigned be_x86_64_get_addr(HANDL } } +static unsigned be_x86_64_get_register_info(int regno, enum be_cpu_addr* kind) +{ + /* this is true when running in 32bit mode... and wrong in 64 :-/ */ + switch (regno) + { + case CV_AMD64_EIP: *kind = be_cpu_addr_pc; return TRUE; + case CV_AMD64_EBP: *kind = be_cpu_addr_frame; return TRUE; + case CV_AMD64_ESP: *kind = be_cpu_addr_stack; return TRUE; + } + return FALSE; +} + static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) { dbg_printf("not done single_step\n"); @@ -210,6 +222,7 @@ struct backend_cpu be_x86_64 = be_cpu_linearize, be_cpu_build_addr, be_x86_64_get_addr, + be_x86_64_get_register_info, be_x86_64_single_step, be_x86_64_print_context, be_x86_64_print_segment_info, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 67b84ba..43abb60 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -176,6 +176,10 @@ struct dbg_thread { ADDRESS64 addr_pc; ADDRESS64 addr_frame; + ADDRESS64 addr_stack; + DWORD linear_pc; + DWORD linear_frame; + DWORD linear_stack; }* frames; int num_frames; int curr_frame; @@ -361,6 +365,7 @@ extern void stack_info(void) extern void stack_backtrace(DWORD threadID); extern BOOL stack_set_frame(int newframe); extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); +extern BOOL stack_get_register_current_frame(unsigned regno, DWORD** pval); extern unsigned stack_fetch_frames(void); extern BOOL stack_get_current_symbol(SYMBOL_INFO* sym); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index d4fb7c3..01d3da0 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -636,16 +636,22 @@ BOOL memory_get_register(DWORD regno, DW if (buffer) snprintf(buffer, len, "<couldn't read memory>"); return FALSE; } - if (dbg_curr_thread->curr_frame != 0) - { - if (buffer) snprintf(buffer, len, "<register not in topmost frame>"); - return FALSE; - } + for (div = dbg_context_vars; div->name; div++) { if (div->val == regno) { - *value = div->pval; + if (dbg_curr_thread->curr_frame != 0) + { + if (!stack_get_register_current_frame(regno, value)) + { + if (buffer) snprintf(buffer, len, "<register %s not in topmost frame>", div->name); + return FALSE; + } + } + else + *value = div->pval; + snprintf(buffer, len, div->name); return TRUE; } diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 527ed03..c279014 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -82,8 +82,8 @@ static BOOL stack_set_frame_internal(int static BOOL stack_get_frame(int nf, IMAGEHLP_STACK_FRAME* ihsf) { memset(ihsf, 0, sizeof(*ihsf)); - ihsf->InstructionOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_pc); - ihsf->FrameOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_frame); + ihsf->InstructionOffset = dbg_curr_thread->frames[nf].linear_pc; + ihsf->FrameOffset = dbg_curr_thread->frames[nf].linear_frame; return TRUE; } @@ -96,6 +96,29 @@ BOOL stack_get_current_frame(IMAGEHLP_ST return stack_get_frame(dbg_curr_thread->curr_frame, ihsf); } +BOOL stack_get_register_current_frame(unsigned regno, DWORD** pval) +{ + enum be_cpu_addr kind; + + if (dbg_curr_thread->frames == NULL) return FALSE; + + if (!be_cpu->get_register_info(regno, &kind)) return FALSE; + + switch (kind) + { + case be_cpu_addr_pc: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_pc; + break; + case be_cpu_addr_stack: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_stack; + break; + case be_cpu_addr_frame: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_frame; + break; + } + return TRUE; +} + BOOL stack_set_frame(int newframe) { ADDRESS64 addr; @@ -170,8 +193,12 @@ unsigned stack_fetch_frames(void) dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, (nf + 1) * sizeof(dbg_curr_thread->frames[0])); - dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC; - dbg_curr_thread->frames[nf].addr_frame = sf.AddrFrame; + dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC; + dbg_curr_thread->frames[nf].linear_pc = (DWORD)memory_to_linear_addr(&sf.AddrPC); + dbg_curr_thread->frames[nf].addr_frame = sf.AddrFrame; + dbg_curr_thread->frames[nf].linear_frame = (DWORD)memory_to_linear_addr(&sf.AddrFrame); + dbg_curr_thread->frames[nf].addr_stack = sf.AddrStack; + dbg_curr_thread->frames[nf].linear_stack = (DWORD)memory_to_linear_addr(&sf.AddrStack); nf++; /* we've probably gotten ourselves into an infinite loop so bail */ if (nf > 200) break;

1 0

Eric Pouech : dbghelp: Now that symbol' s value computation depend on instruction
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 753055f93f82b2d669ecb099ed255d980326c896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753055f93f82b2d669ecb099e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:14 2006 +0100 dbghelp: Now that symbol's value computation depend on instruction pointer value, be sure to always store it (spotted by Peter Oberndorfer). --- dlls/dbghelp/dbghelp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index c95a7e1..c47977e 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -436,6 +436,7 @@ BOOL WINAPI SymSetContext(HANDLE hProces wine_dbgstr_longlong(pcs->ctx_frame.ReturnOffset), wine_dbgstr_longlong(pcs->ctx_frame.FrameOffset), wine_dbgstr_longlong(pcs->ctx_frame.StackOffset)); + pcs->ctx_frame.InstructionOffset = StackFrame->InstructionOffset; SetLastError(ERROR_ACCESS_DENIED); /* latest MSDN says ERROR_SUCCESS */ return FALSE; }

1 0

Rob Shearman : ole32: Add tests for invalid clipformat/ tymed combinations in IOleCache: Cache and for caching formats with a clipformat of 0.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: e99168e1ba8f4010adca2d8a085210ebf0c36b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99168e1ba8f4010adca2d8a0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 2 18:16:58 2006 +0000 ole32: Add tests for invalid clipformat/tymed combinations in IOleCache:Cache and for caching formats with a clipformat of 0. --- dlls/ole32/tests/ole2.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index e15942d..36341d5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1071,12 +1071,14 @@ static void test_data_cache(void) "draw_continue", "DataObject_GetData", "DataObject_GetData", + "DataObject_GetData", NULL }; GetSystemDirectory(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0])); expected_method_list = methods_cacheinitnew; + fmtetc.cfFormat = CF_METAFILEPICT; fmtetc.dwAspect = DVASPECT_ICON; fmtetc.lindex = -1; @@ -1111,24 +1113,62 @@ static void test_data_cache(void) ok_ole_success(hr, "IPersistStorage_GetClassID"); ok(IsEqualCLSID(&clsid, &IID_NULL), "clsid should be blank\n"); + hr = IOleCache_Uncache(pOleCache, 0xdeadbeef); + ok(hr == OLE_E_NOCONNECTION, "IOleCache_Uncache with invalid value should return OLE_E_NOCONNECTION instead of 0x%x\n", hr); + + for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++) + { + int i; + fmtetc.dwAspect = DVASPECT_THUMBNAIL; + for (i = 0; i < 7; i++) + { + fmtetc.tymed = 1 << i; + hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); + if ((fmtetc.cfFormat == CF_METAFILEPICT && fmtetc.tymed == TYMED_MFPICT) || + (fmtetc.cfFormat == CF_BITMAP && fmtetc.tymed == TYMED_GDI) || + (fmtetc.cfFormat == CF_DIB && fmtetc.tymed == TYMED_HGLOBAL) || + (fmtetc.cfFormat == CF_ENHMETAFILE && fmtetc.tymed == TYMED_ENHMF)) + ok(hr == S_OK, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned S_OK instead of 0x%08x\n", + fmtetc.cfFormat, fmtetc.tymed, hr); + else if (fmtetc.tymed == TYMED_HGLOBAL) + ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, + "IOleCache_Cache cfFormat = %d, tymed = %d should have returned CACHE_S_FORMATETC_NOTSUPPORTED instead of 0x%08x\n", + fmtetc.cfFormat, fmtetc.tymed, hr); + else + ok(hr == DV_E_TYMED, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned DV_E_TYMED instead of 0x%08x\n", + fmtetc.cfFormat, fmtetc.tymed, hr); + if (SUCCEEDED(hr)) + { + hr = IOleCache_Uncache(pOleCache, dwConnection); + ok_ole_success(hr, "IOleCache_Uncache"); + } + } + } + + fmtetc.cfFormat = CF_BITMAP; + fmtetc.dwAspect = DVASPECT_THUMBNAIL; + fmtetc.tymed = TYMED_GDI; hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); ok_ole_success(hr, "IOleCache_Cache"); - fmtetc.dwAspect = DVASPECT_THUMBNAIL; + fmtetc.cfFormat = 0; + fmtetc.dwAspect = DVASPECT_ICON; + fmtetc.tymed = TYMED_MFPICT; hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); ok_ole_success(hr, "IOleCache_Cache"); MultiByteToWideChar(CP_ACP, 0, szSystemDir, -1, wszPath, sizeof(wszPath)/sizeof(wszPath[0])); memcpy(wszPath+lstrlenW(wszPath), wszShell32, sizeof(wszShell32)); - fmtetc.dwAspect = DVASPECT_CONTENT; fmtetc.cfFormat = CF_METAFILEPICT; stgmedium.tymed = TYMED_MFPICT; stgmedium.hMetaFilePict = OleMetafilePictFromIconAndLabel( LoadIcon(NULL, MAKEINTRESOURCE(IDI_APPLICATION)), wszPath, wszPath, 0); stgmedium.pUnkForRelease = NULL; + + fmtetc.dwAspect = DVASPECT_CONTENT; hr = IOleCache_SetData(pOleCache, &fmtetc, &stgmedium, FALSE); - ok(hr == OLE_E_BLANK, "IOleCache_SetData for aspect not in cache should have return OLE_E_BLANK instead of 0x%x\n", hr); + ok(hr == OLE_E_BLANK, "IOleCache_SetData for aspect not in cache should have return OLE_E_BLANK instead of 0x%08x\n", hr); fmtetc.dwAspect = DVASPECT_ICON; hr = IOleCache_SetData(pOleCache, &fmtetc, &stgmedium, FALSE);

1 0

Rob Shearman : ole32: Add some more traces to the data cache to make debugging easier.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: feee099eecd906468ff5569598026a8a32b41109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feee099eecd906468ff556959… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 2 18:17:05 2006 +0000 ole32: Add some more traces to the data cache to make debugging easier. --- dlls/ole32/datacache.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ff08432..5dd6bd6 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1643,6 +1643,8 @@ static HRESULT WINAPI DataCache_Draw( } } + WARN("no data could be found to be drawn\n"); + return OLE_E_BLANK; } @@ -1856,6 +1858,8 @@ static HRESULT WINAPI DataCache_GetExten } } + WARN("no data could be found to get the extents from\n"); + /* * This method returns OLE_E_BLANK when it fails. */ @@ -1927,6 +1931,7 @@ static HRESULT WINAPI DataCache_Cache( cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); if (cache_entry) { + TRACE("found an existing cache entry\n"); *pdwConnection = cache_entry->id; return CACHE_S_SAMECACHE; } @@ -1955,6 +1960,8 @@ static HRESULT WINAPI DataCache_Uncache( return S_OK; } + WARN("no connection found for %d\n", dwConnection); + return OLE_E_NOCONNECTION; }

1 0

Eric Pouech : winedbg: No longer test filename in sgv_cb, but do it in the only place where we actually need it.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 66cbe625d4967055dcd1f011a08fbc591953204a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cbe625d4967055dcd1f011a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:42:58 2006 +0100 winedbg: No longer test filename in sgv_cb, but do it in the only place where we actually need it. --- programs/winedbg/symbol.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index d8d7cc4..b1a71ec 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -77,7 +77,6 @@ struct sgv_data int num; /* out : number of found symbols */ int num_thunks; /* out : number of thunks found */ const char* name; /* in : name of symbol to look up */ - const char* filename; /* in (opt): filename where to look up symbol */ int lineno; /* in (opt): line number in filename where to look up symbol */ unsigned bp_disp : 1, /* in : whether if we take into account func address or func first displayable insn */ do_thunks : 1; /* in : whether we return thunks tags */ @@ -118,11 +117,6 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* DWORD disp; il.SizeOfStruct = sizeof(il); SymGetLineFromAddr(dbg_curr_process->handle, sym->Address, &disp, &il); - if (sgv->filename && strcmp(sgv->filename, il.FileName)) - { - WINE_FIXME("File name mismatch (%s / %s)\n", sgv->filename, il.FileName); - return TRUE; - } if (sgv->lineno == -1) { @@ -213,7 +207,6 @@ enum sym_get_lval symbol_get_lvalue(cons sgv.num = 0; sgv.num_thunks = 0; sgv.name = &buffer[2]; - sgv.filename = NULL; sgv.lineno = lineno; sgv.bp_disp = bp_disp ? TRUE : FALSE; sgv.do_thunks = DBG_IVAR(AlwaysShowThunks); @@ -336,7 +329,6 @@ BOOL symbol_is_local(const char* name) sgv.num = 0; sgv.num_thunks = 0; sgv.name = name; - sgv.filename = NULL; sgv.lineno = 0; sgv.bp_disp = FALSE; sgv.do_thunks = FALSE; @@ -466,12 +458,13 @@ BOOL symbol_get_line(const char* filenam { struct sgv_data sgv; char buffer[512]; - DWORD opt, disp; + DWORD opt, disp, linear; + unsigned i, found = FALSE; + IMAGEHLP_LINE il; sgv.num = 0; sgv.num_thunks = 0; sgv.name = &buffer[2]; - sgv.filename = filename; sgv.lineno = -1; sgv.bp_disp = FALSE; sgv.do_thunks = FALSE; @@ -487,7 +480,7 @@ BOOL symbol_get_line(const char* filenam if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { SymSetOptions(opt); - return sglv_unknown; + return FALSE; } if (!sgv.num && (name[0] != '_')) @@ -497,23 +490,32 @@ BOOL symbol_get_line(const char* filenam if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { SymSetOptions(opt); - return sglv_unknown; + return FALSE; } } SymSetOptions(opt); - switch (sgv.num) + for (i = 0; i < sgv.num; i++) + { + linear = (DWORD)memory_to_linear_addr(&sgv.syms[i].lvalue.addr); + + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr(dbg_curr_process->handle, linear, &disp, &il)) + continue; + if (filename && strcmp(line->FileName, filename)) continue; + if (found) + { + WINE_FIXME("Several found, returning first (may not be what you want)...\n"); + break; + } + found = TRUE; + *line = il; + } + if (!found) { - case 0: if (filename) dbg_printf("No such function %s in %s\n", name, filename); else dbg_printf("No such function %s\n", name); return FALSE; - default: - WINE_FIXME("Several found, returning first (may not be what you want)...\n"); - case 1: - return SymGetLineFromAddr(dbg_curr_process->handle, - (DWORD)memory_to_linear_addr(&sgv.syms[0].lvalue.addr), - &disp, line); } return TRUE; }

1 0

Rob Shearman : ole32: In the data cache, fmtetc->cfFormat and fmtetc-> tymed can be 0 which means to match any clipformat/tymed.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: ca81b825be47b054069ad2f9070e7ec751db0826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca81b825be47b054069ad2f90… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 2 18:16:53 2006 +0000 ole32: In the data cache, fmtetc->cfFormat and fmtetc->tymed can be 0 which means to match any clipformat/tymed. Therefore, keep the clipformat of the data in the data_cf field. Return an error from SetData if a non-zero clipformat hasn't been specified. Write out stgmedium.tymed instead of fmtetc.tymed, which is guaranteed to be non-zero if data has been set. --- dlls/ole32/datacache.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d6d34d0..ff08432 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -89,6 +89,8 @@ typedef struct DataCacheEntry struct list entry; /* format of this entry */ FORMATETC fmtetc; + /* the clipboard format of the data */ + CLIPFORMAT data_cf; /* cached data */ STGMEDIUM stgmedium; /* @@ -538,6 +540,7 @@ static HRESULT DataCacheEntry_LoadData(D GlobalUnlock(hmfpict); if (SUCCEEDED(hres)) { + This->data_cf = This->fmtetc.cfFormat; This->stgmedium.tymed = TYMED_MFPICT; This->stgmedium.u.hMetaFilePict = hmfpict; } @@ -584,23 +587,23 @@ static HRESULT DataCacheEntry_Save(DataC return hr; /* custom clipformat */ - if (This->fmtetc.cfFormat > 0xc000) + if (This->data_cf >= 0xc000) FIXME("custom clipboard format not serialized properly\n"); header.unknown1 = -1; - header.clipformat = This->fmtetc.cfFormat; + header.clipformat = This->data_cf; if (This->fmtetc.ptd) FIXME("ptd not serialized\n"); header.unknown3 = 4; header.dvAspect = This->fmtetc.dwAspect; header.lindex = This->fmtetc.lindex; - header.tymed = This->fmtetc.tymed; + header.tymed = This->stgmedium.tymed; header.unknown7 = 0; header.dwObjectExtentX = 0; header.dwObjectExtentY = 0; header.dwSize = 0; /* size the data */ - switch (This->fmtetc.cfFormat) + switch (This->data_cf) { case CF_METAFILEPICT: { @@ -635,7 +638,7 @@ static HRESULT DataCacheEntry_Save(DataC } /* get the data */ - switch (This->fmtetc.cfFormat) + switch (This->data_cf) { case CF_METAFILEPICT: { @@ -704,17 +707,28 @@ static HRESULT copy_stg_medium(CLIPFORMA } static HRESULT DataCacheEntry_SetData(DataCacheEntry *This, - STGMEDIUM *stgmedium, BOOL fRelease) + const FORMATETC *formatetc, + const STGMEDIUM *stgmedium, + BOOL fRelease) { + if ((!This->fmtetc.cfFormat && !formatetc->cfFormat) || + (This->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) || + stgmedium->tymed == TYMED_NULL) + { + WARN("invalid formatetc\n"); + return DV_E_FORMATETC; + } + This->dirty = TRUE; ReleaseStgMedium(&This->stgmedium); + This->data_cf = This->fmtetc.cfFormat ? This->fmtetc.cfFormat : formatetc->cfFormat; if (fRelease) { This->stgmedium = *stgmedium; return S_OK; } else - return copy_stg_medium(This->fmtetc.cfFormat, + return copy_stg_medium(This->data_cf, &This->stgmedium, stgmedium); } @@ -1568,7 +1582,7 @@ static HRESULT WINAPI DataCache_Draw( if (cache_entry->stgmedium.tymed == TYMED_NULL) continue; - switch (cache_entry->fmtetc.cfFormat) + switch (cache_entry->data_cf) { case CF_METAFILEPICT: { @@ -1822,7 +1836,7 @@ static HRESULT WINAPI DataCache_GetExten continue; - switch (cache_entry->fmtetc.cfFormat) + switch (cache_entry->data_cf) { case CF_METAFILEPICT: { @@ -1971,11 +1985,12 @@ static HRESULT WINAPI DataCache_IOleCach HRESULT hr; TRACE("(%p, %p, %s)\n", pformatetc, pmedium, fRelease ? "TRUE" : "FALSE"); + TRACE("formatetc = "); dump_FORMATETC(pformatetc); TRACE("\n"); cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); if (cache_entry) { - hr = DataCacheEntry_SetData(cache_entry, pmedium, fRelease); + hr = DataCacheEntry_SetData(cache_entry, pformatetc, pmedium, fRelease); if (SUCCEEDED(hr)) DataCache_FireOnViewChange(This, cache_entry->fmtetc.dwAspect, @@ -1983,6 +1998,7 @@ static HRESULT WINAPI DataCache_IOleCach return hr; } + WARN("cache entry not found\n"); return OLE_E_BLANK; }

1 0

Rob Shearman : ole32: Check that the specified clipboard format and tymed are valid in IOleCache ::Cache in the data cache.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: d37b669503ec73fde07f274f0ec97e69fd543d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b669503ec73fde07f274f0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 2 18:16:47 2006 +0000 ole32: Check that the specified clipboard format and tymed are valid in IOleCache::Cache in the data cache. --- dlls/ole32/datacache.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index f5f43eb..d6d34d0 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -249,8 +249,36 @@ static DataCacheEntry *DataCache_GetEntr return NULL; } +/* checks that the clipformat and tymed are valid and returns an error if they +* aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by +* DataCache_Draw */ +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) +{ + if (!cfFormat || !tymed || + (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || + (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || + (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || + (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) + return S_OK; + else if (tymed == TYMED_HGLOBAL) + return CACHE_S_FORMATETC_NOTSUPPORTED; + else + { + WARN("invalid clipformat/tymed combination: %d/%d\n", cfFormat, tymed); + return DV_E_TYMED; + } +} + static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DataCacheEntry **cache_entry) { + HRESULT hr; + + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); + if (FAILED(hr)) + return hr; + if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) + TRACE("creating unsupported format %d\n", formatetc->cfFormat); + *cache_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(**cache_entry)); if (!*cache_entry) return E_OUTOFMEMORY; @@ -268,7 +296,7 @@ static HRESULT DataCache_CreateEntry(Dat (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; list_add_tail(&This->cache_list, &(*cache_entry)->entry); - return S_OK; + return hr; } /************************************************************************

1 0