system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 01:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed loading of native NE dlls.

Browse source
This commit is contained in:
Eric Pouech 1999-04-26 14:53:32 +00:00 committed by Alexandre Julliard
parent b6b8bf83a0
commit abd79ddda4
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
loader/ne/module.c
View file

@ -758,18 +758,6 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule )
HMODULE16 hDLL; HMODULE16 hDLL;
if ((hDLL = MODULE_LoadModule16( buffer, TRUE )) < 32) if ((hDLL = MODULE_LoadModule16( buffer, TRUE )) < 32)
{
/* append ".dll" if no other extension */
if (!strchr(buffer,'.'))
strcpy( buffer + *pstr, ".dll" );
/* Retry to get the handle to see whether it was loaded */
if ((*pModRef = GetModuleHandle16( buffer )))
goto was_loaded;
hDLL = MODULE_LoadModule16( buffer, TRUE );
}
if (hDLL < 32)
{ {
/* FIXME: cleanup what was done */ /* FIXME: cleanup what was done */
@ -784,7 +772,7 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule )
else /* Increment the reference count of the DLL */ else /* Increment the reference count of the DLL */
{ {
NE_MODULE *pOldDLL; NE_MODULE *pOldDLL;
was_loaded:
pOldDLL = NE_GetPtr( *pModRef ); pOldDLL = NE_GetPtr( *pModRef );
if (pOldDLL) pOldDLL->count++; if (pOldDLL) pOldDLL->count++;
} }
@ -859,7 +847,14 @@ HINSTANCE16 NE_LoadModule( LPCSTR name, BOOL implicit )
if ((hFile = OpenFile16( name, &ofs, OF_READ )) == HFILE_ERROR16) if ((hFile = OpenFile16( name, &ofs, OF_READ )) == HFILE_ERROR16)
{ {
return 2; /* File not found */ char buffer[260];
/* 4 == strlen(".dll") */
strncpy(buffer, name, sizeof(buffer) - 1 - 4);
strcat(buffer, ".dll");
if ((hFile = OpenFile16( buffer, &ofs, OF_READ )) == HFILE_ERROR16) {
return 2; /* File not found */
}
} }
hInstance = NE_LoadFileModule( hFile, &ofs, implicit ); hInstance = NE_LoadFileModule( hFile, &ofs, implicit );