mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 05:21:08 +00:00
atl: Moved AtlRegisterTypeLib to atl.c to avoid importing atl80.dll in atl.dll.
This commit is contained in:
parent
f285b06738
commit
16acd97eb0
|
@ -1,6 +1,6 @@
|
|||
MODULE = atl.dll
|
||||
IMPORTLIB = atl
|
||||
IMPORTS = uuid atl80 oleaut32 ole32 user32 gdi32 advapi32
|
||||
IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32
|
||||
EXTRADEFS = -D_ATL_VER=_ATL_VER_30
|
||||
PARENTSRC = ../atl100
|
||||
|
||||
|
|
|
@ -396,6 +396,31 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex,
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
#if _ATL_VER <= _ATL_VER_80
|
||||
|
||||
/***********************************************************************
|
||||
* AtlRegisterTypeLib [atl80.19]
|
||||
*/
|
||||
HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index)
|
||||
{
|
||||
ITypeLib *typelib;
|
||||
BSTR path;
|
||||
HRESULT hres;
|
||||
|
||||
TRACE("(%p %s)\n", inst, debugstr_w(index));
|
||||
|
||||
hres = AtlLoadTypeLib(inst, index, &path, &typelib);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
||||
hres = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */
|
||||
ITypeLib_Release(typelib);
|
||||
SysFreeString(path);
|
||||
return hres;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if _ATL_VER > _ATL_VER_30
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
@ -68,24 +68,3 @@ HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib
|
|||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* AtlRegisterTypeLib [atl80.19]
|
||||
*/
|
||||
HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index)
|
||||
{
|
||||
ITypeLib *typelib;
|
||||
BSTR path;
|
||||
HRESULT hres;
|
||||
|
||||
TRACE("(%p %s)\n", inst, debugstr_w(index));
|
||||
|
||||
hres = AtlLoadTypeLib(inst, index, &path, &typelib);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
||||
hres = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */
|
||||
ITypeLib_Release(typelib);
|
||||
SysFreeString(path);
|
||||
return hres;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue