Francois Gouget : crypt32:
Better match the PSDK types and fix the winapi_check warnings.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 6 08:03:43 CDT 2007
Module: wine
Branch: master
Commit: f67fd2cfa4538772d21ce535b9841e4fd9c8bb5d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67fd2cfa4538772d21ce535b9841e4fd9c8bb5d
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Aug 4 03:13:39 2007 +0200
crypt32: Better match the PSDK types and fix the winapi_check warnings.
---
dlls/crypt32/cert.c | 2 +-
dlls/crypt32/main.c | 2 +-
include/wincrypt.h | 2 +-
tools/winapi/win32.api | 24 ++++++++++++++++++++++++
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 7fbfd22..cc9de4b 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -1338,7 +1338,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
- const void *pvHashAuxInfo, PBYTE pbEncoded, DWORD *pcbEncoded)
+ const void *pvHashAuxInfo, BYTE *pbEncoded, DWORD *pcbEncoded)
{
BOOL ret;
DWORD encodedSize, hashSize;
diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c
index a377b24..c311ce9 100644
--- a/dlls/crypt32/main.c
+++ b/dlls/crypt32/main.c
@@ -186,7 +186,7 @@ BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name,
return ret;
}
-int WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z)
+DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z)
{
static int ret = 8;
ret++;
diff --git a/include/wincrypt.h b/include/wincrypt.h
index 0661890..93e9459 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -3771,7 +3771,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWO
BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
- const void *pvHashAuxInfo, PBYTE pbEncoded, DWORD *pcbEncoded);
+ const void *pvHashAuxInfo, BYTE *pbEncoded, DWORD *pcbEncoded);
BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv,
DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded,
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 725a7c2..c1e4003 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -696,13 +696,17 @@ ALG_ID
BOOL
DWORD
HANDLE
+HCRYPTMSG
HCRYPTPROV
+HCRYPTPROV_LEGACY
+HCRYPTPROV_OR_NCRYPT_KEY_HANDLE
HMODULE
LONG
ULONG
%ptr
+BOOL *
BYTE *
CERT_EXTENSION[]
CRYPT_ATTRIBUTE[]
@@ -711,8 +715,11 @@ CRYPTPROTECT_PROMPTSTRUCT *
DATA_BLOB *
DWORD *
GUID *
+HCERTCHAINENGINE
+HCERTCHAINENGINE *
HCERTSTORE
HCERTSTORE *
+HCRYPTPROV_OR_NCRYPT_KEY_HANDLE *
HCRYPTKEY *
HCRYPTMSG *
HCRYPTOIDFUNCADDR
@@ -720,10 +727,13 @@ HCRYPTOIDFUNCADDR *
HCRYPTOIDFUNCSET
HLRUCACHE
HLRUCACHE *
+LPCSTR *
+LPCWSTR *
LPFILETIME
LPSTR *
LPVOID
LPWSTR *
+PCCERT_CHAIN_CONTEXT *
PCCERT_CONTEXT
PCCERT_CONTEXT *
PCCRL_CONTEXT
@@ -731,22 +741,36 @@ PCCRL_CONTEXT *
PCCRYPT_OID_INFO
PCCTL_CONTEXT
PCCTL_CONTEXT *
+PCERT_CHAIN_ENGINE_CONFIG
+PCERT_CHAIN_PARA
PCERT_ENHKEY_USAGE
PCERT_EXTENSION
+PCERT_EXTENSIONS
PCERT_INFO
PCERT_NAME_BLOB
PCERT_NAME_INFO
PCERT_PUBLIC_KEY_INFO
PCERT_RDN_ATTR
PCERT_RDN_VALUE_BLOB
+PCMSG_STREAM_INFO
+PCRL_ENTRY *
+PCRL_INFO
+PCRL_INFO[]
PCRYPT_ALGORITHM_IDENTIFIER
PCRYPT_ATTRIBUTE
PCRYPT_DECODE_PARA
PCRYPT_ENCODE_PARA
+PCRYPT_INTEGER_BLOB
+PCRYPT_KEY_PROV_INFO
+PCRYPT_VERIFY_MESSAGE_PARA
+PFN_CERT_ENUM_SYSTEM_STORE
PFN_CRYPT_ENUM_OID_INFO
+PSYSTEMTIME
PVOID
SIP_ADD_NEWPROVIDER *
SIP_DISPATCH_INFO *
+SIP_INDIRECT_DATA *
+SIP_SUBJECTINFO *
int *
void *
void **
More information about the wine-cvs
mailing list