From 80911c12f45f537561b20edea0868071e66d8843 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Sun, 28 Oct 2007 02:49:27 +0200
Subject: [PATCH] crypt32: Better match the PSDK types and update win32.api to
 fix the winapi_check warnings.

---
 dlls/crypt32/cert.c    |  2 +-
 include/wincrypt.h     |  2 +-
 tools/winapi/win32.api | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 976589b7edc..844b0542a95 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -1242,7 +1242,7 @@ typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD,
  void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS);
 
 BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
- DWORD cContext, void *rgpvContext[], DWORD dwFlags,
+ DWORD cContext, PVOID rgpvContext[], DWORD dwFlags,
  PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus)
 {
     BOOL ret;
diff --git a/include/wincrypt.h b/include/wincrypt.h
index e913f6b97b6..41b9e2efd4f 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -3962,7 +3962,7 @@ BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType,
  PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus);
 
 BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
- DWORD cContext, void *rgpvContext[], DWORD dwFlags,
+ DWORD cContext, PVOID rgpvContext[], DWORD dwFlags,
  PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus);
 
 BOOL WINAPI CryptExportPublicKeyInfo(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec,
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index c3c33a6d82f..f0a6490b539 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -115,6 +115,8 @@ PACL *
 PACTRL_ACCESSW *
 PACTRL_AUDITW *
 PBOOL
+PCREDENTIALA **
+PCREDENTIALW **
 PDWORD
 PEXPLICIT_ACCESSA
 PEXPLICIT_ACCESSA *
@@ -661,6 +663,12 @@ ULONG
 PBOOL
 PCREDUI_INFOW
 PCtxtHandle
+PSTR *
+PWSTR *
+
+%str
+
+PCSTR
 
 %wstr
 
@@ -760,6 +768,8 @@ PCERT_NAME_INFO
 PCERT_PUBLIC_KEY_INFO
 PCERT_RDN_ATTR
 PCERT_RDN_VALUE_BLOB
+PCERT_REVOCATION_PARA
+PCERT_REVOCATION_STATUS
 PCMSG_STREAM_INFO
 PCRL_ENTRY *
 PCRL_INFO
@@ -775,6 +785,7 @@ PFN_CERT_ENUM_SYSTEM_STORE
 PFN_CRYPT_ENUM_OID_INFO
 PSYSTEMTIME
 PVOID
+PVOID[]
 SIP_ADD_NEWPROVIDER *
 SIP_DISPATCH_INFO *
 SIP_INDIRECT_DATA *
@@ -804,13 +815,17 @@ LPWSTR
 
 BOOL
 DWORD
+HCRYPTASYNC
 
 %ptr
 
 DWORD *
 LPVOID
+LPVOID *
 PCERT_REVOCATION_PARA
 PCERT_REVOCATION_STATUS
+PCRYPT_CREDENTIALS
+PCRYPT_RETRIEVE_AUX_INFO
 PCRYPT_URL_ARRAY
 PCRYPT_URL_INFO
 PVOID[]
@@ -819,6 +834,10 @@ PVOID[]
 
 LPCSTR
 
+%wstr
+
+LPCWSTR
+
 %%ctl3d32.dll
 
 %long
@@ -3220,6 +3239,7 @@ PROCESSINFOCLASS
 RTL_ATOM
 SECTION_INFORMATION_CLASS
 SECTION_INHERIT
+SECURITY_DESCRIPTOR_CONTROL
 SECURITY_IMPERSONATION_LEVEL
 SECURITY_INFORMATION
 SEMAPHORE_INFORMATION_CLASS
@@ -4989,6 +5009,7 @@ HLINEAPP
 HPHONE
 HPHONEAPP
 HWND
+LONG
 
 %ptr
 
@@ -5012,6 +5033,7 @@ LPLINEDEVSTATUS
 LPLINEDIALPARAMS
 LPLINEEXTENSIONID
 LPLINEFORWARDLIST
+LPLINEINITIALIZEEXPARAMS
 LPLINEGENERATETONE
 LPLINEMEDIACONTROLCALLSTATE
 LPLINEMEDIACONTROLDIGIT
@@ -5076,6 +5098,7 @@ UINT
 %ptr
 
 BINDINFO *
+CLSID *
 DWORD *
 FORMATETC *
 IBindCtx *