February 2007 - Wine-commits

Eric Pouech : dbghelp: Prepare module loading functions to be switched to Unicode module storage.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: c75fb89a6485e29e50c67ee57ae6ef50952bf901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75fb89a6485e29e50c67ee57… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:54 2007 +0100 dbghelp: Prepare module loading functions to be switched to Unicode module storage. --- dlls/dbghelp/module.c | 171 ++++++++++++++++++++++++++---------------------- 1 files changed, 93 insertions(+), 78 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 2810f03..de50f0e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -384,21 +384,104 @@ enum module_type module_get_type_by_name(const char* name) DWORD WINAPI SymLoadModule(HANDLE hProcess, HANDLE hFile, const char* ImageName, const char* ModuleName, DWORD BaseOfDll, DWORD SizeOfDll) { + return SymLoadModuleEx(hProcess, hFile, ImageName, ModuleName, BaseOfDll, + SizeOfDll, NULL, 0); +} + +/*********************************************************************** + * SymLoadModuleEx (DBGHELP.@) + */ +DWORD64 WINAPI SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, + PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize, + PMODLOAD_DATA Data, DWORD Flags) +{ + LPWSTR wImageName, wModuleName; + unsigned len; + DWORD64 ret; + + TRACE("(%p %p %s %s %s %08x %p %08x)\n", + hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName), + wine_dbgstr_longlong(BaseOfDll), DllSize, Data, Flags); + + if (ImageName) + { + len = MultiByteToWideChar(CP_ACP, 0, ImageName, -1, NULL, 0); + wImageName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ImageName, -1, wImageName, len); + } + else wImageName = NULL; + if (ModuleName) + { + len = MultiByteToWideChar(CP_ACP, 0, ModuleName, -1, NULL, 0); + wModuleName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ModuleName, -1, wModuleName, len); + } + else wModuleName = NULL; + + ret = SymLoadModuleExW(hProcess, hFile, wImageName, wModuleName, + BaseOfDll, DllSize, Data, Flags); + HeapFree(GetProcessHeap(), 0, wImageName); + HeapFree(GetProcessHeap(), 0, wModuleName); + return ret; +} + +/*********************************************************************** + * SymLoadModuleExW (DBGHELP.@) + */ +DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageName, + PCWSTR wModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll, + PMODLOAD_DATA Data, DWORD Flags) +{ struct process* pcs; struct module* module = NULL; + char ImageName[MAX_PATH], amodname[MAX_PATH], *ModuleName; - TRACE("(%p %p %s %s %08x %08x)\n", - hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName), - BaseOfDll, SizeOfDll); - pcs = process_find_by_handle(hProcess); - if (!pcs) return FALSE; + TRACE("(%p %p %s %s %s %08x %p %08x)\n", + hProcess, hFile, debugstr_w(wImageName), debugstr_w(wModuleName), + wine_dbgstr_longlong(BaseOfDll), SizeOfDll, Data, Flags); + + if (Data) + FIXME("Unsupported load data parameter %p for %s\n", + Data, debugstr_w(wImageName)); + if (!validate_addr64(BaseOfDll)) return FALSE; + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + + if (Flags & SLMFLAG_VIRTUAL) + { + WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, MAX_PATH, + NULL, NULL); + module = module_new(pcs, ImageName, module_get_type_by_name(ImageName), + TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); + if (!module) return FALSE; + if (wModuleName) + { + WideCharToMultiByte(CP_ACP,0, wModuleName, -1, ModuleName = amodname, MAX_PATH, + NULL, NULL); + module_set_module(module, ModuleName); + } + module->module.SymType = SymVirtual; + + return TRUE; + } + if (Flags & ~(SLMFLAG_VIRTUAL)) + FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); /* force transparent ELF loading / unloading */ elf_synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ - if (!ImageName && !hFile) return 0; + if (!wImageName && !hFile) return 0; + + WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, MAX_PATH, + NULL, NULL); + + if (wModuleName) + WideCharToMultiByte(CP_ACP,0, wModuleName, -1, ModuleName = amodname, MAX_PATH, + NULL, NULL); + else + ModuleName = NULL; if (module_is_elf_container_loaded(pcs, ImageName, ModuleName)) { @@ -406,21 +489,21 @@ DWORD WINAPI SymLoadModule(HANDLE hProcess, HANDLE hFile, const char* ImageName, if ((module = pe_load_module_from_pcs(pcs, ImageName, ModuleName, BaseOfDll, SizeOfDll))) goto done; - WARN("Couldn't locate %s\n", ImageName); + WARN("Couldn't locate %s\n", debugstr_w(wImageName)); return 0; } - TRACE("Assuming %s as native DLL\n", ImageName); + TRACE("Assuming %s as native DLL\n", debugstr_w(wImageName)); if (!(module = pe_load_module(pcs, ImageName, hFile, BaseOfDll, SizeOfDll))) { if (module_get_type_by_name(ImageName) == DMT_ELF && (module = elf_load_module(pcs, ImageName, BaseOfDll))) goto done; FIXME("Should have successfully loaded debug information for image %s\n", - ImageName); + debugstr_w(wImageName)); if ((module = pe_load_module_from_pcs(pcs, ImageName, ModuleName, BaseOfDll, SizeOfDll))) goto done; - WARN("Couldn't locate %s\n", ImageName); + WARN("Couldn't locate %s\n", debugstr_w(wImageName)); return 0; } module->module.NumSyms = module->ht_symbols.num_elts; @@ -436,74 +519,6 @@ done: } /*********************************************************************** - * SymLoadModuleEx (DBGHELP.@) - */ -DWORD64 WINAPI SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, - PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize, - PMODLOAD_DATA Data, DWORD Flags) -{ - TRACE("(%p %p %s %s %s %08x %p %08x)\n", - hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName), - wine_dbgstr_longlong(BaseOfDll), DllSize, Data, Flags); - - if (Data) - FIXME("Unsupported load data parameter %p for %s\n", Data, ImageName); - if (!validate_addr64(BaseOfDll)) return FALSE; - if (Flags & SLMFLAG_VIRTUAL) - { - struct process* pcs = process_find_by_handle(hProcess); - struct module* module; - if (!pcs) return FALSE; - - module = module_new(pcs, ImageName, module_get_type_by_name(ImageName), TRUE, - (DWORD)BaseOfDll, DllSize, 0, 0); - if (!module) return FALSE; - if (ModuleName) - module_set_module(module, ModuleName); - module->module.SymType = SymVirtual; - - return TRUE; - } - if (Flags & ~(SLMFLAG_VIRTUAL)) - FIXME("Unsupported Flags %08x for %s\n", Flags, ImageName); - - return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, DllSize); -} - -/*********************************************************************** - * SymLoadModuleExW (DBGHELP.@) - */ -DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageName, - PCWSTR wModuleName, DWORD64 BaseOfDll, DWORD DllSize, - PMODLOAD_DATA Data, DWORD Flags) -{ - LPSTR ImageName, ModuleName; - unsigned len; - BOOL ret; - - if (wImageName) - { - len = WideCharToMultiByte(CP_ACP,0, wImageName, -1, NULL, 0, NULL, NULL); - ImageName = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, len, NULL, NULL); - } - else ImageName = NULL; - if (wModuleName) - { - len = WideCharToMultiByte(CP_ACP,0, wModuleName, -1, NULL, 0, NULL, NULL); - ModuleName = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP,0, wModuleName, -1, ModuleName, len, NULL, NULL); - } - else ModuleName = NULL; - - ret = SymLoadModuleEx(hProcess, hFile, ImageName, ModuleName, - BaseOfDll, DllSize, Data, Flags); - HeapFree(GetProcessHeap(), 0, ImageName); - HeapFree(GetProcessHeap(), 0, ModuleName); - return ret; -} - -/*********************************************************************** * SymLoadModule64 (DBGHELP.@) */ DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PCSTR ImageName,

