Better match the PSDK types and update win32.api to fix the winapi_check warnings.

This commit is contained in:
Francois Gouget 2007-10-14 14:36:21 +02:00 committed by Alexandre Julliard
parent f2b3843b5e
commit d16a634c38
3 changed files with 24 additions and 3 deletions

View File

@ -3948,7 +3948,7 @@ static BOOL DumpSacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULO
/****************************************************************************** /******************************************************************************
* ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] * 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; ULONG len;
WCHAR *wptr, *wstr; WCHAR *wptr, *wstr;
@ -3999,7 +3999,7 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCR
/****************************************************************************** /******************************************************************************
* ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] * 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; LPWSTR wstr;
ULONG len; ULONG len;

View File

@ -1594,7 +1594,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_if
/************************************************************************* /*************************************************************************
* SHCreatePropSheetExtArrayEx [SHELL32.194] * 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}; 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]; WCHAR szHandler[64];

View File

@ -1348,6 +1348,12 @@ REFIID
%long %long
BOOL BOOL
DWORD
EFaultRepRetVal
%ptr
LPEXCEPTION_POINTERS
%str %str
@ -1739,6 +1745,7 @@ void
DWORD DWORD
HRESULT HRESULT
HWND HWND
ULONG
%ptr %ptr
@ -2201,9 +2208,15 @@ WCHAR *
%%localspl.dll %%localspl.dll
%long
BOOL
DWORD
%ptr %ptr
LPMONITOREX LPMONITOREX
LPPRINTPROVIDOR
%wstr %wstr
@ -3975,8 +3988,10 @@ void
BOOLEAN BOOLEAN
DWORD DWORD
HANDLE
LONG LONG
PDH_HCOUNTER PDH_HCOUNTER
PDH_HLOG
PDH_HQUERY PDH_HQUERY
PDH_STATUS PDH_STATUS
@ -4921,6 +4936,7 @@ HANDLE
LPBYTE LPBYTE
LPVOID LPVOID
LPVOID *
%wstr %wstr
@ -5889,6 +5905,10 @@ void **
BOOL BOOL
%ptr
WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *
%%wininet.dll %%wininet.dll
%double %double
@ -6448,6 +6468,7 @@ LPWSTR
BOOL BOOL
DWORD DWORD
HANDLE HANDLE
HWND
WTS_INFO_CLASS WTS_INFO_CLASS
%ptr %ptr