niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

dbghelp: Change order when trying to load modules.

Browse source 
Change from: dll.so   > PE image > ELF/Mach-O images
into         PE image > dll.so   > ELF/Mach-O images

Main goal is in SymLoadModule*(), to not resynchronize the system
modules list when requesting loading of a PE image.
This can gain quite some time in some situations.

Signed-off-by: Eric Pouech <epouech@codeweavers.com>
This commit is contained in:
Eric Pouech 2023-12-18 12:59:22 +01:00 • committed by Alexandre Julliard
parent 0e3dba2a7a
commit d6d22677da
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dlls/dbghelp/module.c
View file

@ -956,10 +956,12 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
} }
} }
pcs->loader->synchronize_module_list(pcs);
/* this is a Wine extension to the API just to redo the synchronisation */ /* this is a Wine extension to the API just to redo the synchronisation */
if (!wImageName && !hFile) return 0; if (!wImageName && !hFile)
{
pcs->loader->synchronize_module_list(pcs);
return 0;
}
if (Flags & SLMFLAG_VIRTUAL) if (Flags & SLMFLAG_VIRTUAL)
{ {
@ -968,28 +970,31 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
if (!module) return 0; if (!module) return 0;
module->module.SymType = SymVirtual; module->module.SymType = SymVirtual;
} }
/* check if it's a builtin PE module with a containing ELF module */ else
else if (wImageName && module_is_container_loaded(pcs, wImageName, BaseOfDll))
{ {
/* force the loading of DLL as builtin */ /* try PE image */
module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll);
} if (!module && wImageName)
if (!module)
{
/* otherwise, try a regular PE module */
if (!(module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll)) &&
wImageName)
{ {
/* and finally an ELF or Mach-O module */ /* It could be either a dll.so file (for which we need the corresponding
module = pcs->loader->load_module(pcs, wImageName, BaseOfDll); * system module) or a system module.
* In both cases, ensure system module list is up-to-date.
*/
pcs->loader->synchronize_module_list(pcs);
if (module_is_container_loaded(pcs, wImageName, BaseOfDll))
module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll);
/* at last, try ELF or Mach-O module */
if (!module)
module = pcs->loader->load_module(pcs, wImageName, BaseOfDll);
}
if (!module)
{
WARN("Couldn't locate %s\n", debugstr_w(wImageName));
SetLastError(ERROR_NO_MORE_FILES);
return 0;
} }
} }
if (!module)
{
WARN("Couldn't locate %s\n", debugstr_w(wImageName));
SetLastError(ERROR_NO_MORE_FILES);
return 0;
}
/* by default module_new fills module.ModuleName from a derivation /* by default module_new fills module.ModuleName from a derivation
* of LoadedImageName. Overwrite it, if we have better information * of LoadedImageName. Overwrite it, if we have better information
*/ */