Francois Gouget : Better match the PSDK types and update win32. api to fix the winapi_check warnings.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 11:28:06 CDT 2007
Module: wine
Branch: master
Commit: d16a634c380bdc968c158a1bc192a604564a5a80
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16a634c380bdc968c158a1bc192a604564a5a80
Author: Francois Gouget <fgouget at free.fr>
Date: Sun Oct 14 14:36:21 2007 +0200
Better match the PSDK types and update win32.api to fix the winapi_check warnings.
---
dlls/advapi32/security.c | 4 ++--
dlls/shell32/shellord.c | 2 +-
tools/winapi/win32.api | 21 +++++++++++++++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 2e8a124..f95acf7 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -3948,7 +3948,7 @@ static BOOL DumpSacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULO
/******************************************************************************
* ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@]
*/
-BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION RequestedInformation, LPWSTR *OutputString, ULONG *OutputLen)
+BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION RequestedInformation, LPWSTR *OutputString, PULONG OutputLen)
{
ULONG len;
WCHAR *wptr, *wstr;
@@ -3999,7 +3999,7 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCR
/******************************************************************************
* ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@]
*/
-BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION Information, LPSTR *OutputString, ULONG *OutputLen)
+BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION Information, LPSTR *OutputString, PULONG OutputLen)
{
LPWSTR wstr;
ULONG len;
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index e3b77cf..57d6b82 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1594,7 +1594,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_if
/*************************************************************************
* SHCreatePropSheetExtArrayEx [SHELL32.194]
*/
-HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj)
+HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, LPDATAOBJECT pDataObj)
{
static const WCHAR szPropSheetSubKey[] = {'s','h','e','l','l','e','x','\\','P','r','o','p','e','r','t','y','S','h','e','e','t','H','a','n','d','l','e','r','s',0};
WCHAR szHandler[64];
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index a591d7c..6864f2e 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -1348,6 +1348,12 @@ REFIID
%long
BOOL
+DWORD
+EFaultRepRetVal
+
+%ptr
+
+LPEXCEPTION_POINTERS
%str
@@ -1739,6 +1745,7 @@ void
DWORD
HRESULT
HWND
+ULONG
%ptr
@@ -2201,9 +2208,15 @@ WCHAR *
%%localspl.dll
+%long
+
+BOOL
+DWORD
+
%ptr
LPMONITOREX
+LPPRINTPROVIDOR
%wstr
@@ -3975,8 +3988,10 @@ void
BOOLEAN
DWORD
+HANDLE
LONG
PDH_HCOUNTER
+PDH_HLOG
PDH_HQUERY
PDH_STATUS
@@ -4921,6 +4936,7 @@ HANDLE
LPBYTE
LPVOID
+LPVOID *
%wstr
@@ -5889,6 +5905,10 @@ void **
BOOL
+%ptr
+
+WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *
+
%%wininet.dll
%double
@@ -6448,6 +6468,7 @@ LPWSTR
BOOL
DWORD
HANDLE
+HWND
WTS_INFO_CLASS
%ptr
More information about the wine-cvs
mailing list