Module: wine Branch: master Commit: 0a5cb15f949495a06ff983fcfe6fa3ceb46f43db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5cb15f949495a06ff983fcfe...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Sep 4 12:40:32 2013 +0200
crypt32: Get rid of remaining P* typedefs.
---
dlls/crypt32/cert.c | 2 +- dlls/crypt32/chain.c | 2 +- dlls/crypt32/msg.c | 8 ++++---- dlls/crypt32/serialize.c | 8 ++++---- dlls/crypt32/store.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 64ea613..04d16a0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1739,7 +1739,7 @@ typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD dwIndex; DWORD dwError; DWORD dwReason; -} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; +} OLD_CERT_REVOCATION_STATUS;
typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8cc8c4a..fbfe3a5 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2548,7 +2548,7 @@ static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain( typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { DWORD cbSize; 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, LPFILETIME pTime, HCERTSTORE hAdditionalStore, diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 370bf73..13f5934 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -603,20 +603,20 @@ typedef struct _CMSG_SIGNER_ENCODE_INFO_WITH_CMS CERT_ID SignerId; CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; 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 { DWORD cbSize; DWORD cSigners; - PCMSG_SIGNER_ENCODE_INFO_WITH_CMS rgSigners; + CMSG_SIGNER_ENCODE_INFO_WITH_CMS *rgSigners; DWORD cCertEncoded; PCERT_BLOB rgCertEncoded; DWORD cCrlEncoded; PCRL_BLOB rgCrlEncoded; DWORD cAttrCertEncoded; 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) { @@ -1474,7 +1474,7 @@ typedef struct _CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS PCERT_BLOB rgAttrCertEncoded; DWORD cUnprotectedAttr; PCRYPT_ATTRIBUTE rgUnprotectedAttr; -} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS, *PCMSG_ENVELOPED_ENCODE_INFO_WITH_CMS; +} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS;
typedef struct _CEnvelopedEncodeMsg { diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 59dde5a..d8027c1 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -37,7 +37,7 @@ typedef struct _WINE_CERT_PROP_HEADER DWORD propID; DWORD unknown; /* always 1 */ DWORD cb; -} WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER; +} WINE_CERT_PROP_HEADER;
static BOOL CRYPT_SerializeStoreElement(const void *context, const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, @@ -80,7 +80,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, } else { - PWINE_CERT_PROP_HEADER hdr; + WINE_CERT_PROP_HEADER *hdr; DWORD bufSize = 0; LPBYTE buf = NULL;
@@ -109,7 +109,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, &propSize); if (ret) { - hdr = (PWINE_CERT_PROP_HEADER)pbElement; + hdr = (WINE_CERT_PROP_HEADER*)pbElement; hdr->propID = prop; hdr->unknown = 1; hdr->cb = propSize; @@ -128,7 +128,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, } while (ret && prop != 0); CryptMemFree(buf);
- hdr = (PWINE_CERT_PROP_HEADER)pbElement; + hdr = (WINE_CERT_PROP_HEADER*)pbElement; hdr->propID = contextPropID; hdr->unknown = 1; hdr->cb = cbEncodedContext; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index d7dfe6e..0fffa5b 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -92,7 +92,7 @@ typedef struct _WINE_MEMSTORE struct ContextList *certs; struct ContextList *crls; struct ContextList *ctls; -} WINE_MEMSTORE, *PWINE_MEMSTORE; +} WINE_MEMSTORE;
void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags, CertStoreType type) @@ -307,7 +307,7 @@ static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { - PWINE_MEMSTORE store; + WINE_MEMSTORE *store;
TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);