ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Where possible, pass a pointer rather than an offset, it's less confusing.

This commit is contained in:
Juan Lang 2007-08-16 10:45:02 -07:00 committed by Alexandre Julliard
parent 2a8aa87878
commit f3128c9244
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/crypt32/store.c
View File

@ -477,13 +477,11 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store,
* Assumes the collection store's lock is held. * Assumes the collection store's lock is held.
*/ */
static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store,
PWINE_STORE_LIST_ENTRY storeEntry, size_t contextFuncsOffset, PWINE_STORE_LIST_ENTRY storeEntry, PCONTEXT_FUNCS contextFuncs,
PCWINE_CONTEXT_INTERFACE contextInterface, void *pPrev, size_t contextSize) PCWINE_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);
PCONTEXT_FUNCS contextFuncs = (PCONTEXT_FUNCS)((LPBYTE)storeEntry->store +
contextFuncsOffset);
TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev); TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev);
@ -506,9 +504,19 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store,
else else
{ {
if (storeNext) if (storeNext)
ret = CRYPT_CollectionAdvanceEnum(store, LIST_ENTRY(storeNext, {
WINE_STORE_LIST_ENTRY, entry), contextFuncsOffset, /* We always want the same function pointers (from certs, crls)
contextInterface, NULL, contextSize); * in the next store, so use the same offset into the next store.
*/
size_t offset = (LPBYTE)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);
ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry,
storeNextContexts, contextInterface, NULL, contextSize);
}
else else
{ {
SetLastError(CRYPT_E_NOT_FOUND); SetLastError(CRYPT_E_NOT_FOUND);
@ -559,7 +567,7 @@ static void *CRYPT_CollectionEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev)
sizeof(CERT_CONTEXT)); sizeof(CERT_CONTEXT));
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
offsetof(WINECRYPT_CERTSTORE, certs), pCertInterface, pPrev, &storeEntry->store->certs, pCertInterface, pPrev,
sizeof(CERT_CONTEXT)); sizeof(CERT_CONTEXT));
} }
else else
@ -570,7 +578,7 @@ static void *CRYPT_CollectionEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev)
WINE_STORE_LIST_ENTRY, entry); WINE_STORE_LIST_ENTRY, entry);
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
offsetof(WINECRYPT_CERTSTORE, certs), pCertInterface, NULL, &storeEntry->store->certs, pCertInterface, NULL,
sizeof(CERT_CONTEXT)); sizeof(CERT_CONTEXT));
} }
else else
@ -638,8 +646,7 @@ static void *CRYPT_CollectionEnumCRL(PWINECRYPT_CERTSTORE store, void *pPrev)
sizeof(CRL_CONTEXT)); sizeof(CRL_CONTEXT));
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
offsetof(WINECRYPT_CERTSTORE, crls), pCRLInterface, pPrev, &storeEntry->store->crls, pCRLInterface, pPrev, sizeof(CRL_CONTEXT));
sizeof(CRL_CONTEXT));
} }
else else
{ {
@ -649,7 +656,7 @@ static void *CRYPT_CollectionEnumCRL(PWINECRYPT_CERTSTORE store, void *pPrev)
WINE_STORE_LIST_ENTRY, entry); WINE_STORE_LIST_ENTRY, entry);
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
offsetof(WINECRYPT_CERTSTORE, crls), pCRLInterface, NULL, &storeEntry->store->crls, pCRLInterface, NULL,
sizeof(CRL_CONTEXT)); sizeof(CRL_CONTEXT));
} }
else else