wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Francois Gouget : iphlpapi: Check for proc_pidinfo() instead of assuming libproc.h always defines it.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 4f27b78fb424e5623498d1d8d5f637f9334aa740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f27b78fb424e5623498d1d8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 3 17:36:05 2013 +0200 iphlpapi: Check for proc_pidinfo() instead of assuming libproc.h always defines it. This is needed on FreeBSD 8.1. --- configure | 1 + configure.ac | 1 + dlls/iphlpapi/ipstats.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3514c1d..766ffdf 100755 --- a/configure +++ b/configure @@ -13414,6 +13414,7 @@ for ac_func in \ port_create \ prctl \ pread \ + proc_pidinfo \ pwrite \ readdir \ readlink \ diff --git a/configure.ac b/configure.ac index 8306fe2..038eec5 100644 --- a/configure.ac +++ b/configure.ac @@ -2041,6 +2041,7 @@ AC_CHECK_FUNCS(\ port_create \ prctl \ pread \ + proc_pidinfo \ pwrite \ readdir \ readlink \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 809dbc6..1185f08 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2046,7 +2046,7 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri procstat_close( pstat ); return 0; -#elif defined(HAVE_LIBPROC_H) +#elif defined(HAVE_PROC_PIDINFO) struct proc_fdinfo *fds; struct socket_fdinfo sock; unsigned int i, j, n, fd_len; diff --git a/include/config.h.in b/include/config.h.in index 643e2e1..aac10a5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -633,6 +633,9 @@ /* Define to 1 if you have the <process.h> header file. */ #undef HAVE_PROCESS_H +/* Define to 1 if you have the `proc_pidinfo' function. */ +#undef HAVE_PROC_PIDINFO + /* Define to 1 if you have the `pthread_attr_get_np' function. */ #undef HAVE_PTHREAD_ATTR_GET_NP

1 0

Jacek Caban : crypt32: Get rid of remaining P* typedefs.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 0a5cb15f949495a06ff983fcfe6fa3ceb46f43db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5cb15f949495a06ff983fcf… Author: Jacek Caban <jacek(a)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);

1 0

