October 2013 - Wine-Commits

Jacek Caban : crypt32: Use list struct directly instead of ContextList wrapper.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 23884726f7e584899de6f92e0137027a4df2d4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23884726f7e584899de6f92e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:09:23 2013 +0200 crypt32: Use list struct directly instead of ContextList wrapper. --- dlls/crypt32/context.c | 38 ++++++++------------------------------ dlls/crypt32/crypt32_private.h | 12 +++++------- dlls/crypt32/store.c | 36 ++++++++++++++++++------------------ 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 25cb8be..d6d67d1 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -110,23 +110,7 @@ void Context_CopyProperties(const void *to, const void *from) ContextPropertyList_Copy(toProperties, fromProperties); } -struct ContextList -{ - struct list contexts; -}; - -struct ContextList *ContextList_Create(void) -{ - struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList)); - - if (list) - { - list_init(&list->contexts); - } - return list; -} - -context_t *ContextList_Add(struct ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, +context_t *ContextList_Add(ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, context_t *existing, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) { context_t *context; @@ -148,13 +132,13 @@ context_t *ContextList_Add(struct ContextList *list, CRITICAL_SECTION *cs, conte Context_Release(existing); } else - list_add_head(&list->contexts, &context->u.entry); + list_add_head(list, &context->u.entry); LeaveCriticalSection(cs); } return context; } -context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, context_t *prev) +context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) { struct list *listNext; context_t *ret; @@ -162,11 +146,11 @@ context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, cont EnterCriticalSection(cs); if (prev) { - listNext = list_next(&list->contexts, &prev->u.entry); + listNext = list_next(list, &prev->u.entry); Context_Release(prev); } else - listNext = list_next(&list->contexts, &list->contexts); + listNext = list_next(list, list); LeaveCriticalSection(cs); if (listNext) @@ -179,7 +163,7 @@ context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, cont return ret; } -BOOL ContextList_Remove(struct ContextList *list, CRITICAL_SECTION *cs, context_t *context) +BOOL ContextList_Remove(ContextList *list, CRITICAL_SECTION *cs, context_t *context) { BOOL inList = FALSE; @@ -195,20 +179,14 @@ BOOL ContextList_Remove(struct ContextList *list, CRITICAL_SECTION *cs, context_ return inList; } -static void ContextList_Empty(struct ContextList *list) +void ContextList_Free(ContextList *list) { context_t *context, *next; - LIST_FOR_EACH_ENTRY_SAFE(context, next, &list->contexts, context_t, u.entry) + LIST_FOR_EACH_ENTRY_SAFE(context, next, list, context_t, u.entry) { TRACE("removing %p\n", context); list_remove(&context->u.entry); Context_Release(context); } } - -void ContextList_Free(struct ContextList *list) -{ - ContextList_Empty(list); - CryptMemFree(list); -} diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 2061ee4..a0f96c5 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -436,22 +436,20 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; /** * Context list functions. A context list is a simple list of link contexts. */ -struct ContextList; +typedef struct list ContextList; -struct ContextList *ContextList_Create(void) DECLSPEC_HIDDEN; - -context_t *ContextList_Add(struct ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, context_t *toReplace, +context_t *ContextList_Add(ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, context_t *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; -context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, context_t *prev) DECLSPEC_HIDDEN; +context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) DECLSPEC_HIDDEN; /* Removes a context from the list. Returns TRUE if the context was removed, * or FALSE if not. (The context may have been duplicated, so subsequent * removes have no effect.) */ -BOOL ContextList_Remove(struct ContextList *list, CRITICAL_SECTION *cs, context_t *context) DECLSPEC_HIDDEN; +BOOL ContextList_Remove(ContextList *list, CRITICAL_SECTION *cs, context_t *context) DECLSPEC_HIDDEN; -void ContextList_Free(struct ContextList *list) DECLSPEC_HIDDEN; +void ContextList_Free(ContextList *list) DECLSPEC_HIDDEN; extern WINECRYPT_CERTSTORE empty_store; void init_empty_store(void) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 3cbf9e4..8222d24 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -83,9 +83,9 @@ typedef struct _WINE_MEMSTORE { WINECRYPT_CERTSTORE hdr; CRITICAL_SECTION cs; - struct ContextList *certs; - struct ContextList *crls; - struct ContextList *ctls; + struct list certs; + struct list crls; + struct list ctls; } WINE_MEMSTORE; void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags, CertStoreType type, const store_vtbl_t *vtbl) @@ -151,7 +151,7 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = ContextList_Add(ms->certs, &ms->cs, cert, toReplace, store, use_link); + context = ContextList_Add(&ms->certs, &ms->cs, cert, toReplace, store, use_link); if (!context) return FALSE; @@ -169,7 +169,7 @@ static context_t *MemStore_enumCert(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->certs, &ms->cs, prev); + ret = ContextList_Enum(&ms->certs, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -181,7 +181,7 @@ static BOOL MemStore_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (ContextList_Remove(ms->certs, &ms->cs, context)) + if (ContextList_Remove(&ms->certs, &ms->cs, context)) Context_Release(context); return TRUE; @@ -195,7 +195,7 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(ms->crls, &ms->cs, crl, toReplace, store, use_link); + context = ContextList_Add(&ms->crls, &ms->cs, crl, toReplace, store, use_link); if (!context) return FALSE; @@ -213,7 +213,7 @@ static context_t *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->crls, &ms->cs, prev); + ret = ContextList_Enum(&ms->crls, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -225,7 +225,7 @@ static BOOL MemStore_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(ms->crls, &ms->cs, context)) + if (!ContextList_Remove(&ms->crls, &ms->cs, context)) Context_Release(context); return TRUE; @@ -239,7 +239,7 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(ms->ctls, &ms->cs, ctl, toReplace, store, use_link); + context = ContextList_Add(&ms->ctls, &ms->cs, ctl, toReplace, store, use_link); if (!context) return FALSE; @@ -257,7 +257,7 @@ static context_t *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->ctls, &ms->cs, prev); + ret = ContextList_Enum(&ms->ctls, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -269,7 +269,7 @@ static BOOL MemStore_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(ms->ctls, &ms->cs, context)) + if (!ContextList_Remove(&ms->ctls, &ms->cs, context)) Context_Release(context); return TRUE; @@ -294,9 +294,9 @@ static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags) if(ref) return (flags & CERT_CLOSE_STORE_CHECK_FLAG) ? CRYPT_E_PENDING_CLOSE : ERROR_SUCCESS; - ContextList_Free(store->certs); - ContextList_Free(store->crls); - ContextList_Free(store->ctls); + ContextList_Free(&store->certs); + ContextList_Free(&store->crls); + ContextList_Free(&store->ctls); store->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&store->cs); CRYPT_FreeStore(&store->hdr); @@ -350,9 +350,9 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeMem, &MemStoreVtbl); InitializeCriticalSection(&store->cs); store->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); - store->certs = ContextList_Create(); - store->crls = ContextList_Create(); - store->ctls = ContextList_Create(); + list_init(&store->certs); + list_init(&store->crls); + list_init(&store->ctls); /* Mem store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(hCryptProv, 0);

1 0

Jacek Caban : crypt32: Moved critical section out of ContextList struct.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 724754da64c791f58195d5b1ceaf6eb727b4fc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724754da64c791f58195d5b1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:09:03 2013 +0200 crypt32: Moved critical section out of ContextList struct. --- dlls/crypt32/context.c | 26 ++++++++++---------------- dlls/crypt32/crypt32_private.h | 6 +++--- dlls/crypt32/store.c | 23 ++++++++++++++--------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 4704154..25cb8be 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -112,7 +112,6 @@ void Context_CopyProperties(const void *to, const void *from) struct ContextList { - CRITICAL_SECTION cs; struct list contexts; }; @@ -122,14 +121,13 @@ struct ContextList *ContextList_Create(void) if (list) { - InitializeCriticalSection(&list->cs); - list->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); list_init(&list->contexts); } return list; } -context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *existing, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) +context_t *ContextList_Add(struct ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, + context_t *existing, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) { context_t *context; @@ -139,7 +137,7 @@ context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_ if (context) { TRACE("adding %p\n", context); - EnterCriticalSection(&list->cs); + EnterCriticalSection(cs); if (existing) { context->u.entry.prev = existing->u.entry.prev; @@ -151,17 +149,17 @@ context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_ } else list_add_head(&list->contexts, &context->u.entry); - LeaveCriticalSection(&list->cs); + LeaveCriticalSection(cs); } return context; } -context_t *ContextList_Enum(struct ContextList *list, context_t *prev) +context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, context_t *prev) { struct list *listNext; context_t *ret; - EnterCriticalSection(&list->cs); + EnterCriticalSection(cs); if (prev) { listNext = list_next(&list->contexts, &prev->u.entry); @@ -169,7 +167,7 @@ context_t *ContextList_Enum(struct ContextList *list, context_t *prev) } else listNext = list_next(&list->contexts, &list->contexts); - LeaveCriticalSection(&list->cs); + LeaveCriticalSection(cs); if (listNext) { @@ -181,18 +179,18 @@ context_t *ContextList_Enum(struct ContextList *list, context_t *prev) return ret; } -BOOL ContextList_Remove(struct ContextList *list, context_t *context) +BOOL ContextList_Remove(struct ContextList *list, CRITICAL_SECTION *cs, context_t *context) { BOOL inList = FALSE; - EnterCriticalSection(&list->cs); + EnterCriticalSection(cs); if (!list_empty(&context->u.entry)) { list_remove(&context->u.entry); list_init(&context->u.entry); inList = TRUE; } - LeaveCriticalSection(&list->cs); + LeaveCriticalSection(cs); return inList; } @@ -201,20 +199,16 @@ static void ContextList_Empty(struct ContextList *list) { context_t *context, *next; - EnterCriticalSection(&list->cs); LIST_FOR_EACH_ENTRY_SAFE(context, next, &list->contexts, context_t, u.entry) { TRACE("removing %p\n", context); list_remove(&context->u.entry); Context_Release(context); } - LeaveCriticalSection(&list->cs); } void ContextList_Free(struct ContextList *list) { ContextList_Empty(list); - list->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&list->cs); CryptMemFree(list); } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d9f2400..2061ee4 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -440,16 +440,16 @@ struct ContextList; struct ContextList *ContextList_Create(void) DECLSPEC_HIDDEN; -context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *toReplace, +context_t *ContextList_Add(struct ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, context_t *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; -context_t *ContextList_Enum(struct ContextList *list, context_t *prev) DECLSPEC_HIDDEN; +context_t *ContextList_Enum(struct ContextList *list, CRITICAL_SECTION *cs, context_t *prev) DECLSPEC_HIDDEN; /* Removes a context from the list. Returns TRUE if the context was removed, * or FALSE if not. (The context may have been duplicated, so subsequent * removes have no effect.) */ -BOOL ContextList_Remove(struct ContextList *list, context_t *context) DECLSPEC_HIDDEN; +BOOL ContextList_Remove(struct ContextList *list, CRITICAL_SECTION *cs, context_t *context) DECLSPEC_HIDDEN; void ContextList_Free(struct ContextList *list) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 7fc6acd..3cbf9e4 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -82,6 +82,7 @@ const WINE_CONTEXT_INTERFACE *pCTLInterface = &gCTLInterface; typedef struct _WINE_MEMSTORE { WINECRYPT_CERTSTORE hdr; + CRITICAL_SECTION cs; struct ContextList *certs; struct ContextList *crls; struct ContextList *ctls; @@ -150,7 +151,7 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = ContextList_Add(ms->certs, cert, toReplace, store, use_link); + context = ContextList_Add(ms->certs, &ms->cs, cert, toReplace, store, use_link); if (!context) return FALSE; @@ -168,7 +169,7 @@ static context_t *MemStore_enumCert(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->certs, prev); + ret = ContextList_Enum(ms->certs, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -180,7 +181,7 @@ static BOOL MemStore_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (ContextList_Remove(ms->certs, context)) + if (ContextList_Remove(ms->certs, &ms->cs, context)) Context_Release(context); return TRUE; @@ -194,7 +195,7 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(ms->crls, crl, toReplace, store, use_link); + context = ContextList_Add(ms->crls, &ms->cs, crl, toReplace, store, use_link); if (!context) return FALSE; @@ -212,7 +213,7 @@ static context_t *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->crls, prev); + ret = ContextList_Enum(ms->crls, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -224,7 +225,7 @@ static BOOL MemStore_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(ms->crls, context)) + if (!ContextList_Remove(ms->crls, &ms->cs, context)) Context_Release(context); return TRUE; @@ -238,7 +239,7 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(ms->ctls, ctl, toReplace, store, use_link); + context = ContextList_Add(ms->ctls, &ms->cs, ctl, toReplace, store, use_link); if (!context) return FALSE; @@ -256,7 +257,7 @@ static context_t *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev) TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(ms->ctls, prev); + ret = ContextList_Enum(ms->ctls, &ms->cs, prev); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); @@ -268,7 +269,7 @@ static BOOL MemStore_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(ms->ctls, context)) + if (!ContextList_Remove(ms->ctls, &ms->cs, context)) Context_Release(context); return TRUE; @@ -296,6 +297,8 @@ static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags) ContextList_Free(store->certs); ContextList_Free(store->crls); ContextList_Free(store->ctls); + store->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&store->cs); CRYPT_FreeStore(&store->hdr); return ERROR_SUCCESS; } @@ -345,6 +348,8 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, { memset(store, 0, sizeof(WINE_MEMSTORE)); CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeMem, &MemStoreVtbl); + InitializeCriticalSection(&store->cs); + store->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); store->certs = ContextList_Create(); store->crls = ContextList_Create(); store->ctls = ContextList_Create();

