September 2013 - Wine-commits

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 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_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 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 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

Michael Stefaniuc : dplayx: Use consistent naming for the IDPLobbySP members.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: a4589d5673f823a2cd02b0f5a544f206cd9b6396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4589d5673f823a2cd02b0f5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:17:09 2013 +0200 dplayx: Use consistent naming for the IDPLobbySP members. --- dlls/dplayx/lobbysp.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 0235718..e771424 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -159,12 +159,8 @@ static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) return TRUE; } -static -HRESULT WINAPI DPLSP_QueryInterface -( LPDPLOBBYSP iface, - REFIID riid, - LPVOID* ppvObj -) +static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, + void **ppvObj ) { IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); @@ -199,9 +195,7 @@ HRESULT WINAPI DPLSP_QueryInterface return S_OK; } -static -ULONG WINAPI DPLSP_AddRef -( LPDPLOBBYSP iface ) +static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; @@ -215,9 +209,7 @@ ULONG WINAPI DPLSP_AddRef return ulObjRefCount; } -static -ULONG WINAPI DPLSP_Release -( LPDPLOBBYSP iface ) +static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; @@ -422,11 +414,9 @@ HRESULT WINAPI IDPLobbySPImpl_StartSession static const IDPLobbySPVtbl dpLobbySPVT = { - - DPLSP_QueryInterface, - DPLSP_AddRef, - DPLSP_Release, - + IDPLobbySPImpl_QueryInterface, + IDPLobbySPImpl_AddRef, + IDPLobbySPImpl_Release, IDPLobbySPImpl_AddGroupToGroup, IDPLobbySPImpl_AddPlayerToGroup, IDPLobbySPImpl_CreateGroup, @@ -443,5 +433,4 @@ static const IDPLobbySPVtbl dpLobbySPVT = IDPLobbySPImpl_SetSessionDesc, IDPLobbySPImpl_SetSPDataPointer, IDPLobbySPImpl_StartSession - };

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDPLobbySP().
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 5da060be77d84392f708b4de14a727331c788189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da060be77d84392f708b4de1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:18:26 2013 +0200 dplayx: Introduce impl_from_IDPLobbySP(). --- dlls/dplayx/lobbysp.c | 150 +++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 98 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index e771424..33101fd 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -58,6 +58,11 @@ struct IDPLobbySPImpl DPLSP_IMPL_FIELDS }; +static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) +{ + return CONTAINING_RECORD( iface, IDPLobbySPImpl, lpVtbl ); +} + /* Forward declaration of virtual tables */ static const IDPLobbySPVtbl dpLobbySPVT; @@ -197,8 +202,8 @@ static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID r static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) { + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -211,8 +216,8 @@ static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) { + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -235,178 +240,127 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) return ulInterfaceRefCount; } -static -HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup -( LPDPLOBBYSP iface, - LPSPDATA_ADDREMOTEGROUPTOGROUP argtg -) +static HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup( IDPLobbySP *iface, + SPDATA_ADDREMOTEGROUPTOGROUP *argtg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, argtg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup -( LPDPLOBBYSP iface, - LPSPDATA_ADDREMOTEPLAYERTOGROUP arptg -) +static HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup( IDPLobbySP *iface, + SPDATA_ADDREMOTEPLAYERTOGROUP *arptg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, arptg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_CreateGroup -( LPDPLOBBYSP iface, - LPSPDATA_CREATEREMOTEGROUP crg -) +static HRESULT WINAPI IDPLobbySPImpl_CreateGroup( IDPLobbySP *iface, + SPDATA_CREATEREMOTEGROUP *crg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, crg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup -( LPDPLOBBYSP iface, - LPSPDATA_CREATEREMOTEGROUPINGROUP crgig -) +static HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup( IDPLobbySP *iface, + SPDATA_CREATEREMOTEGROUPINGROUP *crgig ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, crgig ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup -( LPDPLOBBYSP iface, - LPSPDATA_DELETEREMOTEGROUPFROMGROUP drgfg -) +static HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup( IDPLobbySP *iface, + SPDATA_DELETEREMOTEGROUPFROMGROUP *drgfg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drgfg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup -( LPDPLOBBYSP iface, - LPSPDATA_DELETEREMOTEPLAYERFROMGROUP drpfg -) +static HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup( IDPLobbySP *iface, + SPDATA_DELETEREMOTEPLAYERFROMGROUP *drpfg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drpfg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DestroyGroup -( LPDPLOBBYSP iface, - LPSPDATA_DESTROYREMOTEGROUP drg -) +static HRESULT WINAPI IDPLobbySPImpl_DestroyGroup( IDPLobbySP *iface, + SPDATA_DESTROYREMOTEGROUP *drg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse -( LPDPLOBBYSP iface, - LPSPDATA_ENUMSESSIONSRESPONSE er -) +static HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse( IDPLobbySP *iface, + SPDATA_ENUMSESSIONSRESPONSE *er ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, er ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer -( LPDPLOBBYSP iface, - LPVOID* lplpData -) +static HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer( IDPLobbySP *iface, LPVOID* lplpData ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, lplpData ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_HandleMessage -( LPDPLOBBYSP iface, - LPSPDATA_HANDLEMESSAGE hm -) +static HRESULT WINAPI IDPLobbySPImpl_HandleMessage( IDPLobbySP *iface, SPDATA_HANDLEMESSAGE *hm ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, hm ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SendChatMessage -( LPDPLOBBYSP iface, - LPSPDATA_CHATMESSAGE cm -) +static HRESULT WINAPI IDPLobbySPImpl_SendChatMessage( IDPLobbySP *iface, + SPDATA_CHATMESSAGE *cm ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, cm ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetGroupName -( LPDPLOBBYSP iface, - LPSPDATA_SETREMOTEGROUPNAME srgn -) +static HRESULT WINAPI IDPLobbySPImpl_SetGroupName( IDPLobbySP *iface, + SPDATA_SETREMOTEGROUPNAME *srgn ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, srgn ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetPlayerName -( LPDPLOBBYSP iface, - LPSPDATA_SETREMOTEPLAYERNAME srpn -) +static HRESULT WINAPI IDPLobbySPImpl_SetPlayerName( IDPLobbySP *iface, + SPDATA_SETREMOTEPLAYERNAME *srpn ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, srpn ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc -( LPDPLOBBYSP iface, - LPSPDATA_SETSESSIONDESC ssd -) +static HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc( IDPLobbySP *iface, + SPDATA_SETSESSIONDESC *ssd ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, ssd ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer -( LPDPLOBBYSP iface, - LPVOID lpData -) +static HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer( IDPLobbySP *iface, void *lpData ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, lpData ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_StartSession -( LPDPLOBBYSP iface, - LPSPDATA_STARTSESSIONCOMMAND ssc -) +static HRESULT WINAPI IDPLobbySPImpl_StartSession( IDPLobbySP *iface, + SPDATA_STARTSESSIONCOMMAND *ssc ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, ssc ); return DP_OK; }

1 0

Michael Stefaniuc : dplayx: Simplify ref-counting for IDPLobbySP.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: b11dddf7cafb75902cc705d9a82e92a2b2f28ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11dddf7cafb75902cc705d9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:20:21 2013 +0200 dplayx: Simplify ref-counting for IDPLobbySP. --- dlls/dplayx/lobbysp.c | 71 +++++++++++++----------------------------------- 1 files changed, 19 insertions(+), 52 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 33101fd..4dd7eb2 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -38,7 +38,6 @@ typedef struct IDPLobbySPImpl IDPLobbySPImpl; typedef struct tagDPLobbySPIUnknownData { - LONG ulObjRef; CRITICAL_SECTION DPLSP_lock; } DPLobbySPIUnknownData; @@ -48,13 +47,13 @@ typedef struct tagDPLobbySPData } DPLobbySPData; #define DPLSP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ DPLobbySPIUnknownData* unk; \ DPLobbySPData* sp; struct IDPLobbySPImpl { const IDPLobbySPVtbl *lpVtbl; + LONG ref; DPLSP_IMPL_FIELDS }; @@ -165,79 +164,47 @@ static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) } static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, - void **ppvObj ) + void **ppv ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid( riid ), ppv ); - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( *This ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - CopyMemory( *ppvObj, This, sizeof( *This ) ); - (*(IDPLobbySPImpl**)ppvObj)->ulInterfaceRef = 0; - - if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) - { - IDPLobbySPImpl *This = *ppvObj; - This->lpVtbl = &dpLobbySPVT; - } - else + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDPLobbySP, riid ) ) { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; + *ppv = iface; + IDPLobbySP_AddRef(iface); + return S_OK; } - IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); - - return S_OK; + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) { IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "ref count incremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "(%p) ref=%d\n", This, ref ); - return ulObjRefCount; + return ref; } static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) { IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "ref count decremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulObjRefCount == 0 ) - { - DPLSP_DestroyDPLobbySP( This ); - DPLSP_DestroyIUnknown( This ); - } + TRACE( "(%p) ref=%d\n", This, ref ); - if( ulInterfaceRefCount == 0 ) + if( !ref ) { + DPLSP_DestroyDPLobbySP( This ); + DPLSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); } - return ulInterfaceRefCount; + return ref; } static HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup( IDPLobbySP *iface,

1 0

Michael Stefaniuc : dplayx: Remove the unused lock from IDPLobbySPImpl.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: a966f9740f02521108418aa5794e23c5f6ad592f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a966f9740f02521108418aa57… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:21:32 2013 +0200 dplayx: Remove the unused lock from IDPLobbySPImpl. --- dlls/dplayx/lobbysp.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 4dd7eb2..506976d 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Prototypes */ -static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ); -static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ); static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp ); static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ); @@ -36,18 +34,12 @@ static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ); /* Predefine the interface */ typedef struct IDPLobbySPImpl IDPLobbySPImpl; -typedef struct tagDPLobbySPIUnknownData -{ - CRITICAL_SECTION DPLSP_lock; -} DPLobbySPIUnknownData; - typedef struct tagDPLobbySPData { IDirectPlayImpl *dplay; } DPLobbySPData; #define DPLSP_IMPL_FIELDS \ - DPLobbySPIUnknownData* unk; \ DPLobbySPData* sp; struct IDPLobbySPImpl @@ -92,9 +84,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) } /* Initialize it */ - if( DPLSP_CreateIUnknown( *ppvObj ) && - DPLSP_CreateDPLobbySP( *ppvObj, dp ) - ) + if( DPLSP_CreateDPLobbySP( *ppvObj, dp ) ) { IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); return S_OK; @@ -102,7 +92,6 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) /* Initialize failed, destroy it */ DPLSP_DestroyDPLobbySP( *ppvObj ); - DPLSP_DestroyIUnknown( *ppvObj ); HeapFree( GetProcessHeap(), 0, *ppvObj ); *ppvObj = NULL; @@ -110,34 +99,6 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return DPERR_NOMEMORY; } -static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ) -{ - IDPLobbySPImpl *This = lpSP; - - This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); - - if ( This->unk == NULL ) - { - return FALSE; - } - - InitializeCriticalSection( &This->unk->DPLSP_lock ); - This->unk->DPLSP_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDPLobbySPImpl*->DPLobbySPIUnknownData*->DPLSP_lock"); - - return TRUE; -} - -static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ) -{ - IDPLobbySPImpl *This = lpSP; - - This->unk->DPLSP_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->unk->DPLSP_lock ); - HeapFree( GetProcessHeap(), 0, This->unk ); - - return TRUE; -} - static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp ) { IDPLobbySPImpl *This = lpSP; @@ -200,7 +161,6 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) if( !ref ) { DPLSP_DestroyDPLobbySP( This ); - DPLSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); }

1 0

Michael Stefaniuc : dplayx: Merge the extra struct into IDPLobbySPImpl.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 02ce71edeea3a14dd0449b0f49b1741d939b1061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ce71edeea3a14dd0449b0f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:22:44 2013 +0200 dplayx: Merge the extra struct into IDPLobbySPImpl. --- dlls/dplayx/lobbysp.c | 67 ++++-------------------------------------------- 1 files changed, 6 insertions(+), 61 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 506976d..6e7fdd6 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -26,28 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/* Prototypes */ -static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp ); -static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ); - - -/* Predefine the interface */ -typedef struct IDPLobbySPImpl IDPLobbySPImpl; - -typedef struct tagDPLobbySPData -{ - IDirectPlayImpl *dplay; -} DPLobbySPData; - -#define DPLSP_IMPL_FIELDS \ - DPLobbySPData* sp; - -struct IDPLobbySPImpl +typedef struct IDPLobbySPImpl { const IDPLobbySPVtbl *lpVtbl; LONG ref; - DPLSP_IMPL_FIELDS -}; + IDirectPlayImpl *dplay; +} IDPLobbySPImpl; static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) { @@ -73,6 +57,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) { IDPLobbySPImpl *This = *ppvObj; This->lpVtbl = &dpLobbySPVT; + This->dplay = dp; } else { @@ -83,45 +68,8 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return E_NOINTERFACE; } - /* Initialize it */ - if( DPLSP_CreateDPLobbySP( *ppvObj, dp ) ) - { - IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); - return S_OK; - } - - /* Initialize failed, destroy it */ - DPLSP_DestroyDPLobbySP( *ppvObj ); - - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return DPERR_NOMEMORY; -} - -static BOOL DPLSP_CreateDPLobbySP( void *lpSP, IDirectPlayImpl *dp ) -{ - IDPLobbySPImpl *This = lpSP; - - This->sp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->sp) ) ); - - if ( This->sp == NULL ) - { - return FALSE; - } - - This->sp->dplay = dp; - - return TRUE; -} - -static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) -{ - IDPLobbySPImpl *This = lpSP; - - HeapFree( GetProcessHeap(), 0, This->sp ); - - return TRUE; + IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); + return S_OK; } static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, @@ -159,10 +107,7 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) TRACE( "(%p) ref=%d\n", This, ref ); if( !ref ) - { - DPLSP_DestroyDPLobbySP( This ); HeapFree( GetProcessHeap(), 0, This ); - } return ref; }

1 0