marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Get rid of P*WINE_CONTEXT_INTERFACE typedefs.

oldstable
Jacek Caban 2013-09-04 12:38:17 +02:00 committed by Alexandre Julliard
parent b790abe9c6
commit 9cee96bebf
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/crypt32/collectionstore.c
View File

@ -135,7 +135,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store,
*/ */
static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store,
PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs, 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; void *ret, *child;
struct list *storeNext = list_next(&store->stores, &storeEntry->entry); struct list *storeNext = list_next(&store->stores, &storeEntry->entry);

4
dlls/crypt32/context.c
View File

@ -214,14 +214,14 @@ void Context_CopyProperties(const void *to, const void *from,
struct ContextList struct ContextList
{ {
PCWINE_CONTEXT_INTERFACE contextInterface; const WINE_CONTEXT_INTERFACE *contextInterface;
size_t contextSize; size_t contextSize;
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
struct list contexts; struct list contexts;
}; };
struct ContextList *ContextList_Create( 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)); struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList));

11
dlls/crypt32/crypt32_private.h
View File

@ -194,12 +194,11 @@ typedef struct _WINE_CONTEXT_INTERFACE
SerializeElementFunc serialize; SerializeElementFunc serialize;
FreeContextFunc free; FreeContextFunc free;
DeleteContextFunc deleteFromStore; DeleteContextFunc deleteFromStore;
} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE; } WINE_CONTEXT_INTERFACE;
typedef const WINE_CONTEXT_INTERFACE *PCWINE_CONTEXT_INTERFACE;
extern PCWINE_CONTEXT_INTERFACE pCertInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN;
extern PCWINE_CONTEXT_INTERFACE pCRLInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN;
extern PCWINE_CONTEXT_INTERFACE pCTLInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN;
/* (Internal) certificate store types and functions */ /* (Internal) certificate store types and functions */
struct WINE_CRYPTCERTSTORE; struct WINE_CRYPTCERTSTORE;
@ -404,7 +403,7 @@ void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list) DECLSPEC_HIDDEN;
struct ContextList; struct ContextList;
struct ContextList *ContextList_Create( 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; void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN;

2
dlls/crypt32/regstore.c
View File

@ -349,7 +349,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store,
static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store,
struct list *deleteList, const void *context, struct list *deleteList, const void *context,
PCWINE_CONTEXT_INTERFACE contextInterface) const WINE_CONTEXT_INTERFACE *contextInterface)
{ {
BOOL ret; BOOL ret;

2
dlls/crypt32/serialize.c
View File

@ -41,7 +41,7 @@ typedef struct _WINE_CERT_PROP_HEADER
static BOOL CRYPT_SerializeStoreElement(const void *context, static BOOL CRYPT_SerializeStoreElement(const void *context,
const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, 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) BYTE *pbElement, DWORD *pcbElement)
{ {
BOOL ret; BOOL ret;

6
dlls/crypt32/store.c
View File

@ -54,7 +54,7 @@ static const WINE_CONTEXT_INTERFACE gCertInterface = {
(FreeContextFunc)CertFreeCertificateContext, (FreeContextFunc)CertFreeCertificateContext,
(DeleteContextFunc)CertDeleteCertificateFromStore, (DeleteContextFunc)CertDeleteCertificateFromStore,
}; };
PCWINE_CONTEXT_INTERFACE pCertInterface = &gCertInterface; const WINE_CONTEXT_INTERFACE *pCertInterface = &gCertInterface;
static const WINE_CONTEXT_INTERFACE gCRLInterface = { static const WINE_CONTEXT_INTERFACE gCRLInterface = {
(CreateContextFunc)CertCreateCRLContext, (CreateContextFunc)CertCreateCRLContext,
@ -69,7 +69,7 @@ static const WINE_CONTEXT_INTERFACE gCRLInterface = {
(FreeContextFunc)CertFreeCRLContext, (FreeContextFunc)CertFreeCRLContext,
(DeleteContextFunc)CertDeleteCRLFromStore, (DeleteContextFunc)CertDeleteCRLFromStore,
}; };
PCWINE_CONTEXT_INTERFACE pCRLInterface = &gCRLInterface; const WINE_CONTEXT_INTERFACE *pCRLInterface = &gCRLInterface;
static const WINE_CONTEXT_INTERFACE gCTLInterface = { static const WINE_CONTEXT_INTERFACE gCTLInterface = {
(CreateContextFunc)CertCreateCTLContext, (CreateContextFunc)CertCreateCTLContext,
@ -84,7 +84,7 @@ static const WINE_CONTEXT_INTERFACE gCTLInterface = {
(FreeContextFunc)CertFreeCTLContext, (FreeContextFunc)CertFreeCTLContext,
(DeleteContextFunc)CertDeleteCTLFromStore, (DeleteContextFunc)CertDeleteCTLFromStore,
}; };
PCWINE_CONTEXT_INTERFACE pCTLInterface = &gCTLInterface; const WINE_CONTEXT_INTERFACE *pCTLInterface = &gCTLInterface;
typedef struct _WINE_MEMSTORE typedef struct _WINE_MEMSTORE
{ {