Francois Gouget : ole32:
Better match the PSDK types and fix the winapi_check warnings.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 20 14:18:59 CST 2007
Module: wine
Branch: master
Commit: f5c6a71a654568cc0bc5814eea949ddee8a2ec29
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c6a71a654568cc0bc5814eea949ddee8a2ec29
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Feb 20 15:45:28 2007 +0100
ole32: Better match the PSDK types and fix the winapi_check warnings.
---
dlls/ole32/compobj.c | 2 +-
include/objbase.h | 2 +-
tools/winapi/win32.api | 9 +++++++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index f1c6ebe..110223a 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3148,7 +3148,7 @@ static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg)
* MsgWaitForMultipleObjects, WaitForMultipleObjects.
*/
HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
- ULONG cHandles, const HANDLE* pHandles, LPDWORD lpdwindex)
+ ULONG cHandles, LPHANDLE pHandles, LPDWORD lpdwindex)
{
HRESULT hr = S_OK;
DWORD start_time = GetTickCount();
diff --git a/include/objbase.h b/include/objbase.h
index f85fdcd..79603a0 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -416,7 +416,7 @@ typedef enum tagCOWAIT_FLAGS
COWAIT_ALERTABLE = 0x00000002
} COWAIT_FLAGS;
-HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHandles,const HANDLE* pHandles,LPDWORD lpdwindex);
+HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHandles,LPHANDLE pHandles,LPDWORD lpdwindex);
/*****************************************************************************
* GUID API
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 0f6780a..1924f46 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -3101,10 +3101,10 @@ LONG
UINT
ULONG
int
-unsigned long
%ptr
+BIND_OPTS *
CLIPFORMAT *
CLSID *
COSERVERINFO *
@@ -3117,8 +3117,11 @@ HBITMAP *
HDC *
HENHMETAFILE *
HGLOBAL *
+HMETAFILE *
+HMETAFILEPICT *
HPALETTE *
HRESULT *
+IChannelHook *
ICreateErrorInfo **
IDataObject *
IDataObject **
@@ -3146,6 +3149,7 @@ LPDWORD
LPENUMFORMATETC *
LPENUMOLEVERB *
LPFORMATETC
+LPHANDLE
LPLOCKBYTES *
LPMALLOC *
LPMALLOCSPY
@@ -3180,6 +3184,7 @@ PSECURITY_DESCRIPTOR
REFCLSID
REFGUID
REFIID
+RPC_AUTHZ_HANDLE *
SNB
SNB *
SOLE_AUTHENTICATION_SERVICE *
@@ -3188,7 +3193,6 @@ STGOPTIONS *
ULONG *
WORD *
unsigned char *
-unsigned long *
void *
void **
@@ -3206,6 +3210,7 @@ void
BSTR
OLECHAR *
+LPCWSTR
WCHAR *
%%oleacc.dll
More information about the wine-cvs
mailing list