1 0

Eric Pouech : dbghelp: .gnu_link support: rewrote helper functions for better later unicodification.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 6efc06199256b5ab0e65fdb80441bf714a8bf065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efc06199256b5ab0e65fdb80… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:59 2007 +0100 dbghelp: .gnu_link support: rewrote helper functions for better later unicodification. --- dlls/dbghelp/elf_module.c | 69 ++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 1350a13..e534013 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -802,26 +802,49 @@ static BOOL elf_load_debug_info_from_map(struct module* module, * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static char* elf_locate_debug_link (const char* filename, const char* moduleDir) +static char* elf_locate_debug_link(const char* filename, const char* loaded_file, + struct elf_file_map* fmap_link) { - static const char globalDebugDir[] = "/usr/lib/debug"; - const size_t moduleDirLen = strlen (moduleDir); - const size_t globalDebugDirLen = strlen (globalDebugDir); - struct stat statbuf; + static const char globalDebugDir[] = "/usr/lib/debug/"; + const size_t globalDebugDirLen = strlen(globalDebugDir); + char* p; + char* slash; + + p = HeapAlloc(GetProcessHeap(), 0, + globalDebugDirLen + strlen(loaded_file) + 1 + 6 + 1 + strlen(filename) + 1); + + if (!p) return FALSE; + + /* we prebuild the string with "execdir" */ + strcpy(p, loaded_file); + slash = strrchr(p, '/'); + if (slash == NULL) slash = p; else slash++; + + /* testing execdir/filename */ + strcpy(slash, filename); + if (elf_map_file(p, fmap_link)) goto found; - char* p = HeapAlloc (GetProcessHeap(), 0, - moduleDirLen + 1 + max (6, globalDebugDirLen) + 1 + strlen (filename)+1); + /* testing execdir/.debug/filename */ + sprintf(slash, ".debug/%s", filename); + if (elf_map_file(p, fmap_link)) goto found; - sprintf (p, "%s/%s", moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + /* testing globaldebugdir/execdir/filename */ + memmove(p + globalDebugDirLen, p, slash - p); + memcpy(p, globalDebugDir, globalDebugDirLen); + slash += globalDebugDirLen; + strcpy(slash, filename); + if (elf_map_file(p, fmap_link)) goto found; - sprintf (p, "%s/.debug/%s", moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + strcpy(p, filename); + if (elf_map_file(p, fmap_link)) goto found; - sprintf (p, "%s/%s/%s", globalDebugDir, moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + HeapFree(GetProcessHeap(), 0, p); - strcpy (p, filename); + WARN("Couldn't locate or map %s\n", filename); + return NULL; + +found: + TRACE("Located debug information file %s at %s\n", filename, p); return p; } @@ -845,19 +868,11 @@ static BOOL elf_debuglink_parse (struct module* module, BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; struct elf_file_map fmap_link; - char* moduleDir; char* link_file; - char* slash; - moduleDir = HeapAlloc (GetProcessHeap(), 0, strlen (module->module.LoadedImageName) + 1); - strcpy (moduleDir, module->module.LoadedImageName); - slash = strrchr (moduleDir, '/'); - if (slash != 0) *slash = 0; + link_file = elf_locate_debug_link(dbg_link, module->module.LoadedImageName, &fmap_link); - link_file = elf_locate_debug_link (dbg_link, moduleDir); - TRACE("Located debug information file %s at %s\n", dbg_link, link_file); - - if (elf_map_file(link_file, &fmap_link)) + if (link_file) { fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); fmap_link.with_crc = 1; @@ -868,12 +883,8 @@ static BOOL elf_debuglink_parse (struct module* module, else WARN("Couldn't load debug information from %s\n", link_file); elf_unmap_file(&fmap_link); + HeapFree(GetProcessHeap(), 0, link_file); } - else - WARN("Couldn't map %s\n", dbg_link); - - HeapFree (GetProcessHeap(), 0, link_file); - HeapFree (GetProcessHeap(), 0, moduleDir); return ret; }

1 0

Eric Pouech : dbghelp: Added helper to define the module's name.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 33c8ffc301eb251b65f4e444f26b8ba62d498b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c8ffc301eb251b65f4e444f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:33 2007 +0100 dbghelp: Added helper to define the module's name. --- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/module.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 83c549d..be6b7e6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -447,6 +447,8 @@ extern enum module_type extern void module_reset_debug_info(struct module* module); extern BOOL module_remove(struct process* pcs, struct module* module); +extern void module_set_module(struct module* module, const char* name); + /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, struct module* module, diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index e7214b3..e63b576 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -79,6 +79,11 @@ static void module_fill_module(const char* in, char* out, size_t size) while ((*out = tolower(*out))) out++; } +void module_set_module(struct module* module, const char* name) +{ + module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName)); +} + static const char* get_module_type(enum module_type type, BOOL virtual) { switch (type) @@ -116,8 +121,7 @@ struct module* module_new(struct process* pcs, const char* name, module->module.SizeOfStruct = sizeof(module->module); module->module.BaseOfImage = mod_addr; module->module.ImageSize = size; - module_fill_module(name, module->module.ModuleName, - sizeof(module->module.ModuleName)); + module_set_module(module, name); module->module.ImageName[0] = '\0'; lstrcpynA(module->module.LoadedImageName, name, sizeof(module->module.LoadedImageName)); module->module.SymType = SymNone; @@ -423,7 +427,7 @@ done: * of ImageName. Overwrite it, if we have better information */ if (ModuleName) - lstrcpynA(module->module.ModuleName, ModuleName, sizeof(module->module.ModuleName)); + module_set_module(module, ModuleName); lstrcpynA(module->module.ImageName, ImageName, sizeof(module->module.ImageName)); return module->module.BaseOfImage; @@ -453,7 +457,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, (DWORD)BaseOfDll, DllSize, 0, 0); if (!module) return FALSE; if (ModuleName) - lstrcpynA(module->module.ModuleName, ModuleName, sizeof(module->module.ModuleName)); + module_set_module(module, ModuleName); module->module.SymType = SymVirtual; return TRUE;

1 0

Eric Pouech : dbghelp: Added an ANSI copy of the module name ( useful for next patches).
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: aac77c98a261c4d7edac7f789fde32e335f5d494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac77c98a261c4d7edac7f789… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:39 2007 +0100 dbghelp: Added an ANSI copy of the module name (useful for next patches). --- dlls/dbghelp/dbghelp_private.h | 6 +++++- dlls/dbghelp/dwarf.c | 8 ++++---- dlls/dbghelp/elf_module.c | 24 ++++++++++++------------ dlls/dbghelp/module.c | 7 ++++--- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 34 +++++++++++++++++----------------- dlls/dbghelp/type.c | 2 +- 8 files changed, 45 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac77c98a261c4d7edac7…

1 0

Eric Pouech : dbghelp: Rewrote the loaded modules enumeration so that Unicode version is the core .
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: fcd3972fa816ac60b0f189c2fed2765e25ea9cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd3972fa816ac60b0f189c2f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:44 2007 +0100 dbghelp: Rewrote the loaded modules enumeration so that Unicode version is the core. --- dlls/dbghelp/module.c | 111 +++++++++++++++++++++++++------------------------ 1 files changed, 57 insertions(+), 54 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ebee8d9..14731d7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -628,100 +628,103 @@ BOOL WINAPI SymEnumerateModules64(HANDLE hProcess, * EnumerateLoadedModules64 (DBGHELP.@) * */ +struct enum_load_modW64_64 +{ + PENUMLOADED_MODULES_CALLBACK64 cb; + PVOID user; + char module[MAX_PATH]; +}; + +static BOOL CALLBACK enum_load_modW64_64(PWSTR name, DWORD64 base, ULONG size, + PVOID user) +{ + struct enum_load_modW64_64* x = user; + + WideCharToMultiByte(CP_ACP, 0, name, -1, x->module, sizeof(x->module), NULL, NULL); + return x->cb(x->module, base, size, x->user); +} + BOOL WINAPI EnumerateLoadedModules64(HANDLE hProcess, PENUMLOADED_MODULES_CALLBACK64 EnumLoadedModulesCallback, PVOID UserContext) { - HMODULE* hMods; - char base[256], mod[256]; - DWORD i, sz; - MODULEINFO mi; + struct enum_load_modW64_64 x; - hMods = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(hMods[0])); - if (!hMods) return FALSE; - - if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz)) - { - /* hProcess should also be a valid process handle !! */ - FIXME("If this happens, bump the number in mod\n"); - HeapFree(GetProcessHeap(), 0, hMods); - return FALSE; - } - sz /= sizeof(HMODULE); - for (i = 0; i < sz; i++) - { - if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) || - !GetModuleBaseNameA(hProcess, hMods[i], base, sizeof(base))) - continue; - module_fill_module(base, mod, sizeof(mod)); - EnumLoadedModulesCallback(mod, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, - UserContext); - } - HeapFree(GetProcessHeap(), 0, hMods); + x.cb = EnumLoadedModulesCallback; + x.user = UserContext; - return sz != 0 && i == sz; + return EnumerateLoadedModulesW64(hProcess, enum_load_modW64_64, &x); } /****************************************************************** * EnumerateLoadedModules (DBGHELP.@) * */ -struct enum_load_mod64_32 +struct enum_load_modW64_32 { PENUMLOADED_MODULES_CALLBACK cb; PVOID user; + char module[MAX_PATH]; }; -static BOOL CALLBACK enum_load_mod64_32(PSTR name, DWORD64 base, ULONG size, - PVOID user) +static BOOL CALLBACK enum_load_modW64_32(PWSTR name, DWORD64 base, ULONG size, + PVOID user) { - struct enum_load_mod64_32* x = user; - return x->cb(name, (DWORD)base, size, x->user); + struct enum_load_modW64_32* x = user; + WideCharToMultiByte(CP_ACP, 0, name, -1, x->module, sizeof(x->module), NULL, NULL); + return x->cb(x->module, (DWORD)base, size, x->user); } BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess, PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, PVOID UserContext) { - struct enum_load_mod64_32 x; + struct enum_load_modW64_32 x; x.cb = EnumLoadedModulesCallback; x.user = UserContext; - return EnumerateLoadedModules64(hProcess, enum_load_mod64_32, &x); + return EnumerateLoadedModulesW64(hProcess, enum_load_modW64_32, &x); } /****************************************************************** * EnumerateLoadedModulesW64 (DBGHELP.@) * */ -struct enum_load_mod64_W64 -{ - PENUMLOADED_MODULES_CALLBACKW64 cb; - PVOID user; - WCHAR module[MAX_PATH]; -}; - -static BOOL CALLBACK enum_load_mod64_W64(PSTR name, DWORD64 base, ULONG size, - PVOID user) -{ - struct enum_load_mod64_W64* x = user; - - MultiByteToWideChar(CP_ACP, 0, name, -1, - x->module, sizeof(x->module) / sizeof(WCHAR)); - return x->cb(x->module, base, size, x->user); -} - BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, PVOID UserContext) { - struct enum_load_mod64_W64 x; + HMODULE* hMods; + char base[256], mod[256]; + WCHAR modW[256]; + DWORD i, sz; + MODULEINFO mi; - x.cb = EnumLoadedModulesCallback; - x.user = UserContext; + hMods = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(hMods[0])); + if (!hMods) return FALSE; - return EnumerateLoadedModules64(hProcess, enum_load_mod64_W64, &x); + if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz)) + { + /* hProcess should also be a valid process handle !! */ + FIXME("If this happens, bump the number in mod\n"); + HeapFree(GetProcessHeap(), 0, hMods); + return FALSE; + } + sz /= sizeof(HMODULE); + for (i = 0; i < sz; i++) + { + if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) || + !GetModuleBaseNameA(hProcess, hMods[i], base, sizeof(base))) + continue; + module_fill_module(base, mod, sizeof(mod)); + MultiByteToWideChar(CP_ACP, 0, mod, -1, modW, sizeof(modW) / sizeof(modW)); + EnumLoadedModulesCallback(modW, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, + UserContext); + } + HeapFree(GetProcessHeap(), 0, hMods); + + return sz != 0 && i == sz; } /******************************************************************

1 0

Aric Stewart : shell32: IShellLink::GetIDList fix.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: a0ad8f38c7dca81a218f9a489cf550357efb480a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ad8f38c7dca81a218f9a489… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 22 17:19:41 2007 +0900 shell32: IShellLink::GetIDList fix. IShellLink::GetIDList when it fails to generate a PIDL must set ppidl to NULL or some applications think it contains valid data. --- dlls/shell32/shelllink.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 25f0753..61885ed 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1744,7 +1744,10 @@ static HRESULT WINAPI IShellLinkW_fnGetIDList(IShellLinkW * iface, LPITEMIDLIST TRACE("(%p)->(ppidl=%p)\n",This, ppidl); if (!This->pPidl) + { + *ppidl = NULL; return S_FALSE; + } *ppidl = ILClone(This->pPidl); return S_OK; }

1 0

Misha Koshelev : oleview: Account for unnamed right hand side parameter of propput.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: a85895d2401f146a6e275e55e51c7e5b1ddf5122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85895d2401f146a6e275e55e… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Thu Feb 22 00:39:52 2007 -0600 oleview: Account for unnamed right hand side parameter of propput. --- programs/oleview/typelib.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 91c1775..c452343 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -437,6 +437,7 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) BSTR bstrName, *bstrParamNames; WCHAR wszText[MAX_LOAD_STRING]; WCHAR wszAfter[MAX_LOAD_STRING]; + WCHAR szRhs[] = {'r','h','s',0}; /* Right-hand side of a propput */ BOOL bFirst; U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; @@ -531,10 +532,10 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); - for(j=0; j<namesNo-1; j++) + for(j=0; j<pFuncDesc->cParams; j++) { if(j != 0) AddToTLDataStrW(tld, wszComa); - if(namesNo-1 != 1) + if(pFuncDesc->cParams != 1) { AddToTLDataStrW(tld, wszNewLine); AddSpaces(tld, tabSize); @@ -574,8 +575,12 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszAfter); AddToTLDataStrW(tld, wszSpace); - AddToTLDataStrW(tld, bstrParamNames[j+1]); - SysFreeString(bstrParamNames[j+1]); + if (j+1 < namesNo) { + AddToTLDataStrW(tld, bstrParamNames[j+1]); + SysFreeString(bstrParamNames[j+1]); + } else { + AddToTLDataStrW(tld, szRhs); + } } AddToTLDataStrW(tld, wszCloseBrackets2); AddToTLDataStrW(tld, wszSemicolon);