1 0

Jacek Caban : crypt32: Get rid of no longer needed contextSize arguments.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 6cf1e0d75cafa34379ca4ed967451875949fd881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf1e0d75cafa34379ca4ed96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:08:47 2013 +0200 crypt32: Get rid of no longer needed contextSize arguments. --- dlls/crypt32/collectionstore.c | 41 +++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 8f15295..b5d1b8b 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -72,7 +72,7 @@ static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags) } static context_t *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, - WINE_STORE_LIST_ENTRY *storeEntry, context_t *child, size_t contextSize) + WINE_STORE_LIST_ENTRY *storeEntry, context_t *child) { context_t *ret; @@ -85,15 +85,14 @@ static context_t *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *s } static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, - unsigned int contextFuncsOffset, context_t *context, context_t *toReplace, unsigned int contextSize, + unsigned int contextFuncsOffset, context_t *context, context_t *toReplace, context_t **pChildContext) { BOOL ret; context_t *childContext = NULL; WINE_STORE_LIST_ENTRY *storeEntry = NULL; - TRACE("(%p, %d, %p, %p, %d)\n", store, contextFuncsOffset, context, - toReplace, contextSize); + TRACE("(%p, %d, %p, %p)\n", store, contextFuncsOffset, context, toReplace); ret = FALSE; if (toReplace) @@ -143,7 +142,7 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, */ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, - const WINE_CONTEXT_INTERFACE *contextInterface, context_t *prev, size_t contextSize) + const WINE_CONTEXT_INTERFACE *contextInterface, context_t *prev) { context_t *child, *ret; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); @@ -166,7 +165,7 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, child = contextFuncs->enumContext(storeEntry->store, NULL); } if (child) { - ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child, contextSize); + ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child); Context_Release(child); } else @@ -183,7 +182,7 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store->vtbl + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, - storeNextContexts, contextInterface, NULL, contextSize); + storeNextContexts, contextInterface, NULL); } else { @@ -203,12 +202,12 @@ static BOOL Collection_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(store_vtbl_t, certs), - cert, toReplace, sizeof(CERT_CONTEXT), &childContext); + cert, toReplace, &childContext); if (ppStoreContext && childContext) { WINE_STORE_LIST_ENTRY *storeEntry = childContext->u.ptr; cert_t *context = (cert_t*)CRYPT_CollectionCreateContextFromChild(cs, storeEntry, - childContext, sizeof(CERT_CONTEXT)); + childContext); *ppStoreContext = &context->base; } @@ -230,8 +229,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, prev, - sizeof(CERT_CONTEXT)); + &storeEntry->store->vtbl->certs, pCertInterface, prev); } else { @@ -241,8 +239,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, NULL, - sizeof(CERT_CONTEXT)); + &storeEntry->store->vtbl->certs, pCertInterface, NULL); } else { @@ -277,12 +274,12 @@ static BOOL Collection_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(store_vtbl_t, crls), - crl, toReplace, sizeof(CRL_CONTEXT), &childContext); + crl, toReplace, &childContext); if (ppStoreContext && childContext) { WINE_STORE_LIST_ENTRY *storeEntry = childContext->u.ptr; crl_t *context = (crl_t*)CRYPT_CollectionCreateContextFromChild(cs, storeEntry, - childContext, sizeof(CRL_CONTEXT)); + childContext); *ppStoreContext = &context->base; } @@ -304,7 +301,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, prev, sizeof(CRL_CONTEXT)); + &storeEntry->store->vtbl->crls, pCRLInterface, prev); } else { @@ -314,8 +311,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, NULL, - sizeof(CRL_CONTEXT)); + &storeEntry->store->vtbl->crls, pCRLInterface, NULL); } else { @@ -349,12 +345,12 @@ static BOOL Collection_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(store_vtbl_t, ctls), - ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); + ctl, toReplace, &childContext); if (ppStoreContext && childContext) { WINE_STORE_LIST_ENTRY *storeEntry = childContext->u.ptr; ctl_t *context = (ctl_t*)CRYPT_CollectionCreateContextFromChild(cs, storeEntry, - childContext, sizeof(CTL_CONTEXT)); + childContext); *ppStoreContext = &context->base; } @@ -376,7 +372,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, prev, sizeof(CTL_CONTEXT)); + &storeEntry->store->vtbl->ctls, pCTLInterface, prev); } else { @@ -386,8 +382,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, NULL, - sizeof(CTL_CONTEXT)); + &storeEntry->store->vtbl->ctls, pCTLInterface, NULL); } else {

1 0

Jacek Caban : crypt32: Use context_t in enumContext.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: c75af2b9e06b193e7cf5f5f75e47e78224a78028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75af2b9e06b193e7cf5f5f75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:07:55 2013 +0200 crypt32: Use context_t in enumContext. --- dlls/crypt32/collectionstore.c | 79 +++++++++++++++++++--------------------- dlls/crypt32/context.c | 14 ++++---- dlls/crypt32/crypt32_private.h | 7 +--- dlls/crypt32/ctl.c | 9 ++--- dlls/crypt32/provstore.c | 66 +++++++++++++++++----------------- dlls/crypt32/store.c | 46 +++++++++++------------ 6 files changed, 106 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c75af2b9e06b193e7cf5f…

1 0

Jacek Caban : crypt32: Use context_t in addContext.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 83026a71430bbc82239cc22ee99e1f812969caea URL: http://source.winehq.org/git/wine.git/?a=commit;h=83026a71430bbc82239cc22ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:08:15 2013 +0200 crypt32: Use context_t in addContext. --- dlls/crypt32/cert.c | 18 ++++++----- dlls/crypt32/collectionstore.c | 63 ++++++++++++++++++++------------------- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/ctl.c | 13 ++++++-- dlls/crypt32/provstore.c | 25 +++++++-------- dlls/crypt32/store.c | 44 ++++++++++++++++------------ 6 files changed, 89 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83026a71430bbc82239cc…

1 0

Jacek Caban : crypt32: Get rid of no longer used functions.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 275ac93e8db02d309f46d58af834bb5590481f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=275ac93e8db02d309f46d58af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:07:08 2013 +0200 crypt32: Get rid of no longer used functions. --- dlls/crypt32/context.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 65e9fab..02ec40d 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -76,22 +76,6 @@ void Context_AddRef(context_t *context) TRACE("(%p) ref=%d\n", context, context->ref); } -void *Context_GetExtra(const void *context, size_t contextSize) -{ - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); - - assert(baseContext->linked != NULL); - return (LPBYTE)CONTEXT_FROM_BASE_CONTEXT(baseContext) + contextSize; -} - -void *Context_GetLinkedContext(void *context) -{ - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); - - assert(baseContext->linked != NULL); - return CONTEXT_FROM_BASE_CONTEXT(baseContext->linked); -} - CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) { BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context);

