From 00f72a32fd4b58a98c561ee387ee5a81ea21abfd Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 22 Apr 2005 19:04:18 +0000
Subject: [PATCH] Add a definition for _ATL_REGMAP_ENTRY in atlbase.h. Fix the
 prototype of AtlModuleUpdateRegistryFromResourceD() so it uses the right
 pointer types.

---
 dlls/atl/atl_main.c    | 3 ++-
 dlls/atl/atlbase.h     | 6 ++++++
 tools/winapi/win32.api | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index f4b48c92e18..46e0117dcb2 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -32,6 +32,7 @@
 #include "objidl.h"
 #include "ole2.h"
 #include "atlbase.h"
+#include "atliface.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
@@ -169,7 +170,7 @@ HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* p
  *
  */
 HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes,
-		BOOL bRegister, /* struct _ATL_REGMAP_ENTRY* */ void* pMapEntries, /* IRegistrar* */ void* pReg)
+		BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg)
 {
     HINSTANCE hInst = pM->m_hInst;
     /* everything inside this function below this point
diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h
index 8715f358a11..1e7e2c62777 100644
--- a/dlls/atl/atlbase.h
+++ b/dlls/atl/atlbase.h
@@ -128,6 +128,12 @@ typedef struct _ATL_INTMAP_ENTRY_TAG
     _ATL_CREATORARGFUNC* pFunc;
 } _ATL_INTMAP_ENTRY;
 
+struct _ATL_REGMAP_ENTRY
+{
+    LPCOLESTR szKey;
+    LPCOLESTR szData;
+};
+
 HRESULT WINAPI AtlModuleInit(_ATL_MODULEA* pM, _ATL_OBJMAP_ENTRYA* p, HINSTANCE h);
 HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEA* pM, DWORD dwClsContext, DWORD dwFlags);
 HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEA* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index c84fec74790..41c8b324c97 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -196,6 +196,7 @@ _ATL_MODULEW *
 _ATL_OBJMAP_ENTRYA *
 CLSID *
 IID *
+IRegistrar *
 IStream *
 IStream **
 IUnknown *
@@ -205,6 +206,7 @@ LPVOID
 LPVOID *
 REFCLSID
 REFIID
+struct _ATL_REGMAP_ENTRY *
 void *
 
 %str
-- 
2.11.4.GIT