From 6b6ad98277e809c3420df818a210a37e900d2428 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 17 Oct 2013 11:08:35 +0200 Subject: [PATCH] crypt32: Get rid of no longer needed fields in ContextList. --- dlls/crypt32/context.c | 7 +------ dlls/crypt32/crypt32_private.h | 3 +-- dlls/crypt32/store.c | 9 +++------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 65a906be3bb..4704154c12d 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -112,21 +112,16 @@ void Context_CopyProperties(const void *to, const void *from) struct ContextList { - const WINE_CONTEXT_INTERFACE *contextInterface; - size_t contextSize; CRITICAL_SECTION cs; struct list contexts; }; -struct ContextList *ContextList_Create( - const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) +struct ContextList *ContextList_Create(void) { struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList)); if (list) { - list->contextInterface = contextInterface; - list->contextSize = contextSize; InitializeCriticalSection(&list->cs); list->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); list_init(&list->contexts); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index f02a333b5fe..d9f24006390 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -438,8 +438,7 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; */ struct ContextList; -struct ContextList *ContextList_Create( - const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; +struct ContextList *ContextList_Create(void) DECLSPEC_HIDDEN; context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 902b02cf790..7fc6acd3be1 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -345,12 +345,9 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, { memset(store, 0, sizeof(WINE_MEMSTORE)); CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeMem, &MemStoreVtbl); - store->certs = ContextList_Create(pCertInterface, - sizeof(CERT_CONTEXT)); - store->crls = ContextList_Create(pCRLInterface, - sizeof(CRL_CONTEXT)); - store->ctls = ContextList_Create(pCTLInterface, - sizeof(CTL_CONTEXT)); + store->certs = ContextList_Create(); + store->crls = ContextList_Create(); + store->ctls = ContextList_Create(); /* Mem store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(hCryptProv, 0); -- 2.11.4.GIT