Author: akhaldi
Date: Thu Aug 18 10:01:42 2016
New Revision: 72276
URL: http://svn.reactos.org/svn/reactos?rev=72276&view=rev
Log:
[CRYPT32] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/crypt32/collectionstore.c
trunk/reactos/dll/win32/crypt32/proplist.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collectionstore.c?rev=72276&r1=72275&r2=72276&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Thu Aug 18
10:01:42 2016
@@ -110,10 +110,10 @@
}
else
{
- WINE_STORE_LIST_ENTRY *entry, *next;
+ WINE_STORE_LIST_ENTRY *entry;
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)
{
@@ -555,7 +555,7 @@
{
WINE_COLLECTIONSTORE *collection = hCollectionStore;
WINECRYPT_CERTSTORE *sibling = hSiblingStore;
- WINE_STORE_LIST_ENTRY *store, *next;
+ WINE_STORE_LIST_ENTRY *store;
TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore);
@@ -574,8 +574,7 @@
return;
}
EnterCriticalSection(&collection->cs);
- LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores,
- WINE_STORE_LIST_ENTRY, entry)
+ LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY,
entry)
{
if (store->store == sibling)
{
Modified: trunk/reactos/dll/win32/crypt32/proplist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist.c?rev=72276&r1=72275&r2=72276&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] Thu Aug 18
10:01:42 2016
@@ -142,11 +142,10 @@
void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id)
{
- CONTEXT_PROPERTY *prop, *next;
+ CONTEXT_PROPERTY *prop;
EnterCriticalSection(&list->cs);
- LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY,
- entry)
+ LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry)
{
if (prop->propID == id)
{
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72276&r1=72275&r2=72276&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:01:42 2016
@@ -58,7 +58,7 @@
reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11
reactos/dll/win32/compstui # Synced to WineStaging-1.9.11
reactos/dll/win32/credui # Synced to WineStaging-1.9.16
-reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11
+reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.16
reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11
reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11
reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11
