Jacek Caban : atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib.

Alexandre Julliard julliard at winehq.org
Tue Dec 11 14:41:15 CST 2012


Module: wine
Branch: master
Commit: 9e2d5cae7367a716f4b1ce08dcfe63d24f6acdd5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9e2d5cae7367a716f4b1ce08dcfe63d24f6acdd5

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Dec 11 13:03:04 2012 +0100

atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib.

---

 dlls/atl/atl_main.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index 415fbc3..8f8cd76 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -111,25 +111,12 @@ static _ATL_OBJMAP_ENTRYW_V1 *get_objmap_entry( _ATL_MODULEW *mod, unsigned int
 HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex,
                                     BSTR *pbstrPath, ITypeLib **ppTypeLib)
 {
-    HRESULT hRes;
-    OLECHAR path[MAX_PATH+8]; /* leave some space for index */
-
     TRACE("(%p, %s, %p, %p)\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib);
 
     if (!pM)
         return E_INVALIDARG;
 
-    GetModuleFileNameW(pM->m_hInstTypeLib, path, MAX_PATH);
-    if (lpszIndex)
-        lstrcatW(path, lpszIndex);
-
-    hRes = LoadTypeLib(path, ppTypeLib);
-    if (FAILED(hRes))
-        return hRes;
-
-    *pbstrPath = SysAllocString(path);
-
-    return S_OK;
+    return AtlLoadTypeLib(pM->m_hInstTypeLib, lpszIndex, pbstrPath, ppTypeLib);
 }
 
 HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM)




More information about the wine-cvs mailing list