January 2006 - Wine-commits

Alexandre Julliard : Fixed a couple of warnings on MacOS.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 53496f83e71f10f07a38b66984805b805d2ba003 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53496f83e71f10f07a38b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 16:48:26 2006 +0100 Fixed a couple of warnings on MacOS. --- libs/wine/mmap.c | 17 ++++++++++------- server/timer.c | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 335e148..2e16073 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -140,6 +140,9 @@ static int try_mmap_fixed (void *addr, s #elif defined(__APPLE__) +#include <mach/mach_init.h> +#include <mach/vm_map.h> + /* * On Darwin, we can use the Mach call vm_allocate to allocate * anonymous memory at the specified address, and then use mmap with @@ -148,15 +151,15 @@ static int try_mmap_fixed (void *addr, s static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, int fildes, off_t off) { - void *result; - result = addr; - if(vm_allocate(mach_task_self(),&result,len,0)) - return 0; - else + vm_address_t result = (vm_address_t)addr; + + if (!vm_allocate(mach_task_self(),&result,len,0)) { - result = mmap( addr, len, prot, flags | MAP_FIXED, fildes, off ); - return result == addr; + if (mmap( (void *)result, len, prot, flags | MAP_FIXED, fildes, off ) != MAP_FAILED) + return 1; + vm_deallocate(mach_task_self(),result,len); } + return 0; } #endif /* (__svr4__ || __NetBSD__) && !MAP_TRYFIXED */ diff --git a/server/timer.c b/server/timer.c index b87dd88..5debc0a 100644 --- a/server/timer.c +++ b/server/timer.c @@ -176,8 +176,8 @@ static void timer_dump( struct object *o { struct timer *timer = (struct timer *)obj; assert( obj->ops == &timer_ops ); - fprintf( stderr, "Timer manual=%d when=%ld.%06ld period=%d ", - timer->manual, timer->when.tv_sec, timer->when.tv_usec, timer->period ); + fprintf( stderr, "Timer manual=%d when=%ld.%06u period=%d ", + timer->manual, timer->when.tv_sec, (unsigned int)timer->when.tv_usec, timer->period ); dump_object_name( &timer->obj ); fputc( '\n', stderr ); }

1 0

Alexandre Julliard : winedbg: Use Win32 types instead of long long.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 9daaab54c7aae5d344ddcdcd430efc70f2746ab4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9daaab54c7aae5d344ddcdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 16:47:07 2006 +0100 winedbg: Use Win32 types instead of long long. --- dlls/dbghelp/stabs.c | 4 ++-- programs/winedbg/be_alpha.c | 2 +- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/be_ppc.c | 2 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 76629b7..75517df 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -428,7 +428,7 @@ static int stabs_pts_read_type_reference struct pts_range_value { - unsigned long long val; + ULONGLONG val; int sign; }; @@ -483,7 +483,7 @@ static int stabs_pts_read_range(struct P unsigned size; enum BasicType bt; int i; - unsigned long long v; + ULONGLONG v; /* type ';' <int> ';' <int> ';' */ PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref) == -1); diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index f4226b4..98bbe9a 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -130,7 +130,7 @@ static int be_alpha_adjust_pc_for_break( } static int be_alpha_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, long long int* ret) + unsigned ext_sign, LONGLONG* ret) { dbg_printf("not done\n"); return FALSE; diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index c753d2f..d776cf1 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -103,7 +103,7 @@ struct backend_cpu * basic type read/write * -------------------------------------------------------------------------------*/ /* Reads an integer from memory and stores it inside a long long int */ - int (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, unsigned is_signed, long long int*); + int (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, unsigned is_signed, LONGLONG*); /* Reads a real from memory and stores it inside a long double */ int (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, long double*); }; diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 4f340c7..f1ee7be 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -496,7 +496,7 @@ static int be_i386_adjust_pc_for_break(C } static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, long long int* ret) + unsigned ext_sign, LONGLONG* ret) { if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; @@ -509,7 +509,7 @@ static int be_i386_fetch_integer(const s /* propagate sign information */ if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) { - long long unsigned int neg = -1; + ULONGLONG neg = -1; *ret |= neg << (size * 8); } return TRUE; diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 04e3cdd..e943dfa 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -154,7 +154,7 @@ static int be_ppc_adjust_pc_for_break(CO } static int be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, long long int* ret) + unsigned ext_sign, LONGLONG* ret) { dbg_printf("not done\n"); return FALSE; diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 8e8b984..8b042c9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -275,7 +275,7 @@ BOOL memory_get_string_indirect(struct d static void print_typed_basic(const struct dbg_lvalue* lvalue) { - long long int val_int; + LONGLONG val_int; void* val_ptr; long double val_real; DWORD64 size64; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index bb05422..052b8c6 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); long int types_extract_as_integer(const struct dbg_lvalue* lvalue) { long int rtn = 0; - long long int val; + LONGLONG val; DWORD tag, bt; DWORD64 size;

1 0

Mike McCormack : ntdll: Forward ZwNotifyChangeDirectoryFile to NtNotifyChangeDirectoryFile.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 2735fc58b990a94554e62cd8287fcd63962b65a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2735fc58b990a94554e62cd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 23 16:39:49 2006 +0100 ntdll: Forward ZwNotifyChangeDirectoryFile to NtNotifyChangeDirectoryFile. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index eb0ec0c..30ad80a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1042,7 +1042,7 @@ # @ stub ZwMapUserPhysicalPagesScatter @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection # @ stub ZwModifyBootEntry -@ stub ZwNotifyChangeDirectoryFile +@ stdcall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey # @ stub ZwNotifyChangeMultipleKeys @ stdcall ZwOpenDirectoryObject(long long long) NtOpenDirectoryObject

1 0

Alexandre Julliard : server: More generic mechanism for adding typecasts in server traces.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 58273ea9c62839f9cbdb1be5aec674e2e60ed0d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58273ea9c62839f9cbdb1be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 16:40:57 2006 +0100 server: More generic mechanism for adding typecasts in server traces. Added casts for size_t values. --- server/trace.c | 42 +++++++++++++++++++++--------------------- tools/make_requests | 17 ++++++++++------- 2 files changed, 31 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=58273ea9c62839f9cbd…

1 0

Eric Pouech : dbghelp: Return better values in module information.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 0509fe72c94d58653e43b58912d3e6bf7835e877 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0509fe72c94d58653e43b58… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:38:57 2006 +0100 dbghelp: Return better values in module information. - 32/64: number of symbols is now correct - 64: the 64 bit extra fields are now initialized with some non null yet sensible value --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 48 +++++++++++++++++++++++++++++----------- dlls/dbghelp/symbol.c | 12 +++------- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a4950fa..3f5fcf6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -334,6 +334,7 @@ extern BOOL elf_synchronize_modu extern DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr); /* module.c */ +extern int module_compute_num_syms(struct module* module); extern struct module* module_find_by_addr(const struct process* pcs, unsigned long addr, enum module_type type); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 0227aa0..17974ef 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -271,6 +271,7 @@ struct module* module_get_debug(const st } if (!ret) module->module.SymType = SymNone; assert(module->module.SymType != SymDeferred); + module_compute_num_syms(module); } return (module && module->module.SymType != SymNone) ? module : NULL; } @@ -359,6 +360,18 @@ enum module_type module_get_type_by_name return DMT_PE; } +int module_compute_num_syms(struct module* module) +{ + struct hash_table_iter hti; + void* ptr; + + module->module.NumSyms = 0; + hash_table_iter_init(&module->ht_symbols, &hti, NULL); + while ((ptr = hash_table_iter_up(&hti))) + module->module.NumSyms++; + return module->module.NumSyms; +} + /*********************************************************************** * SymLoadModule (DBGHELP.@) */ @@ -404,7 +417,7 @@ DWORD WINAPI SymLoadModule(HANDLE hProce WARN("Couldn't locate %s\n", ImageName); return 0; } - + module_compute_num_syms(module); done: /* by default pe_load_module fills module.ModuleName from a derivation * of ImageName. Overwrite it, if we have better information @@ -436,6 +449,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h if (!module) return FALSE; if (ModuleName) lstrcpynA(module->module.ModuleName, ModuleName, sizeof(module->module.ModuleName)); + module->module.SymType = SymVirtual; return TRUE; } @@ -601,7 +615,10 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hPr { module = module_get_container(pcs, module); if (module && module->module.SymType != SymNone) + { ModuleInfo->SymType = module->module.SymType; + ModuleInfo->NumSyms = module->module.NumSyms; + } } return TRUE; @@ -616,8 +633,8 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h { struct process* pcs = process_find_by_handle(hProcess); struct module* module; - DWORD sz; IMAGEHLP_MODULE64 mod; + char* ptr; TRACE("%p %s %p\n", hProcess, wine_dbgstr_longlong(dwAddr), ModuleInfo); @@ -626,6 +643,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); if (!module) return FALSE; + mod.SizeOfStruct = ModuleInfo->SizeOfStruct; mod.BaseOfImage = module->module.BaseOfImage; mod.ImageSize = module->module.ImageSize; mod.TimeDateStamp = module->module.TimeDateStamp; @@ -635,18 +653,21 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h strcpy(mod.ModuleName, module->module.ModuleName); strcpy(mod.ImageName, module->module.ImageName); strcpy(mod.LoadedImageName, module->module.LoadedImageName); - /* FIXME: all following attributes need to be set */ - mod.LoadedPdbName[0] = '\0'; - mod.CVSig = 0; + /* FIXME: for now, using some 'rather sane' value */ + sprintf(mod.LoadedPdbName, ".\%s.pdb", module->module.ModuleName); + mod.CVSig = 0x53445352; /* RSDS */ memset(mod.CVData, 0, sizeof(mod.CVData)); + strcpy(mod.CVData, module->module.LoadedImageName); + if ((ptr = strrchr(mod.CVData, '.'))) + strcpy(ptr + 1, "pdb"); mod.PdbSig = 0; memset(&mod.PdbSig70, 0, sizeof(mod.PdbSig70)); mod.PdbAge = 0; - mod.PdbUnmatched = 0; - mod.DbgUnmatched = 0; - mod.LineNumbers = 0; - mod.GlobalSymbols = 0; - mod.TypeInfo = 0; + mod.PdbUnmatched = FALSE; + mod.DbgUnmatched = FALSE; + mod.LineNumbers = TRUE; + mod.GlobalSymbols = TRUE; + mod.TypeInfo = TRUE; mod.SourceIndexed = 0; mod.Publics = 0; @@ -654,11 +675,12 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h { module = module_get_container(pcs, module); if (module && module->module.SymType != SymNone) + { mod.SymType = module->module.SymType; + mod.NumSyms = module->module.NumSyms; + } } - sz = ModuleInfo->SizeOfStruct; - memcpy(ModuleInfo, &mod, sz); - ModuleInfo->SizeOfStruct = sz; + memcpy(ModuleInfo, &mod, mod.SizeOfStruct); return TRUE; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index faeee98..7cf9c9e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -575,24 +575,20 @@ static BOOL symt_enum_module(struct modu */ static BOOL resort_symbols(struct module* module) { - int nsym = 0; + int nsym; void* ptr; struct symt_ht* sym; struct hash_table_iter hti; - hash_table_iter_init(&module->ht_symbols, &hti, NULL); - while ((ptr = hash_table_iter_up(&hti))) - nsym++; - - if (!(module->module.NumSyms = nsym)) return FALSE; + if (!module_compute_num_syms(module)) return FALSE; if (module->addr_sorttab) module->addr_sorttab = HeapReAlloc(GetProcessHeap(), 0, module->addr_sorttab, - nsym * sizeof(struct symt_ht*)); + module->module.NumSyms * sizeof(struct symt_ht*)); else module->addr_sorttab = HeapAlloc(GetProcessHeap(), 0, - nsym * sizeof(struct symt_ht*)); + module->module.NumSyms * sizeof(struct symt_ht*)); if (!module->addr_sorttab) return FALSE; nsym = 0;

