From 69e2bf626f7e69a3aef9105687887f1ffc31b959 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 19 Mar 2000 21:21:56 +0000 Subject: [PATCH] Hack: always try builtin module before elf or elfdll to avoid loading a builtin dll .so file in the wrong mode. --- loader/module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/module.c b/loader/module.c index 63809194098..d463297315a 100644 --- a/loader/module.c +++ b/loader/module.c @@ -1389,12 +1389,14 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags ) case MODULE_LOADORDER_ELFDLL: TRACE("Trying elfdll '%s'\n", libname); - pwm = ELFDLL_LoadLibraryExA(libname, flags); + if (!(pwm = BUILTIN32_LoadLibraryExA(libname, flags))) + pwm = ELFDLL_LoadLibraryExA(libname, flags); break; case MODULE_LOADORDER_SO: TRACE("Trying so-library '%s'\n", libname); - pwm = ELF_LoadLibraryExA(libname, flags); + if (!(pwm = BUILTIN32_LoadLibraryExA(libname, flags))) + pwm = ELF_LoadLibraryExA(libname, flags); break; case MODULE_LOADORDER_BI: -- 2.11.4.GIT