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

crypt32: Use regular list iterator when there's no need for safe one. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2016-07-06 23:34:20 +03:00 committed by Alexandre Julliard
parent c5b6e31438
commit 94b6a885a8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/crypt32/collectionstore.c
View File

@ -114,10 +114,10 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store,
} }
else else
{ {
WINE_STORE_LIST_ENTRY *entry, *next; WINE_STORE_LIST_ENTRY *entry;
EnterCriticalSection(&store->cs); EnterCriticalSection(&store->cs);
LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry) LIST_FOR_EACH_ENTRY(entry, &store->stores, WINE_STORE_LIST_ENTRY, entry)
{ {
if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG)
{ {
@ -559,7 +559,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore,
{ {
WINE_COLLECTIONSTORE *collection = hCollectionStore; WINE_COLLECTIONSTORE *collection = hCollectionStore;
WINECRYPT_CERTSTORE *sibling = hSiblingStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore;
WINE_STORE_LIST_ENTRY *store, *next; WINE_STORE_LIST_ENTRY *store;
TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore);
@ -578,8 +578,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore,
return; return;
} }
EnterCriticalSection(&collection->cs); EnterCriticalSection(&collection->cs);
LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores, LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY, entry)
WINE_STORE_LIST_ENTRY, entry)
{ {
if (store->store == sibling) if (store->store == sibling)
{ {

5
dlls/crypt32/proplist.c
View File

@ -148,11 +148,10 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id,
void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id)
{ {
CONTEXT_PROPERTY *prop, *next; CONTEXT_PROPERTY *prop;
EnterCriticalSection(&list->cs); EnterCriticalSection(&list->cs);
LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry)
entry)
{ {
if (prop->propID == id) if (prop->propID == id)
{ {