return S_OK;
}
+static _ATL_OBJMAP_ENTRYW_V1 *get_objmap_entry( _ATL_MODULEW *mod, unsigned int index )
+{
+ _ATL_OBJMAP_ENTRYW_V1 *ret;
+
+ if (mod->cbSize == ATLVer1Size)
+ ret = (_ATL_OBJMAP_ENTRYW_V1 *)mod->m_pObjMap + index;
+ else
+ ret = (_ATL_OBJMAP_ENTRYW_V1 *)(mod->m_pObjMap + index);
+
+ if (!ret->pclsid) ret = NULL;
+ return ret;
+}
+
HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex,
BSTR *pbstrPath, ITypeLib **ppTypeLib)
{
HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContext,
DWORD dwFlags)
{
+ _ATL_OBJMAP_ENTRYW_V1 *obj;
HRESULT hRes = S_OK;
int i=0;
if (pM == NULL)
return E_INVALIDARG;
- while(pM->m_pObjMap[i].pclsid != NULL)
+ while ((obj = get_objmap_entry( pM, i++ )))
{
IUnknown* pUnknown;
- _ATL_OBJMAP_ENTRYW *obj = &(pM->m_pObjMap[i]);
HRESULT rc;
TRACE("Registering object %i\n",i);
IUnknown_Release(pUnknown);
}
}
- i++;
}
return hRes;
*/
HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* clsid)
{
+ const _ATL_OBJMAP_ENTRYW_V1 *obj;
int i;
HRESULT hRes;
if (pM == NULL)
return E_INVALIDARG;
- for (i = 0; pM->m_pObjMap[i].pclsid != NULL; i++) /* register CLSIDs */
+ for (i = 0; (obj = get_objmap_entry( pM, i )) != NULL; i++) /* register CLSIDs */
{
- if (!clsid || IsEqualCLSID(pM->m_pObjMap[i].pclsid, clsid))
+ if (!clsid || IsEqualCLSID(obj->pclsid, clsid))
{
- const _ATL_OBJMAP_ENTRYW *obj = &pM->m_pObjMap[i];
-
TRACE("Registering clsid %s\n", debugstr_guid(obj->pclsid));
hRes = obj->pfnUpdateRegistry(TRUE); /* register */
if (FAILED(hRes))
HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid,
REFIID riid, LPVOID *ppv)
{
+ _ATL_OBJMAP_ENTRYW_V1 *obj;
int i;
HRESULT hres = CLASS_E_CLASSNOTAVAILABLE;
if (pm == NULL)
return E_INVALIDARG;
- for (i = 0; pm->m_pObjMap[i].pclsid != NULL; i++)
+ for (i = 0; (obj = get_objmap_entry( pm, i )) != NULL; i++)
{
- if (IsEqualCLSID(pm->m_pObjMap[i].pclsid, rclsid))
+ if (IsEqualCLSID(obj->pclsid, rclsid))
{
- _ATL_OBJMAP_ENTRYW *obj = &pm->m_pObjMap[i];
-
TRACE("found object %i\n", i);
if (obj->pfnGetClassObject)
{
typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void);
typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw);
+typedef struct _ATL_OBJMAP_ENTRYA_V1_TAG
+{
+ const CLSID* pclsid;
+ HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister);
+ _ATL_CREATORFUNC* pfnGetClassObject;
+ _ATL_CREATORFUNC* pfnCreateInstance;
+ IUnknown* pCF;
+ DWORD dwRegister;
+ _ATL_DESCRIPTIONFUNCA* pfnGetObjectDescription;
+}_ATL_OBJMAP_ENTRYA_V1;
+
+typedef struct _ATL_OBJMAP_ENTRYW_V1_TAG
+{
+ const CLSID* pclsid;
+ HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister);
+ _ATL_CREATORFUNC* pfnGetClassObject;
+ _ATL_CREATORFUNC* pfnCreateInstance;
+ IUnknown* pCF;
+ DWORD dwRegister;
+ _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription;
+} _ATL_OBJMAP_ENTRYW_V1;
+
typedef struct _ATL_OBJMAP_ENTRYA_TAG
{
const CLSID* pclsid;