September 2013 - Wine-commits

Piotr Caban : winedump: Fix TLB function dumping.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 074941c04f4bb0f8a6198ca33bd3e18da8ef9c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=074941c04f4bb0f8a6198ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 4 09:09:44 2013 +0200 winedump: Fix TLB function dumping. --- tools/winedump/tlb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index a65c76e..73e384d 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -597,6 +597,8 @@ static void dump_msft_func(int n) print_hex("HelpStringContext"); if(extra_attr >= 7) print_hex("oCustData"); + for(i = 0; i < extra_attr-7; i++) + print_hex_id("oArgCustData", i); if(fkccic & 0x1000) { for(i=0; i < args_cnt; i++)

1 0

Nikolay Sivov : po: Tweak Russian strings for winecfg.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: b790abe9c6ac0e6c9a206b26ed8c4d5f82afaf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b790abe9c6ac0e6c9a206b26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 11:17:49 2013 +0400 po: Tweak Russian strings for winecfg. --- po/ru.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3bb7397..d0db94e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12633,8 +12633,8 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Wine может имитировать различные версии Windows для каждого приложения " -"отдельно. Эта вкладка связана с вкладками Библиотеки и Графика, что " -"позволяет изменение настроек в этих вкладках как для определённого " +"отдельно. Эта вкладка связана со вкладками Библиотеки и Графика, что " +"позволяет изменять настройки в этих вкладках как для определённого " "приложения, так и глобально." #: winecfg.rc:150 @@ -12671,7 +12671,7 @@ msgstr "&Эмулировать виртуальный рабочий стол" #: winecfg.rc:166 msgid "Desktop &size:" -msgstr "Размер рабочего стола:" +msgstr "&Рабочий стол:" #: winecfg.rc:171 msgid "Screen resolution" @@ -12679,7 +12679,7 @@ msgstr "Разрешение экрана" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "Пример текста (This is a sample text), шрифт Tahoma 10 пунктов" +msgstr "Пример текста, шрифт Tahoma 10 пунктов" #: winecfg.rc:182 msgid "DLL overrides" @@ -12764,7 +12764,7 @@ msgstr "&Путь:" #: winecfg.rc:239 winecfg.rc:35 msgid "Show &Advanced" -msgstr "Показать &дополнительные" +msgstr "&Дополнительно" #: winecfg.rc:240 msgid "De&vice:" @@ -12892,7 +12892,7 @@ msgstr "Выберите файл с темой" #: winecfg.rc:45 msgid "Folder" -msgstr "Стандартные папки" +msgstr "Папка" #: winecfg.rc:46 msgid "Links to"

1 0

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

04 Sep '13

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

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

04 Sep '13

Module: wine Branch: master Commit: ebaf4dd5a4001a31288bf965ff02162cfad22f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaf4dd5a4001a31288bf965f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:27 2013 +0200 crypt32: Get rid of PCONTEXT_FUNCS typedef. --- dlls/crypt32/collectionstore.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index d17c3b7..57a0513 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -88,11 +88,11 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, if (toReplace) { void *existingLinked = Context_GetLinkedContext(toReplace, contextSize); - PCONTEXT_FUNCS contextFuncs; + CONTEXT_FUNCS *contextFuncs; storeEntry = *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(toReplace, contextSize); - contextFuncs = (PCONTEXT_FUNCS)((LPBYTE)storeEntry->store + + contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, existingLinked, (const void **)&childContext); @@ -107,7 +107,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { - PCONTEXT_FUNCS contextFuncs = (PCONTEXT_FUNCS)( + CONTEXT_FUNCS *contextFuncs = (CONTEXT_FUNCS*)( (LPBYTE)entry->store + contextFuncsOffset); storeEntry = entry; @@ -168,8 +168,8 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store; PWINE_STORE_LIST_ENTRY storeNextEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); - PCONTEXT_FUNCS storeNextContexts = - (PCONTEXT_FUNCS)((LPBYTE)storeNextEntry->store + offset); + CONTEXT_FUNCS *storeNextContexts = + (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, storeNextContexts, contextInterface, NULL, contextSize); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 94a3e52..e96d244 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -225,7 +225,7 @@ typedef struct _CONTEXT_FUNCS AddFunc addContext; EnumFunc enumContext; DeleteFunc deleteContext; -} CONTEXT_FUNCS, *PCONTEXT_FUNCS; +} CONTEXT_FUNCS; typedef enum _CertStoreType { StoreTypeMem,

1 0

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

04 Sep '13

Module: wine Branch: master Commit: d8c3ccee287880e8fb3be617063c0dacf8748b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c3ccee287880e8fb3be6170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:36 2013 +0200 crypt32: Get rid of PCONTEXT_PROPERTY_LIST typedef. --- dlls/crypt32/cert.c | 8 ++++---- dlls/crypt32/context.c | 6 +++--- dlls/crypt32/crl.c | 6 +++--- dlls/crypt32/crypt32_private.h | 23 +++++++++++------------ dlls/crypt32/ctl.c | 7 +++---- dlls/crypt32/msg.c | 2 +- dlls/crypt32/proplist.c | 21 ++++++++++----------- 7 files changed, 35 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c3ccee287880e8fb3be…

1 0

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

04 Sep '13

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

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