1 0

Maarten Lankhorst : winealsa: Fix typo.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: cda92aeba9206fc26d9cd375e63d4788cf62786a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda92aeba9206fc26d9cd375e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 21 20:18:04 2007 +0100 winealsa: Fix typo. --- dlls/winealsa.drv/alsa.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 1a1fd19..353a9c2 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); #ifdef USE_PIPE_SYNC #define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0) -#define CLOSE_OMR(Omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0) +#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0) #define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0) #define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0) #define RESET_OMR(omr) do { } while (0) @@ -119,7 +119,6 @@ void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) WAIT_OMR(omr, sleep); } - /****************************************************************** * ALSA_AddRingMessage *

1 0

Paul Vriens : wininet/tests: Add a few more tests.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 63806a94b5091ff8a9368cd905b01c295010186c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63806a94b5091ff8a9368cd90… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 21 23:13:43 2007 +0100 wininet/tests: Add a few more tests. --- dlls/wininet/tests/ftp.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index c7b881c..fc86bb1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -470,8 +470,23 @@ static void test_openfile(void) { BOOL bRet; HINTERNET hOpenFile2; + HANDLE hFile; + + /* We have a handle so all ftp calls should fail (TODO: Put all ftp-calls in here) */ + SetLastError(0xdeadbeef); + bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); + ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); + ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); - /* We have a handle so all ftp calls should fail (TODO: Put more ftp-calls in here) */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); @@ -485,6 +500,33 @@ static void test_openfile(void) ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); InternetCloseHandle(hOpenFile2); /* Just in case */ + + /* Create a temporary local file */ + SetLastError(0xdeadbeef); + hFile = CreateFileA("now_existing_local", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok ( hFile != NULL, "Error creating a local file : %d\n", GetLastError()); + CloseHandle(hFile); + SetLastError(0xdeadbeef); + bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + DeleteFileA("now_existing_local"); + + SetLastError(0xdeadbeef); + bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); + ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); + ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); } InternetCloseHandle(hOpenFile);

1 0

Andrew Talbot : serialui: Constify a variable.
by Alexandre Julliard 22 Feb '07

22 Feb '07

Module: wine Branch: master Commit: 3399c81302cfccfbac33448d680586b26831c116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3399c81302cfccfbac33448d6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 21 23:25:25 2007 +0000 serialui: Constify a variable. --- dlls/serialui/confdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index d6b8f1e..f9f306b 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -205,7 +205,7 @@ static BOOL SERIALUI_GetConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, LPDWO * dcb.BaudRate. This code is to convert back and forth between CBR_ style * and integers. The dialog box uses integer values. */ -static DWORD SERIALUI_BaudConvertTable[] = { +static const DWORD SERIALUI_BaudConvertTable[] = { CBR_110, 110, CBR_300, 300, CBR_600, 600, CBR_1200, 1200, CBR_2400, 2400, CBR_4800, 4800, CBR_9600, 9600, CBR_14400, 14400, CBR_19200, 19200, CBR_38400, 38400, CBR_56000, 56000, CBR_57600, 57600,

1 0