atl: Better match the PSDK types and fix the winapi_check warnings.
Francois Gouget
fgouget at free.fr
Wed Feb 7 09:22:55 CST 2007
---
dlls/atl/atl_main.c | 6 +++---
dlls/atl/atlbase.h | 7 ++++---
tools/winapi/win32.api | 24 +++++++++++++++++++++---
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index 5d61b8f..b03effc 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -209,7 +209,7 @@ IUnknown* WINAPI AtlComPtrAssign(IUnknown** pp, IUnknown *p)
}
-HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject)
+HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject)
{
int i = 0;
HRESULT rc = E_NOINTERFACE;
@@ -478,7 +478,7 @@ void WINAPI AtlPixelToHiMetric(const SIZEL* lpPix, SIZEL* lpHiMetric)
/***********************************************************************
* AtlModuleAddCreateWndData [ATL.@]
*/
-void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, LPVOID pvObject)
+void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject)
{
TRACE("(%p, %p, %p)\n", pM, pData, pvObject);
@@ -496,7 +496,7 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData
* records from the current thread from a list
*
*/
-LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM)
+void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM)
{
_AtlCreateWndData **ppData;
diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h
index 0aec2e9..ad7acfa 100644
--- a/dlls/atl/atlbase.h
+++ b/dlls/atl/atlbase.h
@@ -146,12 +146,13 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown*,HWND,IUnknown**);
HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);
HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);
HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream);
-HRESULT WINAPI AtlInternalQueryInterface(LPVOID pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject);
+HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject);
HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream);
-void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, LPVOID pvObject);
+void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject);
HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw);
-LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);
+void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);
HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h);
+HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib);
HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW* pM, DWORD dwClsContext, DWORD dwFlags);
HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID);
HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 12c6d08..ee615dd 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -233,11 +233,13 @@ REFIID
%long
+ATOM
BOOL
DWORD
HINSTANCE
HRESULT
HWND
+LPARAM
%long --pointer
@@ -246,27 +248,43 @@ DWORD_PTR
%ptr
_ATL_INTMAP_ENTRY *
-_ATL_MODULEA *
_ATL_MODULEW *
-_ATL_OBJMAP_ENTRYA *
+_ATL_OBJMAP_ENTRYW *
_ATL_TERMFUNC *
+_ATL_WNDCLASSINFOW *
+_AtlCreateWndData *
+BSTR *
CLSID *
+DLGPROC
IID *
IRegistrar *
IStream *
IStream **
+ITypeLib **
IUnknown *
IUnknown **
LPDWORD
-LPVOID
LPVOID *
REFCLSID
REFIID
+SIZEL *
+WNDPROC *
struct _ATL_REGMAP_ENTRY *
+void *
+void **
%str
LPCOLESTR
+LPCSTR
+
+%wstr
+
+LPCWSTR
+
+%void
+
+void
%%avicap32.dll
--
1.4.4.3
More information about the wine-patches
mailing list