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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b1335db353918324899e0206f4aabe85c74d4b25
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b1335db353918324899e0206f4aabe85c74d4b25

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Oct 23 15:31:27 2007 +0200

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

---

 dlls/advapi32/security.c      |    2 +-
 dlls/cryptnet/cryptnet_main.c |    2 +-
 include/winbase.h             |    2 +-
 tools/winapi/win32.api        |   22 ++++++++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 79f5a3a..4cab225 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -580,7 +580,7 @@ AdjustTokenGroups( HANDLE TokenHandle, BOOL ResetToDefault, PTOKEN_GROUPS NewSta
 BOOL WINAPI
 AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges,
                        PTOKEN_PRIVILEGES NewState, DWORD BufferLength,
-                       PTOKEN_PRIVILEGES PreviousState, LPDWORD ReturnLength )
+                       PTOKEN_PRIVILEGES PreviousState, PDWORD ReturnLength )
 {
     NTSTATUS status;
 
diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c
index dd66a10..603185d 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -1305,7 +1305,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid,
  *    CertDllVerifyRevocation (CRYPTNET.@)
  */
 BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
- DWORD cContext, void *rgpvContext[], DWORD dwFlags,
+ DWORD cContext, PVOID rgpvContext[], DWORD dwFlags,
  PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus)
 {
    FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType,
diff --git a/include/winbase.h b/include/winbase.h
index 2734ecb..7ca6e84 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1253,7 +1253,7 @@ BOOL        WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY
 BOOL        WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL);
 #define     AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm)
 BOOL        WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL);
-BOOL        WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,LPDWORD);
+BOOL        WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
 BOOL        WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *);
 BOOL        WINAPI AllocateLocallyUniqueId(PLUID);
 BOOL        WINAPI AreAllAccessesGranted(DWORD,DWORD);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 6864f2e..c3c33a6 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -147,6 +147,7 @@ PSID *
 PSID_IDENTIFIER_AUTHORITY
 PSID_NAME_USE
 PTOKEN_GROUPS
+PTOKEN_PRIVILEGES
 PTRACE_GUID_REGISTRATION
 PTRACEHANDLE
 PTRUSTED_DOMAIN_AUTH_INFORMATION
@@ -797,6 +798,27 @@ void
 LPCWSTR
 LPWSTR
 
+%%cryptnet.dll
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+DWORD *
+LPVOID
+PCERT_REVOCATION_PARA
+PCERT_REVOCATION_STATUS
+PCRYPT_URL_ARRAY
+PCRYPT_URL_INFO
+PVOID[]
+
+%str
+
+LPCSTR
+
 %%ctl3d32.dll
 
 %long