Jacek Caban : crypt32: Get rid of PWINE_HASH_TO_DELETE and PWINE_REGSTOREINFO typedefs.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: cc7b0d40194c48ffb5d5465f8bc64f1a2ba1fef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7b0d40194c48ffb5d5465f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:40:17 2013 +0200 crypt32: Get rid of PWINE_HASH_TO_DELETE and PWINE_REGSTOREINFO typedefs. --- dlls/crypt32/regstore.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 728122b..a5d69a1 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -32,7 +32,7 @@ typedef struct _WINE_HASH_TO_DELETE { BYTE hash[20]; struct list entry; -} WINE_HASH_TO_DELETE, *PWINE_HASH_TO_DELETE; +} WINE_HASH_TO_DELETE; typedef struct _WINE_REGSTOREINFO { @@ -44,7 +44,7 @@ typedef struct _WINE_REGSTOREINFO struct list certsToDelete; struct list crlsToDelete; struct list ctlsToDelete; -} WINE_REGSTOREINFO, *PWINE_REGSTOREINFO; +} WINE_REGSTOREINFO; static void CRYPT_HashToStr(const BYTE *hash, LPWSTR asciiHash) { @@ -246,7 +246,7 @@ static BOOL CRYPT_SerializeContextsToReg(HKEY key, return ret; } -static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) +static BOOL CRYPT_RegWriteToReg(WINE_REGSTOREINFO *store) { static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; const WINE_CONTEXT_INTERFACE * const interfaces[] = { pCertInterface, @@ -266,7 +266,7 @@ static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) { if (listToDelete[i]) { - PWINE_HASH_TO_DELETE toDelete, next; + WINE_HASH_TO_DELETE *toDelete, *next; WCHAR asciiHash[20 * 2 + 1]; EnterCriticalSection(&store->cs); @@ -304,7 +304,7 @@ static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) /* If force is true or the registry store is dirty, writes the contents of the * store to the registry. */ -static BOOL CRYPT_RegFlushStore(PWINE_REGSTOREINFO store, BOOL force) +static BOOL CRYPT_RegFlushStore(WINE_REGSTOREINFO *store, BOOL force) { BOOL ret; @@ -319,7 +319,7 @@ static BOOL CRYPT_RegFlushStore(PWINE_REGSTOREINFO store, BOOL force) static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); if (dwFlags) @@ -332,7 +332,7 @@ static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) CryptMemFree(store); } -static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, +static BOOL CRYPT_RegWriteContext(WINE_REGSTOREINFO *store, const void *context, DWORD dwFlags) { BOOL ret; @@ -347,7 +347,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, return ret; } -static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, +static BOOL CRYPT_RegDeleteContext(WINE_REGSTOREINFO *store, struct list *deleteList, const void *context, const WINE_CONTEXT_INTERFACE *contextInterface) { @@ -360,8 +360,7 @@ static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, } else { - PWINE_HASH_TO_DELETE toDelete = - CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE)); + WINE_HASH_TO_DELETE *toDelete = CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE)); if (toDelete) { @@ -392,7 +391,7 @@ static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags); @@ -402,7 +401,7 @@ static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCertContext, dwFlags); @@ -413,7 +412,7 @@ static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT crl, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags); @@ -423,7 +422,7 @@ static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCrlContext, dwFlags); @@ -434,7 +433,7 @@ static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT ctl, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); @@ -444,7 +443,7 @@ static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCtlContext, dwFlags); @@ -455,7 +454,7 @@ static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; BOOL ret; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -541,7 +540,7 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - PWINE_REGSTOREINFO regInfo = CryptMemAlloc( + WINE_REGSTOREINFO *regInfo = CryptMemAlloc( sizeof(WINE_REGSTOREINFO)); if (regInfo)

1 0

Jacek Caban : crypt32: Get rid of PWINE_PROVIDERSTORE typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: d759a6a5a423650ef6adb0bf98506a49ab146a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d759a6a5a423650ef6adb0bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:40:08 2013 +0200 crypt32: Get rid of PWINE_PROVIDERSTORE typedef. --- dlls/crypt32/provstore.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index c28deac..cd13d73 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -39,11 +39,11 @@ typedef struct _WINE_PROVIDERSTORE PFN_CERT_STORE_PROV_WRITE_CTL provWriteCtl; PFN_CERT_STORE_PROV_DELETE_CTL provDeleteCtl; PFN_CERT_STORE_PROV_CONTROL provControl; -} WINE_PROVIDERSTORE, *PWINE_PROVIDERSTORE; +} WINE_PROVIDERSTORE; static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_PROVIDERSTORE store = hCertStore; + WINE_PROVIDERSTORE *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); @@ -57,7 +57,7 @@ static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static BOOL CRYPT_ProvAddCert(WINECRYPT_CERTSTORE *store, void *cert, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); @@ -85,7 +85,7 @@ static BOOL CRYPT_ProvAddCert(WINECRYPT_CERTSTORE *store, void *cert, static void *CRYPT_ProvEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->certs.enumContext(ps->memStore, pPrev); @@ -101,7 +101,7 @@ static void *CRYPT_ProvEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCert(WINECRYPT_CERTSTORE *store, void *cert) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, cert); @@ -116,7 +116,7 @@ static BOOL CRYPT_ProvDeleteCert(WINECRYPT_CERTSTORE *store, void *cert) static BOOL CRYPT_ProvAddCRL(WINECRYPT_CERTSTORE *store, void *crl, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); @@ -152,7 +152,7 @@ static BOOL CRYPT_ProvAddCRL(WINECRYPT_CERTSTORE *store, void *crl, static void *CRYPT_ProvEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->crls.enumContext(ps->memStore, pPrev); @@ -168,7 +168,7 @@ static void *CRYPT_ProvEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCRL(WINECRYPT_CERTSTORE *store, void *crl) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, crl); @@ -183,7 +183,7 @@ static BOOL CRYPT_ProvDeleteCRL(WINECRYPT_CERTSTORE *store, void *crl) static BOOL CRYPT_ProvAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); @@ -219,7 +219,7 @@ static BOOL CRYPT_ProvAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, static void *CRYPT_ProvEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->ctls.enumContext(ps->memStore, pPrev); @@ -235,7 +235,7 @@ static void *CRYPT_ProvEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCTL(WINECRYPT_CERTSTORE *store, void *ctl) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, ctl); @@ -250,7 +250,7 @@ static BOOL CRYPT_ProvDeleteCTL(WINECRYPT_CERTSTORE *store, void *ctl) static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_PROVIDERSTORE store = hCertStore; + WINE_PROVIDERSTORE *store = hCertStore; BOOL ret = TRUE; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -265,7 +265,7 @@ static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, WINECRYPT_CERTSTORE *CRYPT_ProvCreateStore(DWORD dwFlags, WINECRYPT_CERTSTORE *memStore, const CERT_STORE_PROV_INFO *pProvInfo) { - PWINE_PROVIDERSTORE ret = CryptMemAlloc(sizeof(WINE_PROVIDERSTORE)); + WINE_PROVIDERSTORE *ret = CryptMemAlloc(sizeof(WINE_PROVIDERSTORE)); if (ret) {

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_PROPERTY typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 4c77772e1930ed21cdf60758b6d606e1ff46a6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c77772e1930ed21cdf60758b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:58 2013 +0200 crypt32: Get rid of PCONTEXT_PROPERTY typedef. --- dlls/crypt32/proplist.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index 31185d5..be9bf8d 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -38,7 +38,7 @@ typedef struct _CONTEXT_PROPERTY DWORD cbData; LPBYTE pbData; struct list entry; -} CONTEXT_PROPERTY, *PCONTEXT_PROPERTY; +} CONTEXT_PROPERTY; CONTEXT_PROPERTY_LIST *ContextPropertyList_Create(void) { @@ -55,7 +55,7 @@ CONTEXT_PROPERTY_LIST *ContextPropertyList_Create(void) void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) { - PCONTEXT_PROPERTY prop, next; + CONTEXT_PROPERTY *prop, *next; LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, entry) @@ -72,7 +72,7 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) BOOL ContextPropertyList_FindProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, PCRYPT_DATA_BLOB blob) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; BOOL ret = FALSE; TRACE("(%p, %d, %p)\n", list, id, blob); @@ -108,7 +108,7 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, data = NULL; if (!cbData || data) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; BOOL found = FALSE; EnterCriticalSection(&list->cs); @@ -148,7 +148,7 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - PCONTEXT_PROPERTY prop, next; + CONTEXT_PROPERTY *prop, *next; EnterCriticalSection(&list->cs); LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, @@ -175,7 +175,7 @@ DWORD ContextPropertyList_EnumPropIDs(CONTEXT_PROPERTY_LIST *list, DWORD id) EnterCriticalSection(&list->cs); if (id) { - PCONTEXT_PROPERTY cursor = NULL; + CONTEXT_PROPERTY *cursor = NULL; LIST_FOR_EACH_ENTRY(cursor, &list->properties, CONTEXT_PROPERTY, entry) { @@ -204,7 +204,7 @@ DWORD ContextPropertyList_EnumPropIDs(CONTEXT_PROPERTY_LIST *list, DWORD id) void ContextPropertyList_Copy(CONTEXT_PROPERTY_LIST *to, CONTEXT_PROPERTY_LIST *from) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&from->cs); LIST_FOR_EACH_ENTRY(prop, &from->properties, CONTEXT_PROPERTY, entry)

1 0

Jacek Caban : crypt32: Get rid of PWINE_FILESTOREINFO typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: eacc0b8238ef304ceeba32a4b08890b6e18f1683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacc0b8238ef304ceeba32a4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:43 2013 +0200 crypt32: Get rid of PWINE_FILESTOREINFO typedef. --- dlls/crypt32/filestore.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 0bd34ec..44b9bbb 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -33,11 +33,11 @@ typedef struct _WINE_FILESTOREINFO HANDLE file; DWORD type; BOOL dirty; -} WINE_FILESTOREINFO, *PWINE_FILESTOREINFO; +} WINE_FILESTOREINFO; static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); if (store->dirty) @@ -50,7 +50,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static BOOL WINAPI CRYPT_FileWriteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags); store->dirty = TRUE; @@ -60,7 +60,7 @@ static BOOL WINAPI CRYPT_FileWriteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCertContext, dwFlags); store->dirty = TRUE; @@ -70,7 +70,7 @@ static BOOL WINAPI CRYPT_FileDeleteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileWriteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT crl, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags); store->dirty = TRUE; @@ -80,7 +80,7 @@ static BOOL WINAPI CRYPT_FileWriteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCrlContext, dwFlags); store->dirty = TRUE; @@ -90,7 +90,7 @@ static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT ctl, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); store->dirty = TRUE; @@ -100,7 +100,7 @@ static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCtlContext, dwFlags); store->dirty = TRUE; @@ -128,7 +128,7 @@ static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; BOOL ret; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -216,7 +216,7 @@ static WINECRYPT_CERTSTORE *CRYPT_CreateFileStore(DWORD dwFlags, HCERTSTORE memStore, HANDLE file, DWORD type) { WINECRYPT_CERTSTORE *store = NULL; - PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); + WINE_FILESTOREINFO *info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); if (info) {

1 0

Jacek Caban : crypt32: Get rid of P*_CONTEXT typedefs.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: f4c8c3d69ccf93b7d8e9e89ab8c2c51bd760155f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c8c3d69ccf93b7d8e9e89ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:34 2013 +0200 crypt32: Get rid of P*_CONTEXT typedefs. --- dlls/crypt32/context.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index a8d47f2..c5f609b 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -35,24 +35,24 @@ typedef struct _BASE_CONTEXT { LONG ref; ContextType type; -} BASE_CONTEXT, *PBASE_CONTEXT; +} BASE_CONTEXT; typedef struct _DATA_CONTEXT { LONG ref; ContextType type; /* always ContextTypeData */ CONTEXT_PROPERTY_LIST *properties; -} DATA_CONTEXT, *PDATA_CONTEXT; +} DATA_CONTEXT; typedef struct _LINK_CONTEXT { LONG ref; ContextType type; /* always ContextTypeLink */ - PBASE_CONTEXT linked; -} LINK_CONTEXT, *PLINK_CONTEXT; + BASE_CONTEXT *linked; +} LINK_CONTEXT; #define CONTEXT_FROM_BASE_CONTEXT(p, s) ((LPBYTE)(p) - (s)) -#define BASE_CONTEXT_FROM_CONTEXT(p, s) (PBASE_CONTEXT)((LPBYTE)(p) + (s)) +#define BASE_CONTEXT_FROM_CONTEXT(p, s) (BASE_CONTEXT*)((LPBYTE)(p) + (s)) void *Context_CreateDataContext(size_t contextSize) { @@ -60,7 +60,7 @@ void *Context_CreateDataContext(size_t contextSize) if (ret) { - PDATA_CONTEXT context = (PDATA_CONTEXT)((LPBYTE)ret + contextSize); + DATA_CONTEXT *context = (DATA_CONTEXT*)((LPBYTE)ret + contextSize); context->ref = 1; context->type = ContextTypeData; @@ -84,9 +84,9 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned if (context) { - PLINK_CONTEXT linkContext = (PLINK_CONTEXT)BASE_CONTEXT_FROM_CONTEXT( + LINK_CONTEXT *linkContext = (LINK_CONTEXT*)BASE_CONTEXT_FROM_CONTEXT( context, contextSize); - PBASE_CONTEXT linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, + BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, contextSize); memcpy(context, linked, contextSize); @@ -103,14 +103,14 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned void Context_AddRef(void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); InterlockedIncrement(&baseContext->ref); TRACE("%p's ref count is %d\n", context, baseContext->ref); if (baseContext->type == ContextTypeLink) { void *linkedContext = Context_GetLinkedContext(context, contextSize); - PBASE_CONTEXT linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, + BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, contextSize); /* Add-ref the linked contexts too */ @@ -141,7 +141,7 @@ void Context_AddRef(void *context, size_t contextSize) void *Context_GetExtra(const void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); return (LPBYTE)baseContext + sizeof(LINK_CONTEXT); @@ -149,27 +149,25 @@ void *Context_GetExtra(const void *context, size_t contextSize) void *Context_GetLinkedContext(void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); - return CONTEXT_FROM_BASE_CONTEXT(((PLINK_CONTEXT)baseContext)->linked, - contextSize); + return CONTEXT_FROM_BASE_CONTEXT(((LINK_CONTEXT*)baseContext)->linked, contextSize); } CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) { - PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); while (ptr && ptr->type == ContextTypeLink) - ptr = ((PLINK_CONTEXT)ptr)->linked; - return (ptr && ptr->type == ContextTypeData) ? - ((PDATA_CONTEXT)ptr)->properties : NULL; + ptr = ((LINK_CONTEXT*)ptr)->linked; + return (ptr && ptr->type == ContextTypeData) ? ((DATA_CONTEXT*)ptr)->properties : NULL; } BOOL Context_Release(void *context, size_t contextSize, ContextFreeFunc dataContextFree) { - PBASE_CONTEXT base = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *base = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); BOOL ret = TRUE; if (base->ref <= 0) @@ -183,7 +181,7 @@ BOOL Context_Release(void *context, size_t contextSize, * it as well, using the same offset and data free function. */ ret = Context_Release(CONTEXT_FROM_BASE_CONTEXT( - ((PLINK_CONTEXT)base)->linked, contextSize), contextSize, + ((LINK_CONTEXT*)base)->linked, contextSize), contextSize, dataContextFree); } if (InterlockedDecrement(&base->ref) == 0) @@ -191,7 +189,7 @@ BOOL Context_Release(void *context, size_t contextSize, TRACE("freeing %p\n", context); if (base->type == ContextTypeData) { - ContextPropertyList_Free(((PDATA_CONTEXT)base)->properties); + ContextPropertyList_Free(((DATA_CONTEXT*)base)->properties); dataContextFree(context); } CryptMemFree(context);

