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

Don't call a NE DLL's DllEntryPoint twice during one single

Browse Source 
LoadModule() call.
This commit is contained in:
Ulrich Weigand 2001-01-15 22:20:50 +00:00 committed by Alexandre Julliard
parent a8be2a5b4f
commit 16a9a2d730
1 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
loader/ne/segment.c
View File

@ -765,7 +765,44 @@ static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason )
* returns FALSE ... * returns FALSE ...
* *
*/ */
void NE_DllProcessAttach( HMODULE16 hModule )
struct ne_init_list
{
int count;
int size;
NE_MODULE **module;
};
static void add_to_init_list( struct ne_init_list *list, NE_MODULE *hModule )
{
if ( list->count == list->size )
{
int newSize = list->size + 128;
NE_MODULE **newModule = HeapReAlloc( GetProcessHeap(), 0,
list->module, newSize*sizeof(NE_MODULE *) );
if ( !newModule )
{
FIXME_(dll)("Out of memory!");
return;
}
list->module = newModule;
list->size = newSize;
}
list->module[list->count++] = hModule;
}
static void free_init_list( struct ne_init_list *list )
{
if ( list->module )
{
HeapFree( GetProcessHeap(), 0, list->module );
memset( list, 0, sizeof(*list) );
}
}
static void fill_init_list( struct ne_init_list *list, HMODULE16 hModule )
{ {
NE_MODULE *pModule; NE_MODULE *pModule;
WORD *pModRef; WORD *pModRef;
@ -774,6 +811,11 @@ void NE_DllProcessAttach( HMODULE16 hModule )
if (!(pModule = NE_GetPtr( hModule ))) return; if (!(pModule = NE_GetPtr( hModule ))) return;
assert( !(pModule->flags & NE_FFLAGS_WIN32) ); assert( !(pModule->flags & NE_FFLAGS_WIN32) );
/* Never add a module twice */
for ( i = 0; i < list->count; i++ )
if ( list->module[i] == pModule )
return;
/* Check for recursive call */ /* Check for recursive call */
if ( pModule->misc_flags & 0x80 ) return; if ( pModule->misc_flags & 0x80 ) return;
@ -786,10 +828,10 @@ void NE_DllProcessAttach( HMODULE16 hModule )
pModRef = NE_MODULE_TABLE( pModule ); pModRef = NE_MODULE_TABLE( pModule );
for ( i = 0; i < pModule->modref_count; i++ ) for ( i = 0; i < pModule->modref_count; i++ )
if ( pModRef[i] ) if ( pModRef[i] )
NE_DllProcessAttach( (HMODULE16)pModRef[i] ); fill_init_list( list, (HMODULE16)pModRef[i] );
/* Call DLL entry point */ /* Add current module */
NE_CallDllEntryPoint( pModule, DLL_PROCESS_ATTACH ); add_to_init_list( list, pModule );
/* Remove recursion flag */ /* Remove recursion flag */
pModule->misc_flags &= ~0x80; pModule->misc_flags &= ~0x80;
@ -797,6 +839,23 @@ void NE_DllProcessAttach( HMODULE16 hModule )
TRACE_(dll)("(%s) - END\n", NE_MODULE_NAME(pModule) ); TRACE_(dll)("(%s) - END\n", NE_MODULE_NAME(pModule) );
} }
static void call_init_list( struct ne_init_list *list )
{
int i;
for ( i = 0; i < list->count; i++ )
NE_CallDllEntryPoint( list->module[i], DLL_PROCESS_ATTACH );
}
void NE_DllProcessAttach( HMODULE16 hModule )
{
struct ne_init_list list;
memset( &list, 0, sizeof(list) );
fill_init_list( &list, hModule );
call_init_list( &list );
free_init_list( &list );
}
/*********************************************************************** /***********************************************************************
* NE_Ne2MemFlags * NE_Ne2MemFlags