crypt32: Get rid of remaining P* typedefs.
This commit is contained in:
parent
cc7b0d4019
commit
0a5cb15f94
|
@ -1739,7 +1739,7 @@ typedef struct _OLD_CERT_REVOCATION_STATUS {
|
||||||
DWORD dwIndex;
|
DWORD dwIndex;
|
||||||
DWORD dwError;
|
DWORD dwError;
|
||||||
DWORD dwReason;
|
DWORD dwReason;
|
||||||
} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS;
|
} OLD_CERT_REVOCATION_STATUS;
|
||||||
|
|
||||||
typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD,
|
typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD,
|
||||||
void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS);
|
void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS);
|
||||||
|
|
|
@ -2548,7 +2548,7 @@ static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain(
|
||||||
typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS {
|
typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS {
|
||||||
DWORD cbSize;
|
DWORD cbSize;
|
||||||
CERT_USAGE_MATCH RequestedUsage;
|
CERT_USAGE_MATCH RequestedUsage;
|
||||||
} CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS;
|
} CERT_CHAIN_PARA_NO_EXTRA_FIELDS;
|
||||||
|
|
||||||
static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain,
|
static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain,
|
||||||
LPFILETIME pTime, HCERTSTORE hAdditionalStore,
|
LPFILETIME pTime, HCERTSTORE hAdditionalStore,
|
||||||
|
|
|
@ -603,20 +603,20 @@ typedef struct _CMSG_SIGNER_ENCODE_INFO_WITH_CMS
|
||||||
CERT_ID SignerId;
|
CERT_ID SignerId;
|
||||||
CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm;
|
CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm;
|
||||||
void *pvHashEncryptionAuxInfo;
|
void *pvHashEncryptionAuxInfo;
|
||||||
} CMSG_SIGNER_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNER_ENCODE_INFO_WITH_CMS;
|
} CMSG_SIGNER_ENCODE_INFO_WITH_CMS;
|
||||||
|
|
||||||
typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS
|
typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS
|
||||||
{
|
{
|
||||||
DWORD cbSize;
|
DWORD cbSize;
|
||||||
DWORD cSigners;
|
DWORD cSigners;
|
||||||
PCMSG_SIGNER_ENCODE_INFO_WITH_CMS rgSigners;
|
CMSG_SIGNER_ENCODE_INFO_WITH_CMS *rgSigners;
|
||||||
DWORD cCertEncoded;
|
DWORD cCertEncoded;
|
||||||
PCERT_BLOB rgCertEncoded;
|
PCERT_BLOB rgCertEncoded;
|
||||||
DWORD cCrlEncoded;
|
DWORD cCrlEncoded;
|
||||||
PCRL_BLOB rgCrlEncoded;
|
PCRL_BLOB rgCrlEncoded;
|
||||||
DWORD cAttrCertEncoded;
|
DWORD cAttrCertEncoded;
|
||||||
PCERT_BLOB rgAttrCertEncoded;
|
PCERT_BLOB rgAttrCertEncoded;
|
||||||
} CMSG_SIGNED_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNED_ENCODE_INFO_WITH_CMS;
|
} CMSG_SIGNED_ENCODE_INFO_WITH_CMS;
|
||||||
|
|
||||||
static BOOL CRYPT_IsValidSigner(const CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
|
static BOOL CRYPT_IsValidSigner(const CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
|
||||||
{
|
{
|
||||||
|
@ -1474,7 +1474,7 @@ typedef struct _CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS
|
||||||
PCERT_BLOB rgAttrCertEncoded;
|
PCERT_BLOB rgAttrCertEncoded;
|
||||||
DWORD cUnprotectedAttr;
|
DWORD cUnprotectedAttr;
|
||||||
PCRYPT_ATTRIBUTE rgUnprotectedAttr;
|
PCRYPT_ATTRIBUTE rgUnprotectedAttr;
|
||||||
} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS, *PCMSG_ENVELOPED_ENCODE_INFO_WITH_CMS;
|
} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS;
|
||||||
|
|
||||||
typedef struct _CEnvelopedEncodeMsg
|
typedef struct _CEnvelopedEncodeMsg
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,7 +37,7 @@ typedef struct _WINE_CERT_PROP_HEADER
|
||||||
DWORD propID;
|
DWORD propID;
|
||||||
DWORD unknown; /* always 1 */
|
DWORD unknown; /* always 1 */
|
||||||
DWORD cb;
|
DWORD cb;
|
||||||
} WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER;
|
} WINE_CERT_PROP_HEADER;
|
||||||
|
|
||||||
static BOOL CRYPT_SerializeStoreElement(const void *context,
|
static BOOL CRYPT_SerializeStoreElement(const void *context,
|
||||||
const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID,
|
const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID,
|
||||||
|
@ -80,7 +80,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PWINE_CERT_PROP_HEADER hdr;
|
WINE_CERT_PROP_HEADER *hdr;
|
||||||
DWORD bufSize = 0;
|
DWORD bufSize = 0;
|
||||||
LPBYTE buf = NULL;
|
LPBYTE buf = NULL;
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context,
|
||||||
&propSize);
|
&propSize);
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
hdr = (PWINE_CERT_PROP_HEADER)pbElement;
|
hdr = (WINE_CERT_PROP_HEADER*)pbElement;
|
||||||
hdr->propID = prop;
|
hdr->propID = prop;
|
||||||
hdr->unknown = 1;
|
hdr->unknown = 1;
|
||||||
hdr->cb = propSize;
|
hdr->cb = propSize;
|
||||||
|
@ -128,7 +128,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context,
|
||||||
} while (ret && prop != 0);
|
} while (ret && prop != 0);
|
||||||
CryptMemFree(buf);
|
CryptMemFree(buf);
|
||||||
|
|
||||||
hdr = (PWINE_CERT_PROP_HEADER)pbElement;
|
hdr = (WINE_CERT_PROP_HEADER*)pbElement;
|
||||||
hdr->propID = contextPropID;
|
hdr->propID = contextPropID;
|
||||||
hdr->unknown = 1;
|
hdr->unknown = 1;
|
||||||
hdr->cb = cbEncodedContext;
|
hdr->cb = cbEncodedContext;
|
||||||
|
|
|
@ -92,7 +92,7 @@ typedef struct _WINE_MEMSTORE
|
||||||
struct ContextList *certs;
|
struct ContextList *certs;
|
||||||
struct ContextList *crls;
|
struct ContextList *crls;
|
||||||
struct ContextList *ctls;
|
struct ContextList *ctls;
|
||||||
} WINE_MEMSTORE, *PWINE_MEMSTORE;
|
} WINE_MEMSTORE;
|
||||||
|
|
||||||
void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags,
|
void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags,
|
||||||
CertStoreType type)
|
CertStoreType type)
|
||||||
|
@ -307,7 +307,7 @@ static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
|
||||||
static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv,
|
static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv,
|
||||||
DWORD dwFlags, const void *pvPara)
|
DWORD dwFlags, const void *pvPara)
|
||||||
{
|
{
|
||||||
PWINE_MEMSTORE store;
|
WINE_MEMSTORE *store;
|
||||||
|
|
||||||
TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
|
TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue