December 2009 - Wine-commits

Eric Pouech : winedbg: Added a couple of tweaks to properly support 32bit vs 64bit wide addresses .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: ab2e0bdef6a6bd4718f4198ce21d33e176e6def9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2e0bdef6a6bd4718f4198ce… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:29 2009 +0100 winedbg: Added a couple of tweaks to properly support 32bit vs 64bit wide addresses. --- programs/winedbg/debugger.h | 3 +++ programs/winedbg/gdbproxy.c | 5 +++-- programs/winedbg/info.c | 22 ++++++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 30846eb..c02b71e 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -38,6 +38,9 @@ #include "objbase.h" #include "oaidl.h" +#define ADDRSIZE ((unsigned)sizeof(void*)) +#define ADDRWIDTH (ADDRSIZE * 2) + /* the debugger uses these exceptions for it's internal use */ #define DEBUG_STATUS_OFFSET 0x80003000 #define DEBUG_STATUS_INTERNAL_ERROR (DEBUG_STATUS_OFFSET+0) /* something went wrong */ diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 65b1cc3..ceae777 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1510,10 +1510,11 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn packet_reply_open(gdbctx); packet_reply_catc(gdbctx, 'O'); snprintf(buffer, sizeof(buffer), - "%*s%04lx%*s%-17.17s %08x %08lx %.14s\n", + "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); + ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 1b7eeb3..2afdf75 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -152,9 +152,9 @@ struct info_module static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded) { - dbg_printf("%8s-%8s\t%-16s%s\n", - wine_dbgstr_longlong(mi->BaseOfImage), - wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), + dbg_printf("%*.*s-%*.*s\t%-16s%s\n", + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage), + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName); } @@ -221,7 +221,8 @@ void info_win32_module(DWORD64 base) qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); - dbg_printf("Module\tAddress\t\t\tDebug info\tName (%d modules)\n", im.num_used); + dbg_printf("Module\tAddress\t\t\t%sDebug info\tName (%d modules)\n", + ADDRWIDTH == 16 ? "\t\t" : "", im.num_used); for (i = 0; i < im.num_used; i++) { @@ -370,10 +371,10 @@ static void info_window(HWND hWnd, int indent) if (!GetWindowTextA(hWnd, wndName, sizeof(wndName))) strcpy(wndName, "-- Empty --"); - dbg_printf("%*s%08lx%*s %-17.17s %08x %08lx %08x %.14s\n", + dbg_printf("%*s%08lx%*s %-17.17s %08x %0*lx %08x %.14s\n", indent, "", (DWORD_PTR)hWnd, 12 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), GetWindowThreadProcessId(hWnd, NULL), wndName); if ((child = GetWindow(hWnd, GW_CHILD)) != 0) @@ -393,8 +394,9 @@ void info_win32_window(HWND hWnd, BOOL detailed) if (!detailed) { - dbg_printf("%-20.20s %-17.17s %-8.8s %-8.8s %-8.8s %s\n", - "Window handle", "Class Name", "Style", "WndProc", "Thread", "Text"); + dbg_printf("%-20.20s %-17.17s %-8.8s %-*.*s %-8.8s %s\n", + "Window handle", "Class Name", "Style", + ADDRWIDTH, ADDRWIDTH, "WndProc", "Thread", "Text"); info_window(hWnd, 0); return; } @@ -412,7 +414,7 @@ void info_win32_window(HWND hWnd, BOOL detailed) /* FIXME missing fields: hmemTaskQ, hrgnUpdate, dce, flags, pProp, scroll */ dbg_printf("next=%p child=%p parent=%p owner=%p class='%s'\n" "inst=%p active=%p idmenu=%08lx\n" - "style=0x%08x exstyle=0x%08x wndproc=0x%08lx text='%s'\n" + "style=0x%08x exstyle=0x%08x wndproc=%p text='%s'\n" "client=%d,%d-%d,%d window=%d,%d-%d,%d sysmenu=%p\n", GetWindow(hWnd, GW_HWNDNEXT), GetWindow(hWnd, GW_CHILD), @@ -424,7 +426,7 @@ void info_win32_window(HWND hWnd, BOOL detailed) (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_ID), GetWindowLongW(hWnd, GWL_STYLE), GetWindowLongW(hWnd, GWL_EXSTYLE), - (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + (void*)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName, clientRect.left, clientRect.top, clientRect.right, clientRect.bottom, windowRect.left, windowRect.top, windowRect.right, windowRect.bottom,

1 0

Eric Pouech : dbghelp: Make the module enumeration process compatible with 64bit platforms.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c300f215b11bbbda79b1d94b3bf9077938fd76fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c300f215b11bbbda79b1d94b3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:22 2009 +0100 dbghelp: Make the module enumeration process compatible with 64bit platforms. --- dlls/dbghelp/dbghelp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b501425..b540516 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -211,16 +211,16 @@ BOOL WINAPI SymGetSearchPath(HANDLE hProcess, PSTR szSearchPath, * SymInitialize helper: loads in dbghelp all known (and loaded modules) * this assumes that hProcess is a handle on a valid process */ -static BOOL WINAPI process_invade_cb(PCSTR name, ULONG base, ULONG size, PVOID user) +static BOOL WINAPI process_invade_cb(PCWSTR name, ULONG64 base, ULONG size, PVOID user) { - char tmp[MAX_PATH]; + WCHAR tmp[MAX_PATH]; HANDLE hProcess = user; - if (!GetModuleFileNameExA(hProcess, (HMODULE)base, - tmp, sizeof(tmp))) - lstrcpynA(tmp, name, sizeof(tmp)); + if (!GetModuleFileNameExW(hProcess, (HMODULE)(DWORD_PTR)base, + tmp, sizeof(tmp) / sizeof(WCHAR))) + lstrcpynW(tmp, name, sizeof(tmp) / sizeof(WCHAR)); - SymLoadModule(hProcess, 0, tmp, name, base, size); + SymLoadModuleExW(hProcess, 0, tmp, name, base, size, NULL, 0); return TRUE; } @@ -326,7 +326,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP if (check_live_target(pcs)) { if (fInvadeProcess) - EnumerateLoadedModules(hProcess, process_invade_cb, hProcess); + EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); elf_synchronize_module_list(pcs); macho_synchronize_module_list(pcs); }

1 0

Eric Pouech : dbghelp: Fix a couple of casts on 64bit platforms.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b037912c9dc5b31d16e0833f2470f428b583c98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b037912c9dc5b31d16e0833f2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:28 2009 +0100 dbghelp: Fix a couple of casts on 64bit platforms. --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 8 ++++---- dlls/dbghelp/minidump.c | 10 +++++----- dlls/dbghelp/pe_module.c | 6 +++--- dlls/dbghelp/stack.c | 4 ++-- dlls/dbghelp/symbol.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b540516..e5cfc73 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -479,7 +479,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U 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; + idsl64 = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD_PTR)data; if (!validate_addr64(idsl64->BaseOfImage)) return FALSE; idsl.SizeOfStruct = sizeof(idsl); diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index cae3c95..4926114 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -498,7 +498,7 @@ extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_ BOOL* is_unmatched); /* pe_module.c */ -extern BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth); +extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth); extern struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, HANDLE hFile, DWORD base, DWORD size); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6006202..bb7257e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -654,7 +654,7 @@ static enum location_error compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, HANDLE hproc, const struct location* frame) { - unsigned long stack[64]; + DWORD_PTR stack[64]; unsigned stk; unsigned char op; BOOL piece_found = FALSE; @@ -767,12 +767,12 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } if (hproc) { - DWORD addr = stack[stk--]; - DWORD deref; + DWORD_PTR addr = stack[stk--]; + DWORD_PTR deref; if (!ReadProcessMemory(hproc, (void*)addr, &deref, sizeof(deref), NULL)) { - WARN("Couldn't read memory at %x\n", addr); + WARN("Couldn't read memory at %lx\n", addr); return loc_err_cant_read; } stack[++stk] = deref; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1f165a8..b026d32 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct dump_memory { - ULONG base; + ULONG64 base; ULONG size; ULONG rva; }; @@ -42,7 +42,7 @@ struct dump_memory struct dump_module { unsigned is_elf; - ULONG base; + ULONG64 base; ULONG size; DWORD timestamp; DWORD checksum; @@ -251,7 +251,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, * Add a module to a dump context */ static BOOL add_module(struct dump_context* dc, const WCHAR* name, - DWORD base, DWORD size, DWORD timestamp, DWORD checksum, + DWORD64 base, DWORD size, DWORD timestamp, DWORD checksum, BOOL is_elf) { if (!dc->modules) @@ -272,7 +272,7 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, return FALSE; } if (is_elf || - !GetModuleFileNameExW(dc->hProcess, (HMODULE)base, + !GetModuleFileNameExW(dc->hProcess, (HMODULE)(DWORD_PTR)base, dc->modules[dc->num_modules].name, sizeof(dc->modules[dc->num_modules].name) / sizeof(WCHAR))) lstrcpynW(dc->modules[dc->num_modules].name, name, @@ -834,7 +834,7 @@ static unsigned dump_memory_info(struct dump_context* dc) { len = min(dc->mem[i].size - pos, sizeof(tmp)); if (ReadProcessMemory(dc->hProcess, - (void*)(dc->mem[i].base + pos), + (void*)(DWORD_PTR)(dc->mem[i].base + pos), tmp, len, NULL)) WriteFile(dc->hFile, tmp, len, &written, NULL); } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3b9cceb..664affc 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -432,13 +432,13 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, * pe_load_nt_header * */ -BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth) +BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) { IMAGE_DOS_HEADER dos; - return ReadProcessMemory(hProc, (char*)base, &dos, sizeof(dos), NULL) && + return ReadProcessMemory(hProc, (char*)(DWORD_PTR)base, &dos, sizeof(dos), NULL) && dos.e_magic == IMAGE_DOS_SIGNATURE && - ReadProcessMemory(hProc, (char*)(base + dos.e_lfanew), + ReadProcessMemory(hProc, (char*)(DWORD_PTR)(base + dos.e_lfanew), nth, sizeof(*nth), NULL) && nth->Signature == IMAGE_NT_SIGNATURE; } diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 959ab64..0d2585e 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -261,7 +261,7 @@ static BOOL stack_walk(struct stack_walk_callback* cb, LPSTACKFRAME frame) WARN("Bad stack frame 0x%08x\n", p); goto done_err; } - curr_switch = (DWORD)frame16.frame32; + curr_switch = (DWORD_PTR)frame16.frame32; if (!sw_read_mem(cb, curr_switch, &ch, sizeof(ch))) curr_switch = 0xFFFFFFFF; @@ -327,7 +327,7 @@ static BOOL stack_walk(struct stack_walk_callback* cb, LPSTACKFRAME frame) WARN("Bad stack frame 0x%08x\n", p); goto done_err; } - curr_switch = (DWORD)frame16.frame32; + curr_switch = (DWORD_PTR)frame16.frame32; curr_mode = stm_32bit; if (!sw_read_mem(cb, curr_switch, &ch, sizeof(ch))) curr_switch = 0; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c266ce2..9f836fa 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -702,7 +702,7 @@ static void symt_fill_sym_info(const struct module_pair* pair, case VT_UI4: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.ulVal; break; case VT_UI2: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.uiVal; break; case VT_UI1: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.bVal; break; - case VT_I1 | VT_BYREF: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.byref; break; + case VT_I1 | VT_BYREF: sym_info->Value = (ULONG64)(DWORD_PTR)data->u.value.n1.n2.n3.byref; break; case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", data->u.value.n1.n2.vt);

1 0

Eric Pouech : dbghelp: Rewrote the SymRegisterCallback function so that they work on a 64bit platform .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 114bb38cd89a24748be9113c7dc160d1717b1d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=114bb38cd89a24748be9113c7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:34 2009 +0100 dbghelp: Rewrote the SymRegisterCallback function so that they work on a 64bit platform. --- dlls/dbghelp/dbghelp.c | 18 +++++++++--------- dlls/dbghelp/dbghelp_private.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index e5cfc73..3f85f0d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -461,8 +461,7 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, */ 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; + struct process* pcs = process_find_by_handle(hProcess); void* data32; IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl64; IMAGEHLP_DEFERRED_SYMBOL_LOAD idsl; @@ -473,7 +472,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U case CBA_DEFERRED_SYMBOL_LOAD_CANCEL: case CBA_SET_OPTIONS: case CBA_SYMBOLS_UNLOADED: - data32 = (void*)(DWORD)data; + data32 = (void*)(DWORD_PTR)data; break; case CBA_DEFERRED_SYMBOL_LOAD_COMPLETE: case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: @@ -497,7 +496,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U FIXME("No mapping for action %u\n", action); return FALSE; } - return cb32(hProcess, action, data32, (PVOID)user32); + return pcs->reg_cb32(hProcess, action, data32, (PVOID)(DWORD_PTR)user); } /****************************************************************** @@ -550,14 +549,16 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) * * Helper for registering a callback. */ -static BOOL sym_register_cb(HANDLE hProcess, +static BOOL sym_register_cb(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK64 cb, + PSYMBOL_REGISTERED_CALLBACK cb32, DWORD64 user, BOOL unicode) { struct process* pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; pcs->reg_cb = cb; + pcs->reg_cb32 = cb32; pcs->reg_is_unicode = unicode; pcs->reg_user = user; @@ -571,10 +572,9 @@ BOOL WINAPI SymRegisterCallback(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction, PVOID UserContext) { - DWORD64 tmp = ((ULONGLONG)(DWORD)CallbackFunction << 32) | (DWORD)UserContext; TRACE("(%p, %p, %p)\n", hProcess, CallbackFunction, UserContext); - return sym_register_cb(hProcess, reg_cb64to32, tmp, FALSE); + return sym_register_cb(hProcess, reg_cb64to32, CallbackFunction, (DWORD_PTR)UserContext, FALSE); } /*********************************************************************** @@ -586,7 +586,7 @@ BOOL WINAPI SymRegisterCallback64(HANDLE hProcess, { TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); - return sym_register_cb(hProcess, CallbackFunction, UserContext, FALSE); + return sym_register_cb(hProcess, CallbackFunction, NULL, UserContext, FALSE); } /*********************************************************************** @@ -598,7 +598,7 @@ BOOL WINAPI SymRegisterCallbackW64(HANDLE hProcess, { TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); - return sym_register_cb(hProcess, CallbackFunction, UserContext, TRUE); + return sym_register_cb(hProcess, CallbackFunction, NULL, UserContext, TRUE); } /* This is imagehlp version not dbghelp !! */ diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 4926114..bbf2ef0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -361,8 +361,9 @@ struct process struct process* next; HANDLE handle; WCHAR* search_path; - + PSYMBOL_REGISTERED_CALLBACK64 reg_cb; + PSYMBOL_REGISTERED_CALLBACK reg_cb32; BOOL reg_is_unicode; DWORD64 reg_user;

1 0

Eric Pouech : dbghelp: Add ELF support but for the current 32 vs 64 bit architecture.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 02a70615f9661470461de135aeeb74e3cdb43cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a70615f9661470461de135a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:43 2009 +0100 dbghelp: Add ELF support but for the current 32 vs 64 bit architecture. --- dlls/dbghelp/elf_module.c | 47 +++++++++++++++++++++++++++++++------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 34d4560..c86dead 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -77,7 +77,7 @@ struct elf_module_info { - unsigned long elf_addr; + DWORD_PTR elf_addr; unsigned short elf_mark : 1, elf_loader : 1; }; @@ -93,22 +93,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info { unsigned flags; /* IN one (or several) of the ELF_INFO constants */ - unsigned long dbg_hdr_addr; /* OUT address of debug header (if ELF_INFO_DEBUG_HEADER is set) */ + DWORD_PTR dbg_hdr_addr; /* OUT address of debug header (if ELF_INFO_DEBUG_HEADER is set) */ struct module* module; /* OUT loaded module (if ELF_INFO_MODULE is set) */ const WCHAR* module_name; /* OUT found module name (if ELF_INFO_NAME is set) */ }; +#ifdef _WIN64 +#define Elf_Ehdr Elf64_Ehdr +#define Elf_Shdr Elf64_Shdr +#define Elf_Phdr Elf64_Phdr +#define Elf_Dyn Elf64_Dyn +#define Elf_Sym Elf64_Sym +#else +#define Elf_Ehdr Elf32_Ehdr +#define Elf_Shdr Elf32_Shdr +#define Elf_Phdr Elf32_Phdr +#define Elf_Dyn Elf32_Dyn +#define Elf_Sym Elf32_Sym +#endif + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ struct elf_file_map { - Elf32_Ehdr elfhdr; + Elf_Ehdr elfhdr; size_t elf_size; size_t elf_start; struct { - Elf32_Shdr shdr; + Elf_Shdr shdr; const char* mapped; }* sect; int fd; @@ -125,7 +139,7 @@ struct elf_section_map struct symtab_elt { struct hash_table_elt ht_elt; - const Elf32_Sym* symp; + const Elf_Sym* symp; struct symt_compiland* compiland; unsigned used; }; @@ -254,7 +268,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; int i; - Elf32_Phdr phdr; + Elf_Phdr phdr; unsigned tmp, page_mask = getpagesize() - 1; char* filename; unsigned len; @@ -279,7 +293,12 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) /* and check for an ELF header */ if (memcmp(fmap->elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; - + /* and check 32 vs 64 size according to current machine */ +#ifdef _WIN64 + if (fmap->elfhdr.e_ident[EI_CLASS] != ELFCLASS64) goto done; +#else + if (fmap->elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done; +#endif fmap->sect = HeapAlloc(GetProcessHeap(), 0, fmap->elfhdr.e_shnum * sizeof(fmap->sect[0])); if (!fmap->sect) goto done; @@ -372,13 +391,13 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, const char* symname; struct symt_compiland* compiland = NULL; const char* ptr; - const Elf32_Sym* symp; + const Elf_Sym* symp; struct symtab_elt* ste; struct elf_section_map esm, esm_str; if (!elf_find_section(fmap, ".symtab", SHT_SYMTAB, &esm) && !elf_find_section(fmap, ".dynsym", SHT_DYNSYM, &esm)) return; - if ((symp = (const Elf32_Sym*)elf_map_section(&esm)) == ELF_NO_MAP) return; + if ((symp = (const Elf_Sym*)elf_map_section(&esm)) == ELF_NO_MAP) return; esm_str.fmap = fmap; esm_str.sidx = fmap->sect[esm.sidx].shdr.sh_link; if ((strp = elf_map_section(&esm_str)) == ELF_NO_MAP) return; @@ -471,7 +490,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, * * lookup a symbol by name in our internal hash table for the symtab */ -static const Elf32_Sym* elf_lookup_symtab(const struct module* module, +static const Elf_Sym* elf_lookup_symtab(const struct module* module, const struct hash_table* ht_symtab, const char* name, const struct symt* compiland) { @@ -547,7 +566,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table struct hash_table_iter hti; void* ptr; struct symt_ht* sym; - const Elf32_Sym* symp; + const Elf_Sym* symp; hash_table_iter_init(&module->ht_symbols, &hti, NULL); while ((ptr = hash_table_iter_up(&hti))) @@ -629,7 +648,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h int j; struct hash_table_iter hti; struct symtab_elt* ste; - DWORD addr; + DWORD_PTR addr; struct symt_ht* symt; hash_table_iter_init(ht_symtab, &hti, NULL); @@ -698,7 +717,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h */ if ((xsize || ste->symp->st_size) && (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<%08lx-%08x> %s<%s-%s>\n", debugstr_w(module->module.ModuleName), ste->ht_elt.name, addr, (unsigned int)ste->symp->st_size, symt->hash_elt.name, @@ -1085,7 +1104,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &esm)) { - Elf32_Dyn dyn; + Elf_Dyn dyn; char* ptr = (char*)fmap.sect[esm.sidx].shdr.sh_addr; unsigned long len;

1 0

James Hawkins : msi: Free the Streams and Storages view object in their respective delete methods .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: ee2cf9a59770dd3d284a4d90a6a0a17f950b4ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2cf9a59770dd3d284a4d90a… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:36:27 2009 -0800 msi: Free the Streams and Storages view object in their respective delete methods. --- dlls/msi/storages.c | 1 + dlls/msi/streams.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index f2fb317..a54d46f 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -443,6 +443,7 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) msi_free(sv->storages); sv->storages = NULL; + msi_free(sv); return ERROR_SUCCESS; } diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 61cebff..6b281f4 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -407,6 +407,7 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) } msi_free(sv->streams); + msi_free(sv); return ERROR_SUCCESS; }

