ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Get rid of module_name in all traces (using Unicode flavor).

This commit is contained in:
Eric Pouech 2007-03-13 17:26:33 +01:00 committed by Alexandre Julliard
parent ade919c603
commit f2cfb374a4
7 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/dbghelp/dwarf.c
View File

@ -330,7 +330,8 @@ static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ct
static const char* dwarf2_debug_ctx(const dwarf2_parse_context_t* ctx) static const char* dwarf2_debug_ctx(const dwarf2_parse_context_t* ctx)
{ {
return wine_dbg_sprintf("ctx(%p,%s)", ctx, ctx->module->module_name); return wine_dbg_sprintf("ctx(%p,%s)",
ctx, debugstr_w(ctx->module->module.ModuleName));
} }
static const char* dwarf2_debug_di(const dwarf2_debug_info_t* di) static const char* dwarf2_debug_di(const dwarf2_debug_info_t* di)
@ -1749,7 +1750,8 @@ static void dwarf2_set_line_number(struct module* module, unsigned long address,
if (!file || !(psrc = vector_at(v, file - 1))) return; if (!file || !(psrc = vector_at(v, file - 1))) return;
TRACE("%s %lx %s %u\n", module->module_name, address, source_get(module, *psrc), line); TRACE("%s %lx %s %u\n",
debugstr_w(module->module.ModuleName), address, source_get(module, *psrc), line);
if (!(symt = symt_find_nearest(module, address)) || if (!(symt = symt_find_nearest(module, address)) ||
symt->symt.tag != SymTagFunction) return; symt->symt.tag != SymTagFunction) return;
func = (struct symt_function*)symt; func = (struct symt_function*)symt;

20
dlls/dbghelp/elf_module.c
View File

@ -529,7 +529,7 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module,
if (!result && !(result = weak_result)) if (!result && !(result = weak_result))
{ {
FIXME("Couldn't find symbol %s!%s in symtab\n", FIXME("Couldn't find symbol %s!%s in symtab\n",
module->module_name, name); debugstr_w(module->module.ModuleName), name);
return NULL; return NULL;
} }
return result->symp; return result->symp;
@ -567,17 +567,19 @@ static void elf_finish_stabs_info(struct module* module, struct hash_table* symt
if (((struct symt_function*)sym)->address != module->elf_info->elf_addr && if (((struct symt_function*)sym)->address != module->elf_info->elf_addr &&
((struct symt_function*)sym)->address != module->elf_info->elf_addr + symp->st_value) ((struct symt_function*)sym)->address != module->elf_info->elf_addr + symp->st_value)
FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n",
sym, module->module_name, sym->hash_elt.name, sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name,
((struct symt_function*)sym)->address, module->elf_info->elf_addr + symp->st_value); ((struct symt_function*)sym)->address, module->elf_info->elf_addr + symp->st_value);
if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size) if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size)
FIXME("Changing size for %p/%s!%s from %08lx to %08x\n", FIXME("Changing size for %p/%s!%s from %08lx to %08x\n",
sym, module->module_name, sym->hash_elt.name, sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name,
((struct symt_function*)sym)->size, symp->st_size); ((struct symt_function*)sym)->size, symp->st_size);
((struct symt_function*)sym)->address = module->elf_info->elf_addr + ((struct symt_function*)sym)->address = module->elf_info->elf_addr +
symp->st_value; symp->st_value;
((struct symt_function*)sym)->size = symp->st_size; ((struct symt_function*)sym)->size = symp->st_size;
} else FIXME("Couldn't find %s!%s\n", module->module_name, sym->hash_elt.name); } else
FIXME("Couldn't find %s!%s\n",
debugstr_w(module->module.ModuleName), sym->hash_elt.name);
break; break;
case SymTagData: case SymTagData:
switch (((struct symt_data*)sym)->kind) switch (((struct symt_data*)sym)->kind)
@ -593,13 +595,15 @@ static void elf_finish_stabs_info(struct module* module, struct hash_table* symt
if (((struct symt_data*)sym)->u.var.offset != module->elf_info->elf_addr && if (((struct symt_data*)sym)->u.var.offset != module->elf_info->elf_addr &&
((struct symt_data*)sym)->u.var.offset != module->elf_info->elf_addr + symp->st_value) ((struct symt_data*)sym)->u.var.offset != module->elf_info->elf_addr + symp->st_value)
FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n",
sym, module->module_name, sym->hash_elt.name, sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name,
((struct symt_function*)sym)->address, module->elf_info->elf_addr + symp->st_value); ((struct symt_function*)sym)->address, module->elf_info->elf_addr + symp->st_value);
((struct symt_data*)sym)->u.var.offset = module->elf_info->elf_addr + ((struct symt_data*)sym)->u.var.offset = module->elf_info->elf_addr +
symp->st_value; symp->st_value;
((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ?
DataIsFileStatic : DataIsGlobal; DataIsFileStatic : DataIsGlobal;
} else FIXME("Couldn't find %s!%s\n", module->module_name, sym->hash_elt.name); } else
FIXME("Couldn't find %s!%s\n",
debugstr_w(module->module.ModuleName), sym->hash_elt.name);
break; break;
default:; default:;
} }
@ -694,7 +698,7 @@ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symt
if ((xsize || ste->symp->st_size) && if ((xsize || ste->symp->st_size) &&
(kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal)) (kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal))
FIXME("Duplicate in %s: %s<%08x-%08x> %s<%s-%s>\n", FIXME("Duplicate in %s: %s<%08x-%08x> %s<%s-%s>\n",
module->module_name, debugstr_w(module->module.ModuleName),
ste->ht_elt.name, addr, ste->symp->st_size, ste->ht_elt.name, addr, ste->symp->st_size,
symt->hash_elt.name, symt->hash_elt.name,
wine_dbgstr_longlong(xaddr), wine_dbgstr_longlong(xsize)); wine_dbgstr_longlong(xaddr), wine_dbgstr_longlong(xsize));
@ -1055,7 +1059,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module,
const BYTE* dw2_debug_line; const BYTE* dw2_debug_line;
const BYTE* dw2_debug_loclist; const BYTE* dw2_debug_loclist;
TRACE("Loading Dwarf2 information for %s\n", module->module_name); TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName));
elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect); elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect);
elf_find_section(fmap, ".debug_abbrev", SHT_NULL, &debug_abbrev_sect); elf_find_section(fmap, ".debug_abbrev", SHT_NULL, &debug_abbrev_sect);