1 0

Jacek Caban : crypt32: Get rid of PWINE_COLLECTIONSTORE typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 8ad37f8a641e3d4cd892a3b10ded922585f15c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad37f8a641e3d4cd892a3b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:26 2013 +0200 crypt32: Get rid of PWINE_COLLECTIONSTORE typedef. --- dlls/crypt32/collectionstore.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 5ed74c4..677f7bd 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -38,11 +38,11 @@ typedef struct _WINE_COLLECTIONSTORE WINECRYPT_CERTSTORE hdr; CRITICAL_SECTION cs; struct list stores; -} WINE_COLLECTIONSTORE, *PWINE_COLLECTIONSTORE; +} WINE_COLLECTIONSTORE; static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) { - PWINE_COLLECTIONSTORE cs = store; + WINE_COLLECTIONSTORE *cs = store; WINE_STORE_LIST_ENTRY *entry, *next; TRACE("(%p, %08x)\n", store, dwFlags); @@ -59,7 +59,7 @@ static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) CRYPT_FreeStore(store); } -static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, +static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, void *child, size_t contextSize, BOOL addRef) { @@ -73,7 +73,7 @@ static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, return ret; } -static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, +static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, unsigned int contextFuncsOffset, void *context, void *toReplace, unsigned int contextSize, void **pChildContext) { @@ -133,7 +133,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, * Returns NULL if the collection contains no more items or on error. * Assumes the collection store's lock is held. */ -static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, +static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { @@ -189,7 +189,7 @@ static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, certs), cert, toReplace, sizeof(CERT_CONTEXT), &childContext); @@ -211,7 +211,7 @@ static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert, static void *CRYPT_CollectionEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -276,7 +276,7 @@ static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, crls), crl, toReplace, sizeof(CRL_CONTEXT), &childContext); @@ -298,7 +298,7 @@ static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl, static void *CRYPT_CollectionEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -360,7 +360,7 @@ static BOOL CRYPT_CollectionAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, ctls), ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); @@ -382,7 +382,7 @@ static BOOL CRYPT_CollectionAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, static void *CRYPT_CollectionEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -443,7 +443,7 @@ static BOOL WINAPI CRYPT_CollectionControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { BOOL ret; - PWINE_COLLECTIONSTORE store = hCertStore; + WINE_COLLECTIONSTORE *store = hCertStore; WINE_STORE_LIST_ENTRY *entry; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -481,7 +481,7 @@ static BOOL WINAPI CRYPT_CollectionControl(HCERTSTORE hCertStore, DWORD dwFlags, WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { - PWINE_COLLECTIONSTORE store; + WINE_COLLECTIONSTORE *store; if (dwFlags & CERT_STORE_DELETE_FLAG) { @@ -517,7 +517,7 @@ WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority) { - PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; WINE_STORE_LIST_ENTRY *entry; BOOL ret; @@ -585,7 +585,7 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore) { - PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; WINE_STORE_LIST_ENTRY *store, *next;

1 0

Jacek Caban : crypt32: Get rid of PWINE_STORE_LIST_ENTRY typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 7c464af46c41e1a1306606f7889fc791c6252a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c464af46c41e1a1306606f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:16 2013 +0200 crypt32: Get rid of PWINE_STORE_LIST_ENTRY typedef. --- dlls/crypt32/collectionstore.c | 53 +++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 73b24fb..5ed74c4 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -31,7 +31,7 @@ typedef struct _WINE_STORE_LIST_ENTRY DWORD dwUpdateFlags; DWORD dwPriority; struct list entry; -} WINE_STORE_LIST_ENTRY, *PWINE_STORE_LIST_ENTRY; +} WINE_STORE_LIST_ENTRY; typedef struct _WINE_COLLECTIONSTORE { @@ -43,7 +43,7 @@ typedef struct _WINE_COLLECTIONSTORE static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) { PWINE_COLLECTIONSTORE cs = store; - PWINE_STORE_LIST_ENTRY entry, next; + WINE_STORE_LIST_ENTRY *entry, *next; TRACE("(%p, %08x)\n", store, dwFlags); @@ -60,14 +60,14 @@ static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) } static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, - PWINE_STORE_LIST_ENTRY storeEntry, void *child, size_t contextSize, + WINE_STORE_LIST_ENTRY *storeEntry, void *child, size_t contextSize, BOOL addRef) { void *ret = Context_CreateLinkContext(contextSize, child, - sizeof(PWINE_STORE_LIST_ENTRY), addRef); + sizeof(WINE_STORE_LIST_ENTRY*), addRef); if (ret) - *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(ret, contextSize) + *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(ret, contextSize) = storeEntry; return ret; @@ -79,7 +79,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, { BOOL ret; void *childContext = NULL; - PWINE_STORE_LIST_ENTRY storeEntry = NULL; + WINE_STORE_LIST_ENTRY *storeEntry = NULL; TRACE("(%p, %d, %p, %p, %d)\n", store, contextFuncsOffset, context, toReplace, contextSize); @@ -90,7 +90,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, void *existingLinked = Context_GetLinkedContext(toReplace, contextSize); CONTEXT_FUNCS *contextFuncs; - storeEntry = *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(toReplace, + storeEntry = *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(toReplace, contextSize); contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store + contextFuncsOffset); @@ -99,7 +99,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, } else { - PWINE_STORE_LIST_ENTRY entry, next; + WINE_STORE_LIST_ENTRY *entry, *next; EnterCriticalSection(&store->cs); LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, @@ -134,7 +134,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, * Assumes the collection store's lock is held. */ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, - PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs, + WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { void *ret, *child; @@ -166,7 +166,7 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, * in the next store, so use the same offset into the next store. */ size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store; - PWINE_STORE_LIST_ENTRY storeNextEntry = + WINE_STORE_LIST_ENTRY *storeNextEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); CONTEXT_FUNCS *storeNextContexts = (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store + offset); @@ -195,7 +195,7 @@ static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert, cert, toReplace, sizeof(CERT_CONTEXT), &childContext); if (ppStoreContext && childContext) { - PWINE_STORE_LIST_ENTRY storeEntry = *(PWINE_STORE_LIST_ENTRY *) + WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) Context_GetExtra(childContext, sizeof(CERT_CONTEXT)); PCERT_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, @@ -219,8 +219,8 @@ static void *CRYPT_CollectionEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - PWINE_STORE_LIST_ENTRY storeEntry = - *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(pPrev, + WINE_STORE_LIST_ENTRY *storeEntry = + *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, sizeof(CERT_CONTEXT)); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, @@ -231,7 +231,7 @@ static void *CRYPT_CollectionEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) { if (!list_empty(&cs->stores)) { - PWINE_STORE_LIST_ENTRY storeEntry = LIST_ENTRY(cs->stores.next, + WINE_STORE_LIST_ENTRY *storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, @@ -282,7 +282,7 @@ static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl, crl, toReplace, sizeof(CRL_CONTEXT), &childContext); if (ppStoreContext && childContext) { - PWINE_STORE_LIST_ENTRY storeEntry = *(PWINE_STORE_LIST_ENTRY *) + WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) Context_GetExtra(childContext, sizeof(CRL_CONTEXT)); PCRL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, @@ -306,8 +306,8 @@ static void *CRYPT_CollectionEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - PWINE_STORE_LIST_ENTRY storeEntry = - *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(pPrev, + WINE_STORE_LIST_ENTRY *storeEntry = + *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, sizeof(CRL_CONTEXT)); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, @@ -317,7 +317,7 @@ static void *CRYPT_CollectionEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) { if (!list_empty(&cs->stores)) { - PWINE_STORE_LIST_ENTRY storeEntry = LIST_ENTRY(cs->stores.next, + WINE_STORE_LIST_ENTRY *storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, @@ -366,7 +366,7 @@ static BOOL CRYPT_CollectionAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); if (ppStoreContext && childContext) { - PWINE_STORE_LIST_ENTRY storeEntry = *(PWINE_STORE_LIST_ENTRY *) + WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) Context_GetExtra(childContext, sizeof(CTL_CONTEXT)); PCTL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, @@ -390,9 +390,8 @@ static void *CRYPT_CollectionEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - PWINE_STORE_LIST_ENTRY storeEntry = - *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(pPrev, - sizeof(CTL_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = + *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, sizeof(CTL_CONTEXT)); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, &storeEntry->store->ctls, pCTLInterface, pPrev, sizeof(CTL_CONTEXT)); @@ -401,7 +400,7 @@ static void *CRYPT_CollectionEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) { if (!list_empty(&cs->stores)) { - PWINE_STORE_LIST_ENTRY storeEntry = LIST_ENTRY(cs->stores.next, + WINE_STORE_LIST_ENTRY *storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, @@ -445,7 +444,7 @@ static BOOL WINAPI CRYPT_CollectionControl(HCERTSTORE hCertStore, DWORD dwFlags, { BOOL ret; PWINE_COLLECTIONSTORE store = hCertStore; - PWINE_STORE_LIST_ENTRY entry; + WINE_STORE_LIST_ENTRY *entry; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, pvCtrlPara); @@ -520,7 +519,7 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, { PWINE_COLLECTIONSTORE collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - PWINE_STORE_LIST_ENTRY entry; + WINE_STORE_LIST_ENTRY *entry; BOOL ret; TRACE("(%p, %p, %08x, %d)\n", hCollectionStore, hSiblingStore, @@ -557,7 +556,7 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, EnterCriticalSection(&collection->cs); if (dwPriority) { - PWINE_STORE_LIST_ENTRY cursor; + WINE_STORE_LIST_ENTRY *cursor; BOOL added = FALSE; LIST_FOR_EACH_ENTRY(cursor, &collection->stores, @@ -588,7 +587,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, { PWINE_COLLECTIONSTORE collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - PWINE_STORE_LIST_ENTRY store, next; + WINE_STORE_LIST_ENTRY *store, *next; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore);

1 0

Jacek Caban : crypt32: Get rid of PCertificateChain typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 0e885e34dc1f339d5354b879ff7c41af58729185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e885e34dc1f339d5354b879f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:02 2013 +0200 crypt32: Get rid of PCertificateChain typedef. --- dlls/crypt32/chain.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 90ca0be..8cc8c4a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -247,7 +247,7 @@ typedef struct _CertificateChain CERT_CHAIN_CONTEXT context; HCERTSTORE world; LONG ref; -} CertificateChain, *PCertificateChain; +} CertificateChain; static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { @@ -2173,7 +2173,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - PCertificateChain *ppChain) + CertificateChain **ppChain) { PCERT_SIMPLE_CHAIN simpleChain = NULL; HCERTSTORE world; @@ -2190,7 +2190,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) { - PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain)); + CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); if (chain) { @@ -2269,7 +2269,7 @@ static PCERT_SIMPLE_CHAIN CRYPT_CopySimpleChainToElement( return copy; } -static void CRYPT_FreeLowerQualityChains(PCertificateChain chain) +static void CRYPT_FreeLowerQualityChains(CertificateChain *chain) { DWORD i; @@ -2280,7 +2280,7 @@ static void CRYPT_FreeLowerQualityChains(PCertificateChain chain) chain->context.rgpLowerQualityChainContext = NULL; } -static void CRYPT_FreeChainContext(PCertificateChain chain) +static void CRYPT_FreeChainContext(CertificateChain *chain) { DWORD i; @@ -2295,10 +2295,10 @@ static void CRYPT_FreeChainContext(PCertificateChain chain) /* Makes and returns a copy of chain, up to and including element iElement of * simple chain iChain. */ -static PCertificateChain CRYPT_CopyChainToElement(PCertificateChain chain, +static CertificateChain *CRYPT_CopyChainToElement(CertificateChain *chain, DWORD iChain, DWORD iElement) { - PCertificateChain copy = CryptMemAlloc(sizeof(CertificateChain)); + CertificateChain *copy = CryptMemAlloc(sizeof(CertificateChain)); if (copy) { @@ -2360,11 +2360,11 @@ static PCertificateChain CRYPT_CopyChainToElement(PCertificateChain chain, return copy; } -static PCertificateChain CRYPT_BuildAlternateContextFromChain( +static CertificateChain *CRYPT_BuildAlternateContextFromChain( CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - PCertificateChain chain) + CertificateChain *chain) { - PCertificateChain alternate; + CertificateChain *alternate; TRACE("(%p, %s, %p, %p)\n", engine, debugstr_filetime(pTime), hAdditionalStore, chain); @@ -2373,7 +2373,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( * order of alternate creation: */ if (chain->context.cLowerQualityChainContext) - chain = (PCertificateChain)chain->context.rgpLowerQualityChainContext[ + chain = (CertificateChain*)chain->context.rgpLowerQualityChainContext[ chain->context.cLowerQualityChainContext - 1]; /* A chain with only one element can't have any alternates */ if (chain->context.cChain <= 1 && chain->context.rgpChain[0]->cElement <= 1) @@ -2472,8 +2472,8 @@ static DWORD CRYPT_ChainQuality(const CertificateChain *chain) * alternate chains. Returns the highest quality chain, with all other * chains as lower quality chains of it. */ -static PCertificateChain CRYPT_ChooseHighestQualityChain( - PCertificateChain chain) +static CertificateChain *CRYPT_ChooseHighestQualityChain( + CertificateChain *chain) { DWORD i; @@ -2485,8 +2485,8 @@ static PCertificateChain CRYPT_ChooseHighestQualityChain( */ for (i = 0; i < chain->context.cLowerQualityChainContext; i++) { - PCertificateChain alternate = - (PCertificateChain)chain->context.rgpLowerQualityChainContext[i]; + CertificateChain *alternate = + (CertificateChain*)chain->context.rgpLowerQualityChainContext[i]; if (CRYPT_ChainQuality(alternate) > CRYPT_ChainQuality(chain)) { @@ -2504,7 +2504,7 @@ static PCertificateChain CRYPT_ChooseHighestQualityChain( return chain; } -static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain, +static BOOL CRYPT_AddAlternateChainToChain(CertificateChain *chain, const CertificateChain *alternate) { BOOL ret; @@ -2799,7 +2799,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, { CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; BOOL ret; - PCertificateChain chain = NULL; + CertificateChain *chain = NULL; TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", engine, pCertContext, debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, @@ -2827,7 +2827,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, hAdditionalStore, &chain); if (ret) { - PCertificateChain alternate = NULL; + CertificateChain *alternate = NULL; PCERT_CHAIN_CONTEXT pChain; do { @@ -2862,7 +2862,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( PCCERT_CHAIN_CONTEXT pChainContext) { - PCertificateChain chain = (PCertificateChain)pChainContext; + CertificateChain *chain = (CertificateChain*)pChainContext; TRACE("(%p)\n", pChainContext); @@ -2873,7 +2873,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) { - PCertificateChain chain = (PCertificateChain)pChainContext; + CertificateChain *chain = (CertificateChain*)pChainContext; TRACE("(%p)\n", pChainContext);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013