ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atl: Better match the PSDK types and fix the winapi_check warnings.

This commit is contained in:
Francois Gouget 2007-02-07 16:22:55 +01:00 committed by Alexandre Julliard
parent ba0d490b1c
commit 1fbd417ce9
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/atl/atl_main.c
View File

@ -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; int i = 0;
HRESULT rc = E_NOINTERFACE; HRESULT rc = E_NOINTERFACE;
@ -478,7 +478,7 @@ void WINAPI AtlPixelToHiMetric(const SIZEL* lpPix, SIZEL* lpHiMetric)
/*********************************************************************** /***********************************************************************
* AtlModuleAddCreateWndData [ATL.@] * 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); 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 * records from the current thread from a list
* *
*/ */
LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM)
{ {
_AtlCreateWndData **ppData; _AtlCreateWndData **ppData;

7
dlls/atl/atlbase.h
View File

@ -146,12 +146,13 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown*,HWND,IUnknown**);
HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**); HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);
HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*); HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);
HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); 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); 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); 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 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 AtlModuleRegisterClassObjects(_ATL_MODULEW* pM, DWORD dwClsContext, DWORD dwFlags);
HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID); HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID);
HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex); HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex);

24
tools/winapi/win32.api
View File

@ -233,11 +233,13 @@ REFIID
%long %long
ATOM
BOOL BOOL
DWORD DWORD
HINSTANCE HINSTANCE
HRESULT HRESULT
HWND HWND
LPARAM
%long --pointer %long --pointer
@ -246,27 +248,43 @@ DWORD_PTR
%ptr %ptr
_ATL_INTMAP_ENTRY * _ATL_INTMAP_ENTRY *
_ATL_MODULEA *
_ATL_MODULEW * _ATL_MODULEW *
_ATL_OBJMAP_ENTRYA * _ATL_OBJMAP_ENTRYW *
_ATL_TERMFUNC * _ATL_TERMFUNC *
_ATL_WNDCLASSINFOW *
_AtlCreateWndData *
BSTR *
CLSID * CLSID *
DLGPROC
IID * IID *
IRegistrar * IRegistrar *
IStream * IStream *
IStream ** IStream **
ITypeLib **
IUnknown * IUnknown *
IUnknown ** IUnknown **
LPDWORD LPDWORD
LPVOID
LPVOID * LPVOID *
REFCLSID REFCLSID
REFIID REFIID
SIZEL *
WNDPROC *
struct _ATL_REGMAP_ENTRY * struct _ATL_REGMAP_ENTRY *
void *
void **
%str %str
LPCOLESTR LPCOLESTR
LPCSTR
%wstr
LPCWSTR
%void
void
%%avicap32.dll %%avicap32.dll