ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't strip the path in LoadModule16 before we have opened the file 

(reported by Jukka Heinonen).
This commit is contained in:
Alexandre Julliard 2003-09-01 23:56:39 +00:00
parent 0a1fa89f33
commit 3c80bb1443
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/kernel/ne_module.c
View File

@ -1162,22 +1162,23 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
enum loadorder_type loadorder[LOADORDER_NTYPES];
int i;
const char *filetype = "";
const char *ptr;
const char *ptr, *basename;
/* strip path information */
if (libname[0] && libname[1] == ':') libname += 2; /* strip drive specification */
if ((ptr = strrchr( libname, '\\' ))) libname = ptr + 1;
if ((ptr = strrchr( libname, '/' ))) libname = ptr + 1;
basename = libname;
if (basename[0] && basename[1] == ':') basename += 2; /* strip drive specification */
if ((ptr = strrchr( basename, '\\' ))) basename = ptr + 1;
if ((ptr = strrchr( basename, '/' ))) basename = ptr + 1;
if (is_builtin_present(libname))
if (is_builtin_present(basename))
{
TRACE( "forcing loadorder to builtin for %s\n", debugstr_a(libname) );
TRACE( "forcing loadorder to builtin for %s\n", debugstr_a(basename) );
/* force builtin loadorder since the dll is already in memory */
loadorder[0] = LOADORDER_BI;
loadorder[1] = LOADORDER_INVALID;
}
else MODULE_GetLoadOrder(loadorder, libname, FALSE);
else MODULE_GetLoadOrder(loadorder, basename, FALSE);
for(i = 0; i < LOADORDER_NTYPES; i++)
{