From 16acd97eb0f82c1ee7d40d1a2b105845d0b06528 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 13 Feb 2014 16:00:42 +0100
Subject: [PATCH] atl: Moved AtlRegisterTypeLib to atl.c to avoid importing
 atl80.dll in atl.dll.

---
 dlls/atl/Makefile.in |  2 +-
 dlls/atl100/atl.c    | 25 +++++++++++++++++++++++++
 dlls/atl80/atl80.c   | 21 ---------------------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index cf61896cb0e..396b9d67727 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -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
 
diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c
index afd8f776283..53c71814514 100644
--- a/dlls/atl100/atl.c
+++ b/dlls/atl100/atl.c
@@ -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
 
 /***********************************************************************
diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c
index b6aeddac493..ec1d4c8d719 100644
--- a/dlls/atl80/atl80.c
+++ b/dlls/atl80/atl80.c
@@ -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;
-}