system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-01 17:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

atl: Reimplemented AtlModuleRegisterTypeLib on top of AtlRegisterTypeLib.

Browse source
This commit is contained in:
Jacek Caban 2012-12-28 14:23:56 +01:00 committed by Alexandre Julliard
parent ef3f65b5ff
commit c0cfd44ce9
5 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -15380,7 +15380,7 @@ wine_fn_config_dll atl enable_atl implib
wine_fn_config_test dlls/atl/tests atl_test
wine_fn_config_dll atl100 enable_atl100 implib
wine_fn_config_test dlls/atl100/tests atl100_test
wine_fn_config_dll atl80 enable_atl80
wine_fn_config_dll atl80 enable_atl80 implib
wine_fn_config_dll authz enable_authz
wine_fn_config_dll avicap32 enable_avicap32 implib
wine_fn_config_dll avifil32 enable_avifil32 implib,po

2
configure.ac
View file

@ -2555,7 +2555,7 @@ WINE_CONFIG_DLL(atl,,[implib])
WINE_CONFIG_TEST(dlls/atl/tests)
WINE_CONFIG_DLL(atl100,,[implib])
WINE_CONFIG_TEST(dlls/atl100/tests)
WINE_CONFIG_DLL(atl80)
WINE_CONFIG_DLL(atl80,,[implib])
WINE_CONFIG_DLL(authz)
WINE_CONFIG_DLL(avicap32,,[implib])
WINE_CONFIG_DLL(avifil32,,[implib,po])

2
dlls/atl/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = atl.dll
IMPORTLIB = atl
IMPORTS = uuid atl100 oleaut32 ole32 user32
IMPORTS = uuid atl80 atl100 oleaut32 ole32 user32
EXTRADEFS = -D_ATL_VER=_ATL_VER_30
C_SRCS = atl_main.c

17
dlls/atl/atl_main.c
View file

@ -225,7 +225,7 @@ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const
if (bRegTypeLib)
{
hRes = AtlModuleRegisterTypeLib(pM, NULL);
hRes = AtlRegisterTypeLib(pM->m_hInstTypeLib, NULL);
if (FAILED(hRes))
return hRes;
}
@ -276,25 +276,12 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid,
*/
HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pm, LPCOLESTR lpszIndex)
{
HRESULT hRes;
BSTR path;
ITypeLib *typelib;
TRACE("%p %s\n", pm, debugstr_w(lpszIndex));
if (!pm)
return E_INVALIDARG;
hRes = AtlModuleLoadTypeLib(pm, lpszIndex, &path, &typelib);
if (SUCCEEDED(hRes))
{
hRes = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */
ITypeLib_Release(typelib);
SysFreeString(path);
}
return hRes;
return AtlRegisterTypeLib(pm->m_hInstTypeLib, lpszIndex);
}
/***********************************************************************

1
dlls/atl80/Makefile.in
View file

@ -1,4 +1,5 @@
MODULE = atl80.dll
IMPORTLIB = atl80
IMPORTS = atl100 oleaut32
EXTRADEFS = -D_ATL_VER=_ATL_VER_80