Jacek Caban : crypt32: Get rid of no longer needed fields in ContextList.
Alexandre Julliard
julliard at winehq.org
Thu Oct 17 13:51:50 CDT 2013
Module: wine
Branch: master
Commit: 6b6ad98277e809c3420df818a210a37e900d2428
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ad98277e809c3420df818a210a37e900d2428
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Oct 17 11:08:35 2013 +0200
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 65a906b..4704154 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 f02a333..d9f2400 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 902b02c..7fc6acd 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);
More information about the wine-cvs
mailing list