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

Fix builtin NE module refcounting of 32bit parent.

Browse Source
This commit is contained in:
Mike McCormack 2004-03-30 20:37:33 +00:00 committed by Alexandre Julliard
parent 114c9077d6
commit 1cf04bd70a
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/kernel/ne_module.c
View File

@ -1167,41 +1167,38 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
if (strlen(basename) < sizeof(dllname)-4) if (strlen(basename) < sizeof(dllname)-4)
{ {
int file_exists;
strcpy( dllname, basename ); strcpy( dllname, basename );
p = strrchr( dllname, '.' ); p = strrchr( dllname, '.' );
if (!p) strcat( dllname, ".dll" ); if (!p) strcat( dllname, ".dll" );
for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32;
if (!(descr = find_dll_descr( dllname ))) if (wine_dll_get_owner( dllname, owner, sizeof(owner), &file_exists ) == -1)
{ {
int file_exists; if (file_exists) return 21; /* it may be a Win32 module then */
}
if (wine_dll_get_owner( dllname, owner, sizeof(owner), &file_exists ) == -1) else /* found 32-bit owner, try to load it */
{
HMODULE mod32 = LoadLibraryA( owner );
if (mod32)
{ {
if (file_exists) return 21; /* it may be a Win32 module then */ if (!(descr = find_dll_descr( dllname ))) FreeLibrary( mod32 );
/* loading the 32-bit library can have the side effect of loading the module */
/* if so, simply incr the ref count and return the module */
if ((hModule = GetModuleHandle16( libname )))
{
TRACE( "module %s already loaded by owner\n", libname );
pModule = NE_GetPtr( hModule );
if (pModule) pModule->count++;
return hModule;
}
} }
else /* found 32-bit owner, try to load it */ else
{ {
HMODULE mod32 = LoadLibraryA( owner ); /* it's probably disabled by the load order config */
if (mod32) WARN( "couldn't load owner %s for 16-bit dll %s\n", owner, dllname );
{ return ERROR_FILE_NOT_FOUND;
if (!(descr = find_dll_descr( dllname ))) FreeLibrary( mod32 );
/* loading the 32-bit library can have the side effect of loading the module */
/* if so, simply incr the ref count and return the module */
if ((hModule = GetModuleHandle16( libname )))
{
TRACE( "module %s already loaded by owner\n", libname );
pModule = NE_GetPtr( hModule );
if (pModule) pModule->count++;
return hModule;
}
}
else
{
/* it's probably disabled by the load order config */
WARN( "couldn't load owner %s for 16-bit dll %s\n", owner, dllname );
return ERROR_FILE_NOT_FOUND;
}
} }
} }
} }