1 0

James Hawkins : msi: Free each table object when deleting the join view.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 7abb42a99499b8a9dd11b30f42fe7f945e20c4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abb42a99499b8a9dd11b30f4… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:36:31 2009 -0800 msi: Free each table object when deleting the join view. --- dlls/msi/join.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 1aeb17c..ef5cede 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -229,14 +229,18 @@ static UINT JOIN_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT JOIN_delete( struct tagMSIVIEW *view ) { MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; + struct list *item, *cursor; TRACE("%p\n", jv ); - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) + LIST_FOR_EACH_SAFE(item, cursor, &jv->tables) { + JOINTABLE* table = LIST_ENTRY(item, JOINTABLE, entry); + + list_remove(&table->entry); table->view->ops->delete(table->view); table->view = NULL; + msi_free(table); } msi_free(jv);

1 0

James Hawkins : msi: Free the enumeration data returned by IEnumSTATSTG_Next.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 8fe8a100c8d488be589e0f075603f77b006a6e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe8a100c8d488be589e0f075… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:36:35 2009 -0800 msi: Free the enumeration data returned by IEnumSTATSTG_Next. --- dlls/msi/tests/db.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index bafa0db..e44970d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5540,6 +5540,8 @@ static void enum_stream_names(IStorage *stg) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); + CoTaskMemFree(stat.pwcsName); + sz = MAX_PATH; memset(data, 'a', MAX_PATH); hr = IStream_Read(stm, data, sz, &count);