1 0

Jacek Caban : crypt32: Added more cert duplicate and link tests.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: e7eeef49ff884e41178f4c2a969dfedb2608cce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7eeef49ff884e41178f4c2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:06:59 2013 +0200 crypt32: Added more cert duplicate and link tests. --- dlls/crypt32/tests/cert.c | 77 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index dfb6921..a96a75f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -680,8 +680,8 @@ static void testCreateCert(void) static void testDupCert(void) { - HCERTSTORE store; - PCCERT_CONTEXT context, dupContext; + PCCERT_CONTEXT context, dupContext, storeContext, storeContext2, context2; + HCERTSTORE store, store2; BOOL ret; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -719,11 +719,83 @@ static void testDupCert(void) } CertCloseStore(store, 0); + context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok(context != NULL, "CertCreateCertificateContext failed\n"); + + dupContext = CertDuplicateCertificateContext(context); + ok(dupContext == context, "context != dupContext\n"); + + CertFreeCertificateContext(dupContext); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateContextToStore(store, context, CERT_STORE_ADD_NEW, &storeContext); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(storeContext != NULL && storeContext != context, "unexpected storeContext\n"); + ok(storeContext->hCertStore == store, "unexpected hCertStore\n"); + + ok(storeContext->pbCertEncoded != context->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(storeContext->cbCertEncoded == context->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(storeContext->pCertInfo != context->pCertInfo, "unexpected pCertInfo\n"); + + store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store2 != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateContextToStore(store2, storeContext, CERT_STORE_ADD_NEW, &storeContext2); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(storeContext2 != NULL && storeContext2 != storeContext, "unexpected storeContext\n"); + ok(storeContext2->hCertStore == store2, "unexpected hCertStore\n"); + + ok(storeContext2->pbCertEncoded != storeContext->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(storeContext2->cbCertEncoded == storeContext->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(storeContext2->pCertInfo != storeContext->pCertInfo, "unexpected pCertInfo\n"); + + CertFreeCertificateContext(storeContext2); + CertFreeCertificateContext(storeContext); + + context2 = CertCreateCertificateContext(X509_ASN_ENCODING, certWithUsage, sizeof(certWithUsage)); + ok(context2 != NULL, "CertCreateCertificateContext failed\n"); + + ok(context2->hCertStore == context->hCertStore, "Unexpected hCertStore\n"); + + CertFreeCertificateContext(context2); + CertFreeCertificateContext(context); + + CertCloseStore(store, 0); + CertCloseStore(store2, 0); + SetLastError(0xdeadbeef); context = CertDuplicateCertificateContext(NULL); ok(context == NULL, "Expected context to be NULL\n"); } +static void testLinkCert(void) +{ + const CERT_CONTEXT *context, *link; + HCERTSTORE store; + BOOL ret; + + context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok(context != NULL, "CertCreateCertificateContext failed\n"); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateLinkToStore(store, context, CERT_STORE_ADD_NEW, &link); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(link != NULL && link != context, "unexpected storeContext\n"); + ok(link->hCertStore == store, "unexpected hCertStore\n"); + + ok(link->pbCertEncoded == context->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(link->cbCertEncoded == context->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(link->pCertInfo == context->pCertInfo, "unexpected pCertInfo\n"); + + CertFreeCertificateContext(link); + + CertCloseStore(store, 0); +} + static BYTE subjectName3[] = { 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x52, 0x6f, 0x62, 0x20, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00 }; @@ -3902,6 +3974,7 @@ START_TEST(cert) testFindCert(); testGetSubjectCert(); testGetIssuerCert(); + testLinkCert(); testCryptHashCert(); testCertSigs();

1 0

Frédéric Delanoy : winefile: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 0b977adc67e0e1e6277e3544b1c960fbbdf1974f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b977adc67e0e1e6277e3544b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:34 2013 +0200 winefile: Use BOOL type where appropriate. --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 4729436..c85d1ac 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2695,7 +2695,7 @@ static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, { static const WCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; - static int s_init = 0; + static BOOL s_init = FALSE; Entry* entry = pane->root; pane->hwnd = CreateWindowW(sListBox, sEmpty, WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL| @@ -2713,7 +2713,7 @@ static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, /* calculate column widths */ if (!s_init) { - s_init = 1; + s_init = TRUE; init_output(pane->hwnd); }

1 0

Frédéric Delanoy : wordpad: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 682c89ced33d37a4c14324c9ba41c31034d04a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=682c89ced33d37a4c14324c9b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:32 2013 +0200 wordpad: Use BOOL type where appropriate. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index eb48e48..9021989 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -1141,7 +1141,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { POINT pt; RECT rc; - int bHittest = FALSE; + int bHittest = 0; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos);

1 0

Frédéric Delanoy : cmd: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: e459131677bdf2e4dc07e9465427e9569ffd87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e459131677bdf2e4dc07e9465… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:31 2013 +0200 cmd: Use BOOL type where appropriate. --- programs/cmd/builtins.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 64e12a0..11af74b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -280,7 +280,7 @@ void WCMD_choice (const WCHAR * args) { DWORD opt_timeout = 0; DWORD count; DWORD oldmode; - DWORD have_console; + BOOL have_console; BOOL opt_n = FALSE; BOOL opt_s = FALSE; @@ -2820,7 +2820,7 @@ syntax_err: void WCMD_move (void) { - int status; + BOOL status; WIN32_FIND_DATAW fd; HANDLE hff; WCHAR input[MAX_PATH]; @@ -2923,7 +2923,7 @@ void WCMD_move (void) if (ok) { status = MoveFileW(src, dest); } else { - status = 1; /* Anything other than 0 to prevent error msg below */ + status = TRUE; } if (!status) { @@ -3036,7 +3036,7 @@ void WCMD_remove_dir (WCHAR *args) { void WCMD_rename (void) { - int status; + BOOL status; HANDLE hff; WIN32_FIND_DATAW fd; WCHAR input[MAX_PATH]; @@ -4024,7 +4024,7 @@ void WCMD_setshow_env (WCHAR *s) { LPVOID env; WCHAR *p; - int status; + BOOL status; static const WCHAR parmP[] = {'/','P','\0'}; static const WCHAR parmA[] = {'/','A','\0'}; WCHAR string[MAXSTRING]; @@ -4140,7 +4140,7 @@ void WCMD_setshow_env (WCHAR *s) { gle = GetLastError(); if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; - } else if ((!status)) WCMD_print_error(); + } else if (!status) WCMD_print_error(); else errorlevel = 0; } }

1 0