mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-16 01:59:21 +00:00
Hack: always try builtin module before elf or elfdll to avoid loading
a builtin dll .so file in the wrong mode.
This commit is contained in:
parent
aafd54dab9
commit
69e2bf626f
|
@ -1389,12 +1389,14 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
|
||||||
|
|
||||||
case MODULE_LOADORDER_ELFDLL:
|
case MODULE_LOADORDER_ELFDLL:
|
||||||
TRACE("Trying elfdll '%s'\n", libname);
|
TRACE("Trying elfdll '%s'\n", libname);
|
||||||
pwm = ELFDLL_LoadLibraryExA(libname, flags);
|
if (!(pwm = BUILTIN32_LoadLibraryExA(libname, flags)))
|
||||||
|
pwm = ELFDLL_LoadLibraryExA(libname, flags);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MODULE_LOADORDER_SO:
|
case MODULE_LOADORDER_SO:
|
||||||
TRACE("Trying so-library '%s'\n", libname);
|
TRACE("Trying so-library '%s'\n", libname);
|
||||||
pwm = ELF_LoadLibraryExA(libname, flags);
|
if (!(pwm = BUILTIN32_LoadLibraryExA(libname, flags)))
|
||||||
|
pwm = ELF_LoadLibraryExA(libname, flags);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MODULE_LOADORDER_BI:
|
case MODULE_LOADORDER_BI:
|
||||||
|
|
Loading…
Reference in a new issue