Hallo,
at present, wine e.g. crashes if it finds user32.dll in the same directory
as the executable. To keep wine from using this DLL, the dos-path to that
dll has to be given explicit to the "-dll" argument, like
wine h:/tmp/programm.exe --dll h:\\tmp\\user32.dll=b
(e.g. with a user32.dll in h:/tmp/)
I don't think we need that high granularity to select between builtin and
native dlls.
Bye
Changelog:
loader/module.c: MODULE_LoadLibraryExA
Use the libray name and not the deduced path as argument
when looking for the loadorder
--
Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de
Free Software: If you contribute nothing, expect nothing
--
Index: wine/loader/module.c
===================================================================
RCS file: /home/wine/wine/loader/module.c,v
retrieving revision 1.150
diff -u -r1.150 module.c
--- wine/loader/module.c 2 Apr 2002 19:47:30 -0000 1.150
+++ wine/loader/module.c 20 May 2002 18:09:14 -0000
@@ -1488,7 +1488,7 @@
return pwm;
}
- MODULE_GetLoadOrder( loadorder, filename, TRUE);
+ MODULE_GetLoadOrder( loadorder, libname, TRUE);
for(i = 0; i < LOADORDER_NTYPES; i++)
{
@@ -1510,8 +1510,8 @@
break;
case LOADORDER_BI:
- TRACE("Trying built-in '%s'\n", filename);
- pwm = BUILTIN32_LoadLibraryExA(filename, flags);
+ TRACE("Trying built-in '%s'\n", libname);
+ pwm = BUILTIN32_LoadLibraryExA(libname, flags);
filetype = "builtin";
break;
@@ -1523,7 +1523,8 @@
if(pwm)
{
/* Initialize DLL just loaded */
- TRACE("Loaded module '%s' at 0x%08x\n", filename, pwm->module);
+ TRACE("Loaded module '%s'('%s') as %s at 0x%08x\n",
+ libname, filename, filetype, pwm->module);
if (!TRACE_ON(module))
TRACE_(loaddll)("Loaded module '%s' : %s\n", filename, filetype);
/* Set the refCount here so that an attach failure will */