2
dlls/dbghelp/module.c
View File

@ -572,7 +572,7 @@ BOOL module_remove(struct process* pcs, struct module* module)
{ {
struct module** p; struct module** p;
TRACE("%s (%p)\n", module->module_name, module); TRACE("%s (%p)\n", debugstr_w(module->module.ModuleName), module);
hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_symbols);
hash_table_destroy(&module->ht_types); hash_table_destroy(&module->ht_types);
HeapFree(GetProcessHeap(), 0, (char*)module->sources); HeapFree(GetProcessHeap(), 0, (char*)module->sources);

2
dlls/dbghelp/msc.c
View File

@ -2444,7 +2444,7 @@ static BOOL codeview_process_info(const struct process* pcs,
} }
default: default:
ERR("Unknown CODEVIEW signature %.4s in module %s\n", ERR("Unknown CODEVIEW signature %.4s in module %s\n",
(const char*)signature, msc_dbg->module->module_name); (const char*)signature, debugstr_w(msc_dbg->module->module.ModuleName));
break; break;
} }
if (ret) if (ret)

2
dlls/dbghelp/pe_module.c
View File

@ -178,7 +178,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs,
misc->DataType != IMAGE_DEBUG_MISC_EXENAME) misc->DataType != IMAGE_DEBUG_MISC_EXENAME)
{ {
WINE_ERR("-Debug info stripped, but no .DBG file in module %s\n", WINE_ERR("-Debug info stripped, but no .DBG file in module %s\n",
module->module_name); debugstr_w(module->module.ModuleName));
} }
else else
{ {

16
dlls/dbghelp/symbol.c
View File

@ -131,7 +131,7 @@ struct symt_compiland* symt_new_compiland(struct module* module,
struct symt_compiland* sym; struct symt_compiland* sym;
TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n", TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n",
module->module_name, source_get(module, src_idx)); debugstr_w(module->module.ModuleName), source_get(module, src_idx));
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
{ {
sym->symt.tag = SymTagCompiland; sym->symt.tag = SymTagCompiland;
@ -152,7 +152,7 @@ struct symt_public* symt_new_public(struct module* module,
struct symt** p; struct symt** p;
TRACE_(dbghelp_symt)("Adding public symbol %s:%s @%lx\n", TRACE_(dbghelp_symt)("Adding public symbol %s:%s @%lx\n",
module->module_name, name, address); debugstr_w(module->module.ModuleName), name, address);
if ((dbghelp_options & SYMOPT_AUTO_PUBLICS) && if ((dbghelp_options & SYMOPT_AUTO_PUBLICS) &&
symt_find_nearest(module, address) != NULL) symt_find_nearest(module, address) != NULL)
return NULL; return NULL;
@ -187,7 +187,7 @@ struct symt_data* symt_new_global_variable(struct module* module,
DWORD64 tsz; DWORD64 tsz;
TRACE_(dbghelp_symt)("Adding global symbol %s:%s @%lx %p\n", TRACE_(dbghelp_symt)("Adding global symbol %s:%s @%lx %p\n",
module->module_name, name, addr, type); debugstr_w(module->module.ModuleName), name, addr, type);
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
{ {
sym->symt.tag = SymTagData; sym->symt.tag = SymTagData;
@ -202,7 +202,7 @@ struct symt_data* symt_new_global_variable(struct module* module,
{ {
if (tsz != size) if (tsz != size)
FIXME("Size mismatch for %s.%s between type (%s) and src (%lu)\n", FIXME("Size mismatch for %s.%s between type (%s) and src (%lu)\n",
module->module_name, name, debugstr_w(module->module.ModuleName), name,
wine_dbgstr_longlong(tsz), size); wine_dbgstr_longlong(tsz), size);
} }
if (compiland) if (compiland)
@ -224,7 +224,7 @@ struct symt_function* symt_new_function(struct module* module,
struct symt** p; struct symt** p;
TRACE_(dbghelp_symt)("Adding global function %s:%s @%lx-%lx\n", TRACE_(dbghelp_symt)("Adding global function %s:%s @%lx-%lx\n",
module->module_name, name, addr, addr + size - 1); debugstr_w(module->module.ModuleName), name, addr, addr + size - 1);
assert(!sig_type || sig_type->tag == SymTagFunctionType); assert(!sig_type || sig_type->tag == SymTagFunctionType);
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
@ -310,7 +310,7 @@ struct symt_data* symt_add_func_local(struct module* module,
struct symt** p; struct symt** p;
TRACE_(dbghelp_symt)("Adding local symbol (%s:%s): %s %p\n", TRACE_(dbghelp_symt)("Adding local symbol (%s:%s): %s %p\n",
module->module_name, func->hash_elt.name, debugstr_w(module->module.ModuleName), func->hash_elt.name,
name, type); name, type);
assert(func); assert(func);
@ -425,7 +425,7 @@ struct symt_thunk* symt_new_thunk(struct module* module,
struct symt_thunk* sym; struct symt_thunk* sym;
TRACE_(dbghelp_symt)("Adding global thunk %s:%s @%lx-%lx\n", TRACE_(dbghelp_symt)("Adding global thunk %s:%s @%lx-%lx\n",
module->module_name, name, addr, addr + size - 1); debugstr_w(module->module.ModuleName), name, addr, addr + size - 1);
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
{ {
@ -455,7 +455,7 @@ struct symt_data* symt_new_constant(struct module* module,
struct symt_data* sym; struct symt_data* sym;
TRACE_(dbghelp_symt)("Adding constant value %s:%s\n", TRACE_(dbghelp_symt)("Adding constant value %s:%s\n",
module->module_name, name); debugstr_w(module->module.ModuleName), name);
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
{ {

3
dlls/dbghelp/type.c
View File

@ -164,7 +164,8 @@ struct symt_udt* symt_new_udt(struct module* module, const char* typename,
{ {
struct symt_udt* sym; struct symt_udt* sym;
TRACE_(dbghelp_symt)("Adding udt %s:%s\n", module->module_name, typename); TRACE_(dbghelp_symt)("Adding udt %s:%s\n",
debugstr_w(module->module.ModuleName), typename);
if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
{ {
sym->symt.tag = SymTagUDT; sym->symt.tag = SymTagUDT;