1 0

Eric Pouech : dbghelp: Brought dbghelp.h a bit closer to PSDK definitions.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: bdf32ee0325e24d9921f65c9e32de75ee665a001 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bdf32ee0325e24d9921f65c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:37:48 2006 +0100 dbghelp: Brought dbghelp.h a bit closer to PSDK definitions. --- dlls/dbghelp/dbghelp.c | 4 + dlls/dbghelp/dbghelp_private.h | 2 - dlls/dbghelp/module.c | 8 +-- dlls/dbghelp/path.c | 16 +++-- dlls/dbghelp/pe_module.c | 2 - dlls/dbghelp/source.c | 2 - dlls/dbghelp/symbol.c | 4 + dlls/dbghelp/type.c | 2 - include/dbghelp.h | 117 +++++++++++++++++++++++++++++++++------- 9 files changed, 116 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bdf32ee0325e24d9921…

1 0

Eric Pouech : dbghelp: SymSetContext should return FALSE when setting twice the same
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: e5d09bf374bdfecee2f176bf53956c6f40222118 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5d09bf374bdfecee2f176b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:30:25 2006 +0100 dbghelp: SymSetContext should return FALSE when setting twice the same frame context. --- dlls/dbghelp/dbghelp.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 66d687d..289e113 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -338,6 +338,18 @@ BOOL WINAPI SymSetContext(HANDLE hProces struct process* pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; + if (pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && + pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && + pcs->ctx_frame.StackOffset == StackFrame->StackOffset) + { + TRACE("Setting same frame {rtn=%s frm=%s stk=%s}\n", + wine_dbgstr_longlong(pcs->ctx_frame.ReturnOffset), + wine_dbgstr_longlong(pcs->ctx_frame.FrameOffset), + wine_dbgstr_longlong(pcs->ctx_frame.StackOffset)); + SetLastError(ERROR_ACCESS_DENIED); /* latest MSDN says ERROR_SUCCESS */ + return FALSE; + } + pcs->ctx_frame = *StackFrame; /* MSDN states that Context is not (no longer?) used */ return TRUE;

1 0

Eric Pouech : dbghelp: Started implementation of the global callback mechanism.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 418591c8ea512b68bcb6d4fdcdea41216e5560c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=418591c8ea512b68bcb6d4f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:29:21 2006 +0100 dbghelp: Started implementation of the global callback mechanism. --- dlls/dbghelp/dbghelp.c | 79 ++++++++++++++++++++++++++++++++++++---- dlls/dbghelp/dbghelp_private.h | 8 +++- dlls/dbghelp/module.c | 29 +++++++++++++-- include/dbghelp.h | 12 ++++++ 4 files changed, 115 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 94bb0e1..e0b9048 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -61,7 +61,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); * getting several of those while looking for a unique symbol. Part of the * issue is that we don't give a scope to a static variable inside a function * + C++ management - * - implement the callback notification mechanism */ unsigned dbghelp_options = SYMOPT_UNDNAME; @@ -284,6 +283,12 @@ BOOL WINAPI SymCleanup(HANDLE hProcess) */ DWORD WINAPI SymSetOptions(DWORD opts) { + struct process* pcs; + + for (pcs = process_first; pcs; pcs = pcs->next) + { + pcs_callback(pcs, CBA_SET_OPTIONS, &opts); + } return dbghelp_options = opts; } @@ -322,6 +327,62 @@ BOOL WINAPI SymSetContext(HANDLE hProces return TRUE; } +/****************************************************************** + * reg_cb64to32 (internal) + * + * Registered callback for converting information from 64 bit to 32 bit + */ +static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, ULONG64 user) +{ + PSYMBOL_REGISTERED_CALLBACK cb32 = (PSYMBOL_REGISTERED_CALLBACK)(DWORD)(user >> 32); + DWORD user32 = (DWORD)user; + void* data32; + IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl64; + IMAGEHLP_DEFERRED_SYMBOL_LOAD idsl; + + switch (action) + { + case CBA_DEBUG_INFO: + case CBA_DEFERRED_SYMBOL_LOAD_CANCEL: + case CBA_SET_OPTIONS: + case CBA_SYMBOLS_UNLOADED: + data32 = (void*)(DWORD)data; + break; + case CBA_DEFERRED_SYMBOL_LOAD_COMPLETE: + case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: + case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL: + case CBA_DEFERRED_SYMBOL_LOAD_START: + idsl64 = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD)data; + if (!validate_addr64(idsl64->BaseOfImage)) + return FALSE; + idsl.SizeOfStruct = sizeof(idsl); + idsl.BaseOfImage = (DWORD)idsl64->BaseOfImage; + idsl.CheckSum = idsl64->CheckSum; + idsl.TimeDateStamp = idsl64->TimeDateStamp; + memcpy(idsl.FileName, idsl64->FileName, sizeof(idsl.FileName)); + idsl.Reparse = idsl64->Reparse; + data32 = &idsl; + break; + case CBA_DUPLICATE_SYMBOL: + case CBA_EVENT: + case CBA_READ_MEMORY: + default: + FIXME("No mapping for action %lu\n", action); + return FALSE; + } + return cb32(hProcess, action, (PVOID)data32, (PVOID)user32); +} + +/****************************************************************** + * pcs_callback (internal) + */ +BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) +{ + TRACE("%p %lu %p\n", pcs, action, data); + if (!pcs->reg_cb) return FALSE; + return pcs->reg_cb(pcs->handle, action, (ULONG64)(DWORD_PTR)data, pcs->reg_user); +} + /*********************************************************************** * SymRegisterCallback (DBGHELP.@) */ @@ -329,9 +390,8 @@ BOOL WINAPI SymRegisterCallback(HANDLE h PSYMBOL_REGISTERED_CALLBACK CallbackFunction, PVOID UserContext) { - FIXME("(%p, %p, %p): stub\n", hProcess, CallbackFunction, UserContext); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD64 tmp = ((ULONGLONG)(DWORD)CallbackFunction << 32) | (DWORD)UserContext; + return SymRegisterCallback64(hProcess, reg_cb64to32, tmp); } /*********************************************************************** @@ -341,10 +401,15 @@ BOOL WINAPI SymRegisterCallback64(HANDLE PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) { - FIXME("(%p, %p, %s): stub\n", + struct process* pcs = process_find_by_handle(hProcess); + + TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if (!pcs) return FALSE; + pcs->reg_cb = CallbackFunction; + pcs->reg_user = UserContext; + + return TRUE; } /* This is imagehlp version not dbghelp !! */ diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 8d8cb70..c3e3676 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -291,6 +291,9 @@ struct process struct process* next; HANDLE handle; char* search_path; + + PSYMBOL_REGISTERED_CALLBACK64 reg_cb; + DWORD64 reg_user; struct module* lmodules; unsigned long dbg_hdr_addr; @@ -314,8 +317,9 @@ struct line_info /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess); extern HANDLE hMsvcrt; -extern BOOL validate_addr64(DWORD64 addr); - +extern BOOL validate_addr64(DWORD64 addr); +extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data); + /* elf_module.c */ typedef BOOL (*elf_enum_modules_cb)(const char*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3c0c5d4..afd33fd 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -232,7 +232,8 @@ struct module* module_get_containee(cons */ struct module* module_get_debug(const struct process* pcs, struct module* module) { - struct module* parent; + struct module* parent; + IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl64; if (!module) return NULL; /* for a PE builtin, always get info from parent */ @@ -245,10 +246,28 @@ struct module* module_get_debug(const st switch (module->type) { - case DMT_ELF: ret = elf_load_debug_info(module, NULL); break; - case DMT_PE: ret = pe_load_debug_info(pcs, module); break; + case DMT_ELF: + ret = elf_load_debug_info(module, NULL); + break; + case DMT_PE: + idsl64.SizeOfStruct = sizeof(idsl64); + idsl64.BaseOfImage = module->module.BaseOfImage; + idsl64.CheckSum = module->module.CheckSum; + idsl64.TimeDateStamp = module->module.TimeDateStamp; + strcpy(idsl64.FileName, module->module.ImageName); + idsl64.Reparse = FALSE; + idsl64.hFile = INVALID_HANDLE_VALUE; + + pcs_callback(pcs, CBA_DEFERRED_SYMBOL_LOAD_START, &idsl64); + ret = pe_load_debug_info(pcs, module); + pcs_callback(pcs, + ret ? CBA_DEFERRED_SYMBOL_LOAD_COMPLETE : CBA_DEFERRED_SYMBOL_LOAD_FAILURE, + &idsl64); + break; case DMT_VIRTUAL: /* fall through */ - default: ret = FALSE; break; + default: + ret = FALSE; + break; } if (!ret) module->module.SymType = SymNone; assert(module->module.SymType != SymDeferred); @@ -451,6 +470,8 @@ BOOL module_remove(struct process* pcs, HeapFree(GetProcessHeap(), 0, (char*)module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool); + if (module->module.SymType != SymNone) + pcs_callback(pcs, CBA_SYMBOLS_UNLOADED, NULL); for (p = &pcs->lmodules; *p; p = &(*p)->next) { diff --git a/include/dbghelp.h b/include/dbghelp.h index 9ef700c..e53b324 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -221,6 +221,7 @@ typedef struct _SOURCEFILE #define CBA_DEFERRED_SYMBOL_LOAD_CANCEL 0x00000007 #define CBA_SET_OPTIONS 0x00000008 #define CBA_EVENT 0x00000010 +#define CBA_DEFERRED_SYMBOL_LOAD_PARTIAL 0x00000020 #define CBA_DEBUG_INFO 0x10000000 typedef struct _IMAGEHLP_CBA_READ_MEMORY @@ -258,6 +259,17 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL BOOLEAN Reparse; } IMAGEHLP_DEFERRED_SYMBOL_LOAD, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD; +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD64 +{ + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD CheckSum; + DWORD TimeDateStamp; + CHAR FileName[MAX_PATH]; + BOOLEAN Reparse; + HANDLE hFile; +} IMAGEHLP_DEFERRED_SYMBOL_LOAD64, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; + typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { DWORD SizeOfStruct;

