Fix the AtlModuleUpdateRegistryFromResourceD() prototype

[Francois Gouget]

Changelog:

  * dlls/atl/atl_main.c
    dlls/atl/atlbase.h
    tools/winapi/win32.api

    Francois Gouget <fgouget at free.fr>
    Add a definition for _ATL_REGMAP_ENTRY in atlbase.h.
    Fix the prototype of AtlModuleUpdateRegistryFromResourceD() so it 
uses the right pointer types.
    Fixes a winapi_check warning.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
               Linux: Because rebooting is for adding new hardware
-------------- next part --------------
Index: dlls/atl/atl_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/atl/atl_main.c,v
retrieving revision 1.9
diff -u -p -r1.9 atl_main.c
--- dlls/atl/atl_main.c	16 Mar 2005 19:53:41 -0000	1.9
+++ dlls/atl/atl_main.c	20 Apr 2005 11:35:11 -0000
@@ -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
  *
  */
 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
Index: dlls/atl/atlbase.h
===================================================================
RCS file: /var/cvs/wine/dlls/atl/atlbase.h,v
retrieving revision 1.2
diff -u -p -r1.2 atlbase.h
--- dlls/atl/atlbase.h	28 Sep 2004 03:14:11 -0000	1.2
+++ dlls/atl/atlbase.h	20 Apr 2005 11:32:31 -0000
@@ -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);
Index: tools/winapi/win32.api
===================================================================
RCS file: /var/cvs/wine/tools/winapi/win32.api,v
retrieving revision 1.25
diff -u -p -r1.25 win32.api
--- tools/winapi/win32.api	29 Mar 2005 11:31:39 -0000	1.25
+++ tools/winapi/win32.api	20 Apr 2005 12:02:46 -0000
@@ -196,6 +198,7 @@ _ATL_MODULEW *
 _ATL_OBJMAP_ENTRYA *
 CLSID *
 IID *
+IRegistrar *
 IStream *
 IStream **
 IUnknown *
@@ -205,6 +208,7 @@ LPVOID
 LPVOID *
 REFCLSID
 REFIID
+struct _ATL_REGMAP_ENTRY *
 void *
 
 %str