https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab49d97a84f646dd278fd93559c5228c9cb7aeda
commit ab49d97a84f646dd278fd93559c5228c9cb7aeda Author: winesync <[email protected]> AuthorDate: Fri Sep 11 18:27:48 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:50 2020 +0200 [WINESYNC] dbghelp: Use PE type for virtual modules. Signed-off-by: Jacek Caban <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 635506921a28c65bfc9b339d59c63d96092d97d8 by Jacek Caban <[email protected]> --- dll/win32/dbghelp/module.c | 61 +----------------------------------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 61 deletions(-) diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index dcc73aa40ff..e4cd98b224a 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -41,9 +41,6 @@ const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; #endif static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; -static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; -static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; -static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; const WCHAR S_SlashW[] = {'/','\0'}; static const WCHAR S_AcmW[] = {'.','a','c','m','\0'}; @@ -480,61 +477,6 @@ static BOOL module_is_container_loaded(const struct process* pcs, return FALSE; } -/****************************************************************** - * module_get_type_by_name - * - * Guesses a filename type from its extension - */ -enum module_type module_get_type_by_name(const WCHAR* name) -{ - int len = strlenW(name); - - /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ - do - { - int i = len; - - while (i && name[i - 1] >= '0' && name[i - 1] <= '9') i--; - - if (i && name[i - 1] == '.') - len = i - 1; - else - break; - } while (len); - - /* check for terminating .so or .so.[digit] */ - /* FIXME: Can't rely solely on extension; have to check magic or - * stop using .so on Mac OS X. For now, base on platform. */ - if (len > 3 && !memcmp(name + len - 3, S_DotSoW, 3)) -#ifdef __APPLE__ - return DMT_MACHO; -#else - return DMT_ELF; -#endif - - if (len > 6 && !strncmpiW(name + len - 6, S_DotDylibW, 6)) - return DMT_MACHO; - - if (len > 4 && !strncmpiW(name + len - 4, S_DotPdbW, 4)) - return DMT_PDB; - - if (len > 4 && !strncmpiW(name + len - 4, S_DotDbgW, 4)) - return DMT_DBG; - - /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ -#ifndef __REACTOS__ - if (is_wine_loader(name)) - { -#ifdef __APPLE__ - return DMT_MACHO; -#else - return DMT_ELF; -#endif - } -#endif - return DMT_PE; -} - static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { DWORD read_bytes; @@ -871,8 +813,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { if (!wImageName) return FALSE; - module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), - TRUE, BaseOfDll, SizeOfDll, 0, 0); + module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; if (wModuleName) module_set_module(module, wModuleName); module->module.SymType = SymVirtual; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index c4d061cf398..b547254b48b 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: c8b5a3be55963fcda51b8e13c10bcd45ecc4bc97 + wine: 635506921a28c65bfc9b339d59c63d96092d97d8
