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

Bugfix: When loading an executable module fails, don't perform module

Browse Source 
cleanup before the corresponding task is destroyed.
This commit is contained in:
Ulrich Weigand 1999-10-13 12:21:06 +00:00 committed by Alexandre Julliard
parent 92418ee65c
commit 2a343853ad
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
loader/ne/module.c
View File

@ -797,18 +797,12 @@ static HINSTANCE16 NE_DoLoadModule( NE_MODULE *pModule )
if (!NE_CreateSegments( pModule ) || if (!NE_CreateSegments( pModule ) ||
!(hInstance = NE_CreateInstance( pModule, NULL, FALSE ))) !(hInstance = NE_CreateInstance( pModule, NULL, FALSE )))
{
GlobalFreeAll16( pModule->self );
return 8; /* Insufficient memory */ return 8; /* Insufficient memory */
}
/* Load the referenced DLLs */ /* Load the referenced DLLs */
if (!NE_LoadDLLs( pModule )) if (!NE_LoadDLLs( pModule ))
{
NE_FreeModule( pModule->self, 0 );
return 2; return 2;
}
/* Load the segments */ /* Load the segments */
@ -845,6 +839,7 @@ HINSTANCE16 NE_LoadModule( LPCSTR name, BOOL implicit, BOOL lib_only )
{ {
NE_MODULE *pModule; NE_MODULE *pModule;
HMODULE16 hModule; HMODULE16 hModule;
HINSTANCE16 hInstance;
HFILE16 hFile; HFILE16 hFile;
OFSTRUCT ofs; OFSTRUCT ofs;
@ -872,7 +867,14 @@ HINSTANCE16 NE_LoadModule( LPCSTR name, BOOL implicit, BOOL lib_only )
if ( !lib_only && !( pModule->flags & NE_FFLAGS_LIBMODULE ) ) if ( !lib_only && !( pModule->flags & NE_FFLAGS_LIBMODULE ) )
return hModule; return hModule;
return NE_DoLoadModule( pModule ); hInstance = NE_DoLoadModule( pModule );
if ( hInstance < 32 )
{
/* cleanup ... */
NE_FreeModule( hModule, 0 );
}
return hInstance;
} }
@ -1179,12 +1181,14 @@ BOOL NE_InitProcess( NE_MODULE *pModule )
hInstance = NE_DoLoadModule( pModule ); hInstance = NE_DoLoadModule( pModule );
hPrevInstance = 0; hPrevInstance = 0;
}
if ( hInstance < 32 ) if ( hInstance < 32 )
{ {
SYSLEVEL_LeaveWin16Lock();
SetLastError( hInstance ); SetLastError( hInstance );
retv = FALSE; return FALSE;
}
} }
/* Enter instance handles into task struct */ /* Enter instance handles into task struct */