In AtlModuleInit do not call initialization procedures that are NULL.

This commit is contained in:
Aric Stewart 2005-08-19 09:58:02 +00:00 committed by Alexandre Julliard
parent 84ae4d8bd1
commit 62e1a0f201
1 changed files with 8 additions and 4 deletions

View File

@ -65,11 +65,15 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEA* pM, _ATL_OBJMAP_ENTRYA* p, HINSTANCE
/* call mains */
i = 0;
while (pM->m_pObjMap[i].pclsid != NULL)
if (pM->m_pObjMap != NULL)
{
TRACE("Initializing object %i\n",i);
p[i].pfnObjectMain(TRUE);
i++;
while (pM->m_pObjMap[i].pclsid != NULL)
{
TRACE("Initializing object %i %p\n",i,p[i].pfnObjectMain);
if (p[i].pfnObjectMain)
p[i].pfnObjectMain(TRUE);
i++;
}
}
return S_OK;