September 2013 - Wine-Commits

Jacek Caban : crypt32: Get rid of PWINE_STORE_LIST_ENTRY typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

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 Sept. 4, 2013

Sept. 4, 2013

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

Jacek Caban : crypt32: Get rid of PWINECRYPT_CERTSTORE typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 0c4a2df240b25d4f14b96e787f602b06339282e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4a2df240b25d4f14b96e787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:51 2013 +0200 crypt32: Get rid of PWINECRYPT_CERTSTORE typedef. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/collectionstore.c | 25 +++++++-------- dlls/crypt32/crypt32_private.h | 22 +++++++------- dlls/crypt32/ctl.c | 4 +- dlls/crypt32/filestore.c | 14 ++++---- dlls/crypt32/provstore.c | 32 ++++++++++---------- dlls/crypt32/regstore.c | 6 ++-- dlls/crypt32/rootstore.c | 4 +- dlls/crypt32/store.c | 66 ++++++++++++++++++++-------------------- 9 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c4a2df240b25d4f14b96…

1 0

Jacek Caban : crypt32: Get rid of P*WINE_CONTEXT_INTERFACE typedefs.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 9cee96bebfe32a7b7e95af66b41645f748a65973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cee96bebfe32a7b7e95af66b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:17 2013 +0200 crypt32: Get rid of P*WINE_CONTEXT_INTERFACE typedefs. --- dlls/crypt32/collectionstore.c | 2 +- dlls/crypt32/context.c | 4 ++-- dlls/crypt32/crypt32_private.h | 11 +++++------ dlls/crypt32/regstore.c | 2 +- dlls/crypt32/serialize.c | 2 +- dlls/crypt32/store.c | 6 +++--- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 6fe380c..d17c3b7 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -135,7 +135,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, */ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs, - PCWINE_CONTEXT_INTERFACE contextInterface, void *pPrev, size_t contextSize) + const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { void *ret, *child; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index bf4ccf3..1cfc03a 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -214,14 +214,14 @@ void Context_CopyProperties(const void *to, const void *from, struct ContextList { - PCWINE_CONTEXT_INTERFACE contextInterface; + const WINE_CONTEXT_INTERFACE *contextInterface; size_t contextSize; CRITICAL_SECTION cs; struct list contexts; }; struct ContextList *ContextList_Create( - PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize) + const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) { struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList)); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index ea85cbc..94a3e52 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -194,12 +194,11 @@ typedef struct _WINE_CONTEXT_INTERFACE SerializeElementFunc serialize; FreeContextFunc free; DeleteContextFunc deleteFromStore; -} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE; -typedef const WINE_CONTEXT_INTERFACE *PCWINE_CONTEXT_INTERFACE; +} WINE_CONTEXT_INTERFACE; -extern PCWINE_CONTEXT_INTERFACE pCertInterface DECLSPEC_HIDDEN; -extern PCWINE_CONTEXT_INTERFACE pCRLInterface DECLSPEC_HIDDEN; -extern PCWINE_CONTEXT_INTERFACE pCTLInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN; /* (Internal) certificate store types and functions */ struct WINE_CRYPTCERTSTORE; @@ -404,7 +403,7 @@ void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list) DECLSPEC_HIDDEN; struct ContextList; struct ContextList *ContextList_Create( - PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize) DECLSPEC_HIDDEN; + const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index f4b4295..ccf37fc 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -349,7 +349,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, struct list *deleteList, const void *context, - PCWINE_CONTEXT_INTERFACE contextInterface) + const WINE_CONTEXT_INTERFACE *contextInterface) { BOOL ret; diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 7ca881c..59dde5a 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -41,7 +41,7 @@ typedef struct _WINE_CERT_PROP_HEADER static BOOL CRYPT_SerializeStoreElement(const void *context, const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, - PCWINE_CONTEXT_INTERFACE contextInterface, DWORD dwFlags, BOOL omitHashes, + const WINE_CONTEXT_INTERFACE *contextInterface, DWORD dwFlags, BOOL omitHashes, BYTE *pbElement, DWORD *pcbElement) { BOOL ret; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 6d27fc1..e0a9686 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -54,7 +54,7 @@ static const WINE_CONTEXT_INTERFACE gCertInterface = { (FreeContextFunc)CertFreeCertificateContext, (DeleteContextFunc)CertDeleteCertificateFromStore, }; -PCWINE_CONTEXT_INTERFACE pCertInterface = &gCertInterface; +const WINE_CONTEXT_INTERFACE *pCertInterface = &gCertInterface; static const WINE_CONTEXT_INTERFACE gCRLInterface = { (CreateContextFunc)CertCreateCRLContext, @@ -69,7 +69,7 @@ static const WINE_CONTEXT_INTERFACE gCRLInterface = { (FreeContextFunc)CertFreeCRLContext, (DeleteContextFunc)CertDeleteCRLFromStore, }; -PCWINE_CONTEXT_INTERFACE pCRLInterface = &gCRLInterface; +const WINE_CONTEXT_INTERFACE *pCRLInterface = &gCRLInterface; static const WINE_CONTEXT_INTERFACE gCTLInterface = { (CreateContextFunc)CertCreateCTLContext, @@ -84,7 +84,7 @@ static const WINE_CONTEXT_INTERFACE gCTLInterface = { (FreeContextFunc)CertFreeCTLContext, (DeleteContextFunc)CertDeleteCTLFromStore, }; -PCWINE_CONTEXT_INTERFACE pCTLInterface = &gCTLInterface; +const WINE_CONTEXT_INTERFACE *pCTLInterface = &gCTLInterface; typedef struct _WINE_MEMSTORE {

1 0

Henri Verbeet : d3dcompiler: Get rid of a couple of redundant casts.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: aab72562d56cb322377ed0825530d165d85300f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab72562d56cb322377ed0825… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:47 2013 +0200 d3dcompiler: Get rid of a couple of redundant casts. --- dlls/d3dcompiler_43/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0f61f61..221dad5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1688,7 +1688,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); if (name == type->name) @@ -1825,7 +1825,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls static int compare_function_decl_rb(const void *key, const struct wine_rb_entry *entry) { - const struct list *params = (const struct list *)key; + const struct list *params = key; const struct hlsl_ir_function_decl *decl = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); int params_count = params ? list_count(params) : 0; int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; @@ -1860,7 +1860,7 @@ static const struct wine_rb_functions hlsl_ir_function_decl_rb_funcs = static int compare_function_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_ir_function *func = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); return strcmp(name, func->name);

1 0

Michael Stefaniuc : dplayx: Simplify the creation of a IDPLobbySPImpl COM object.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 30c55f35472b8ea828da884a235794ae27b09df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c55f35472b8ea828da884a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:24:58 2013 +0200 dplayx: Simplify the creation of a IDPLobbySPImpl COM object. --- dlls/dplayx/dplay.c | 3 +- dlls/dplayx/dplay_global.h | 2 +- dlls/dplayx/lobbysp.c | 56 +++++++++++++++++-------------------------- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4529c5e..94ba844 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -187,8 +187,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) sizeof( *This->dp2->dplspData.lpCB ) ); This->dp2->dplspData.lpCB->dwSize = sizeof( *This->dp2->dplspData.lpCB ); - if( FAILED( DPLSP_CreateInterface( &IID_IDPLobbySP, - (LPVOID*)&This->dp2->dplspData.lpISP, This ) ) + if( FAILED( dplobbysp_create( &IID_IDPLobbySP, (void**)&This->dp2->dplspData.lpISP, This ) ) ) { /* FIXME: Memory leak */ diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7fde277..dca6396 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -209,6 +209,6 @@ extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT dplobby_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; -extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 8b0c24c..72198da 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -38,40 +38,6 @@ static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) return CONTAINING_RECORD(iface, IDPLobbySPImpl, IDPLobbySP_iface); } -/* Forward declaration of virtual tables */ -static const IDPLobbySPVtbl dpLobbySPVT; - -HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) -{ - TRACE( " for %s\n", debugstr_guid( riid ) ); - - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDPLobbySPImpl ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) - { - IDPLobbySPImpl *This = *ppvObj; - This->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; - This->dplay = dp; - } - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); - return S_OK; -} - static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, void **ppv ) { @@ -260,3 +226,25 @@ static const IDPLobbySPVtbl dpLobbySPVT = IDPLobbySPImpl_SetSPDataPointer, IDPLobbySPImpl_StartSession }; + +HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) +{ + IDPLobbySPImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), 0, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; + obj->ref = 0; + obj->dplay = dp; + + hr = IDPLobbySP_QueryInterface( &obj->IDPLobbySP_iface, riid, ppv ); + IDPLobbySP_Release( &obj->IDPLobbySP_iface ); + + return hr; +}

1 0

Michael Stefaniuc : dplayx: Remove the unused lock from IDPLobbySPImpl.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

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: Simplify ref-counting for IDPLobbySP.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

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: Merge the extra struct into IDPLobbySPImpl.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

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

Michael Stefaniuc : dplayx: Use consistent naming for the IDPLobbySP members.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

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