marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Better match the PSDK types and fix the winapi_check warnings.

oldstable
Francois Gouget 2007-08-04 03:13:39 +02:00 committed by Alexandre Julliard
parent cace3f9e8c
commit f67fd2cfa4
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/crypt32/cert.c
View File

@ -1338,7 +1338,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType, DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
const void *pvHashAuxInfo, PBYTE pbEncoded, DWORD *pcbEncoded) const void *pvHashAuxInfo, BYTE *pbEncoded, DWORD *pcbEncoded)
{ {
BOOL ret; BOOL ret;
DWORD encodedSize, hashSize; DWORD encodedSize, hashSize;

2
dlls/crypt32/main.c
View File

@ -186,7 +186,7 @@ BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name,
return ret; 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; static int ret = 8;
ret++; ret++;

2
include/wincrypt.h
View File

@ -3771,7 +3771,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWO
BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType, DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, 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, BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv,
DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded,

24
tools/winapi/win32.api
View File

@ -696,13 +696,17 @@ ALG_ID
BOOL BOOL
DWORD DWORD
HANDLE HANDLE
HCRYPTMSG
HCRYPTPROV HCRYPTPROV
HCRYPTPROV_LEGACY
HCRYPTPROV_OR_NCRYPT_KEY_HANDLE
HMODULE HMODULE
LONG LONG
ULONG ULONG
%ptr %ptr
BOOL *
BYTE * BYTE *
CERT_EXTENSION[] CERT_EXTENSION[]
CRYPT_ATTRIBUTE[] CRYPT_ATTRIBUTE[]
@ -711,8 +715,11 @@ CRYPTPROTECT_PROMPTSTRUCT *
DATA_BLOB * DATA_BLOB *
DWORD * DWORD *
GUID * GUID *
HCERTCHAINENGINE
HCERTCHAINENGINE *
HCERTSTORE HCERTSTORE
HCERTSTORE * HCERTSTORE *
HCRYPTPROV_OR_NCRYPT_KEY_HANDLE *
HCRYPTKEY * HCRYPTKEY *
HCRYPTMSG * HCRYPTMSG *
HCRYPTOIDFUNCADDR HCRYPTOIDFUNCADDR
@ -720,10 +727,13 @@ HCRYPTOIDFUNCADDR *
HCRYPTOIDFUNCSET HCRYPTOIDFUNCSET
HLRUCACHE HLRUCACHE
HLRUCACHE * HLRUCACHE *
LPCSTR *
LPCWSTR *
LPFILETIME LPFILETIME
LPSTR * LPSTR *
LPVOID LPVOID
LPWSTR * LPWSTR *
PCCERT_CHAIN_CONTEXT *
PCCERT_CONTEXT PCCERT_CONTEXT
PCCERT_CONTEXT * PCCERT_CONTEXT *
PCCRL_CONTEXT PCCRL_CONTEXT
@ -731,22 +741,36 @@ PCCRL_CONTEXT *
PCCRYPT_OID_INFO PCCRYPT_OID_INFO
PCCTL_CONTEXT PCCTL_CONTEXT
PCCTL_CONTEXT * PCCTL_CONTEXT *
PCERT_CHAIN_ENGINE_CONFIG
PCERT_CHAIN_PARA
PCERT_ENHKEY_USAGE PCERT_ENHKEY_USAGE
PCERT_EXTENSION PCERT_EXTENSION
PCERT_EXTENSIONS
PCERT_INFO PCERT_INFO
PCERT_NAME_BLOB PCERT_NAME_BLOB
PCERT_NAME_INFO PCERT_NAME_INFO
PCERT_PUBLIC_KEY_INFO PCERT_PUBLIC_KEY_INFO
PCERT_RDN_ATTR PCERT_RDN_ATTR
PCERT_RDN_VALUE_BLOB PCERT_RDN_VALUE_BLOB
PCMSG_STREAM_INFO
PCRL_ENTRY *
PCRL_INFO
PCRL_INFO[]
PCRYPT_ALGORITHM_IDENTIFIER PCRYPT_ALGORITHM_IDENTIFIER
PCRYPT_ATTRIBUTE PCRYPT_ATTRIBUTE
PCRYPT_DECODE_PARA PCRYPT_DECODE_PARA
PCRYPT_ENCODE_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 PFN_CRYPT_ENUM_OID_INFO
PSYSTEMTIME
PVOID PVOID
SIP_ADD_NEWPROVIDER * SIP_ADD_NEWPROVIDER *
SIP_DISPATCH_INFO * SIP_DISPATCH_INFO *
SIP_INDIRECT_DATA *
SIP_SUBJECTINFO *
int * int *
void * void *
void ** void **