1 0

James Hawkins : msi: Make sure we don' t access pcchValueBuf when szBuffer is NULL, as pcchValueBuf is not required to be initialized in this case.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: f4829063bcd69abfe2825bf7041797df79db80f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4829063bcd69abfe2825bf70… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:35:27 2009 -0800 msi: Make sure we don't access pcchValueBuf when szBuffer is NULL, as pcchValueBuf is not required to be initialized in this case. --- dlls/msi/msi.c | 30 +++++++++++++++++------------- dlls/msi/tests/msi.c | 4 ++-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2515714..4d9da4c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -901,7 +901,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, WCHAR packagecode[GUID_SIZE]; BOOL badconfig = FALSE; LONG res; - DWORD save, type = REG_NONE; + DWORD type = REG_NONE; static WCHAR empty[] = {0}; static const WCHAR sourcelist[] = { @@ -1036,22 +1036,26 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, if (pcchValueBuf) { - save = *pcchValueBuf; - - if (strlenW(val) < *pcchValueBuf) - r = msi_strcpy_to_awstring(val, szValue, pcchValueBuf); - else if (szValue->str.a || szValue->str.w) - r = ERROR_MORE_DATA; + /* If szBuffer (szValue->str) is NULL, there's no need to copy the value + * out. Also, *pcchValueBuf may be uninitialized in this case, so we + * can't rely on its value. + */ + if (szValue->str.a || szValue->str.w) + { + DWORD size = *pcchValueBuf; + if (strlenW(val) < size) + r = msi_strcpy_to_awstring(val, szValue, &size); + else + { + r = ERROR_MORE_DATA; + } + } if (!badconfig) *pcchValueBuf = lstrlenW(val); - else if (r == ERROR_SUCCESS) - { - *pcchValueBuf = save; - r = ERROR_BAD_CONFIGURATION; - } } - else if (badconfig) + + if (badconfig) r = ERROR_BAD_CONFIGURATION; if (val != empty) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e249965..e3baa09 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2779,7 +2779,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(sz == 4, "Expected 4, got %d\n", sz); - /* lpValueBuf is NULL, pcchValueBuf is too small */ + /* lpValueBuf is non-NULL, pcchValueBuf is too small */ sz = 2; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz); @@ -2787,7 +2787,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(sz == 4, "Expected 4, got %d\n", sz); - /* lpValueBuf is NULL, pcchValueBuf is exactly 4 */ + /* lpValueBuf is non-NULL, pcchValueBuf is exactly 4 */ sz = 4; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);

1 0

James Hawkins : msi: Don't free str until the last instance of its use.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: a7fe36b327b68df76d28c5b9d287272544326256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fe36b327b68df76d28c5b9d… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:35:33 2009 -0800 msi: Don't free str until the last instance of its use. --- dlls/msi/automation.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 3b40384..5305f9c 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2084,7 +2084,7 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags, UINT ret; HRESULT hr; DWORD size; - LPWSTR str; + LPWSTR str = NULL; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) @@ -2118,8 +2118,6 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags, } ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), str, &size); - msi_free(str); - if (ret != ERROR_SUCCESS) { hr = DISP_E_EXCEPTION; @@ -2130,6 +2128,7 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags, hr = S_OK; done: + msi_free(str); VariantClear(&varg0); VariantClear(&varg1); return hr;

1 0