1 0

Eric Pouech : dbghelp: Live targets.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: eca3715f88b4ffd33b4384c3ba41c74d2f861b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eca3715f88b4ffd33b4384c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:30:03 2006 +0100 dbghelp: Live targets. In SymInitialize, now trying to check if the hProcess is a real live target or not. If we think it is, try to grasp ELF information from it. --- dlls/dbghelp/dbghelp.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index e0b9048..66d687d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -164,6 +164,17 @@ static BOOL WINAPI process_invade_cb(cha } /****************************************************************** + * check_live_target + * + */ +static BOOL check_live_target(struct process* pcs) +{ + if (!GetProcessId(pcs->handle)) return FALSE; + if (!elf_read_wine_loader_dbg_info(pcs)) return FALSE; + return getenv("DBGHELP_NOLIVE") == NULL; +} + +/****************************************************************** * SymInitialize (DBGHELP.@) * * The initialisation of a dbghelp's context. @@ -178,11 +189,14 @@ static BOOL WINAPI process_invade_cb(cha * our internal ELF modules representation (loading / unloading). This way, * we'll pair every loaded builtin PE module with its ELF counterpart (and * access its debug information). - * - if fInvadeProcess (in SymInitialize) is FALSE, we won't be able to - * make the peering between a builtin PE module and its ELF counterpart, hence - * we won't be able to provide the requested debug information. We'll - * however be able to load native PE modules (and their debug information) - * without any trouble. + * - if fInvadeProcess (in SymInitialize) is FALSE, we check anyway if the + * hProcess refers to a running process. We use some heuristics here, so YMMV. + * If we detect a live target, then we get the same handling as if + * fInvadeProcess is TRUE (except that the modules are not loaded). Otherwise, + * we won't be able to make the peering between a builtin PE module and its ELF + * counterpart. Hence we won't be able to provide the requested debug + * information. We'll however be able to load native PE modules (and their + * debug information) without any trouble. * Note also that this scheme can be intertwined with the deferred loading * mechanism (ie only load the debug information when we actually need it). */ @@ -237,17 +251,19 @@ BOOL WINAPI SymInitialize(HANDLE hProces pcs->dbg_hdr_addr = 0; pcs->next = process_first; process_first = pcs; - - if (fInvadeProcess) + + if (check_live_target(pcs)) { - if (!elf_read_wine_loader_dbg_info(pcs)) - { - SymCleanup(hProcess); - return FALSE; - } - EnumerateLoadedModules(hProcess, process_invade_cb, (void*)hProcess); + if (fInvadeProcess) + EnumerateLoadedModules(hProcess, process_invade_cb, (void*)hProcess); elf_synchronize_module_list(pcs); } + else if (fInvadeProcess) + { + SymCleanup(hProcess); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return TRUE; }

1 0

Eric Pouech : winedbg: Added a more decent scheme for handling segmented addresses.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 9d0b5f53727c783a59f31f11874584d4707f39b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d0b5f53727c783a59f31f1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:26:40 2006 +0100 winedbg: Added a more decent scheme for handling segmented addresses. --- programs/winedbg/break.c | 6 ++--- programs/winedbg/debugger.h | 2 ++ programs/winedbg/expr.c | 7 ++--- programs/winedbg/memory.c | 34 +++++++------------------- programs/winedbg/stack.c | 2 +- programs/winedbg/types.c | 57 ++++++++++++++++++++++++++++++++----------- programs/winedbg/winedbg.c | 2 -- 7 files changed, 60 insertions(+), 50 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 8f502b5..086d1e5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -195,8 +195,7 @@ BOOL break_add_break_from_lvalue(const s { ADDRESS addr; - addr.Mode = AddrModeFlat; - addr.Offset = types_extract_as_integer(lvalue); + types_extract_as_address(lvalue, &addr); if (!break_add_break(&addr, TRUE)) { @@ -400,8 +399,7 @@ void break_add_watch_from_lvalue(const s { struct dbg_lvalue lval; - lval.addr.Mode = AddrModeFlat; - lval.addr.Offset = types_extract_as_integer(lvalue); + types_extract_as_address(lvalue, &lval.addr); lval.type.id = dbg_itype_none; break_add_watch(&lval, TRUE); diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d26bbc0..111a58a 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -81,6 +81,7 @@ enum dbg_internal_types dbg_itype_long_real, /* aka long double */ dbg_itype_astring, dbg_itype_ustring, + dbg_itype_segptr, /* hack for segmented pointers */ dbg_itype_none = 0xffffffff }; @@ -369,6 +370,7 @@ extern void print_value(cons extern int types_print_type(const struct dbg_type*, BOOL details); extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); +extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS*); extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); extern BOOL types_array_index(const struct dbg_lvalue* value, int index, struct dbg_lvalue* result); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 5815298..89d23df 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -545,11 +545,10 @@ struct dbg_lvalue expr_eval(struct expr* types_extract_as_integer(&exp2) * (DWORD)scale2) / (DWORD)scale3; break; case EXP_OP_SEG: - rtn.type.id = dbg_itype_none; + rtn.type.id = dbg_itype_segptr; rtn.type.module = 0; - rtn.addr.Mode = AddrMode1632; - rtn.addr.Segment = types_extract_as_integer(&exp1); - rtn.addr.Offset = types_extract_as_integer(&exp2); + be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, &rtn.addr, + types_extract_as_integer(&exp1), types_extract_as_integer(&exp2)); break; case EXP_OP_LOR: exp->un.binop.result = (types_extract_as_integer(&exp1) || types_extract_as_integer(&exp2)); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3bda720..8e8b984 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -151,17 +151,8 @@ void memory_examine(const struct dbg_lva ADDRESS addr; void *linear; - if (lvalue->type.id == dbg_itype_none) - { - be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, - &addr, lvalue->addr.Segment, lvalue->addr.Offset); - } - else - { - addr.Mode = AddrModeFlat; - addr.Offset = types_extract_as_integer( lvalue ); - } - linear = memory_to_linear_addr( &addr ); + types_extract_as_address(lvalue, &addr); + linear = memory_to_linear_addr(&addr); if (format != 'i' && count > 1) { @@ -449,7 +440,8 @@ void print_basic(const struct dbg_lvalue switch (format) { case 'x': - if (lvalue->addr.Mode != AddrModeFlat) + if (lvalue->addr.Mode == AddrMode1616 || + lvalue->addr.Mode == AddrModeReal) dbg_printf("0x%04lx", res); else dbg_printf("0x%08lx", res); @@ -478,7 +470,10 @@ void print_basic(const struct dbg_lvalue case 'b': dbg_printf("Format specifier '%c' is meaningless in 'print' command\n", format); case 0: - print_typed_basic(lvalue); + if (lvalue->type.id == dbg_itype_segptr) + dbg_printf("%ld", res); + else + print_typed_basic(lvalue); break; } } @@ -567,18 +562,7 @@ void memory_disassemble(const struct dbg else { if (xstart) - { - if (xstart->type.id == dbg_itype_none) - { - be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, - &last, xstart->addr.Segment, xstart->addr.Offset); - } - else - { - last.Mode = AddrModeFlat; - last.Offset = types_extract_as_integer( xstart ); - } - } + types_extract_as_address(xstart, &last); if (xend) stop = types_extract_as_integer(xend); } diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index b33cf60..abb943a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -177,7 +177,7 @@ static BOOL WINAPI sym_enum_cb(SYMBOL_IN DWORD addr; unsigned val; - if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) == (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) + if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_REGREL)) == (SYMFLAG_PARAMETER|SYMFLAG_REGREL)) { if (se->tmp[0]) strcat(se->tmp, ", "); addr = se->frame + sym_info->Address; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index e9b9358..bb05422 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -38,41 +38,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); long int types_extract_as_integer(const struct dbg_lvalue* lvalue) { long int rtn = 0; - DWORD tag, size, bt; - DWORD64 size64; + long long int val; + DWORD tag, bt; + DWORD64 size; if (lvalue->type.id == dbg_itype_none || !types_get_info(&lvalue->type, TI_GET_SYMTAG, &tag)) return 0; + if (lvalue->type.id == dbg_itype_segptr) + { + return (long int)memory_to_linear_addr(&lvalue->addr); + } + switch (tag) { case SymTagBaseType: - if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size64) || + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size) || !types_get_info(&lvalue->type, TI_GET_BASETYPE, &bt)) { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); } - if (size64 > sizeof(rtn)) + if (size > sizeof(rtn)) { - WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size64)); + WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); return 0; } - size = (DWORD)size64; - /* FIXME: we have an ugly & non portable thing here !!! */ - if (!memory_read_value(lvalue, size, &rtn)) return 0; - - /* now let's do some promotions !! */ switch (bt) { + case btChar: case btInt: - /* propagate sign information */ - if (((size & 3) != 0) && (rtn >> (size * 8 - 1)) != 0) - rtn |= (-1) << (size * 8); + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, TRUE, &val)) return 0; + rtn = (long)val; break; case btUInt: - case btChar: + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, FALSE, &val)) return 0; + rtn = (DWORD)(DWORD64)val; break; case btFloat: RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); @@ -100,6 +102,24 @@ long int types_extract_as_integer(const } /****************************************************************** + * types_extract_as_address + * + * + */ +void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS* addr) +{ + if (lvalue->type.id == dbg_itype_segptr && lvalue->type.module == 0) + { + *addr = lvalue->addr; + } + else + { + addr->Mode = AddrModeFlat; + addr->Offset = types_extract_as_integer( lvalue ); + } +} + +/****************************************************************** * types_deref * */ @@ -773,6 +793,15 @@ BOOL types_get_info(const struct dbg_typ default: WINE_FIXME("unsupported %u for a string\n", ti); return FALSE; } break; + case dbg_itype_segptr: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_BASETYPE: X(DWORD) = btInt; break; + default: WINE_FIXME("unsupported %u for seg-ptr\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e891514..87f9a02 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -58,8 +58,6 @@ * o bitfield size is on a 4-bytes * + array_index and deref should be the same function (or should share the same * core) - * + segmented pointers are not correctly handled (and are hacked throughout the - * code by testing against itype_none) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee

1 0