[ros-diffs] [akhaldi] 66805: [CRYPT32] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Thu Mar 19 12:37:00 2015
New Revision: 66805

URL: http://svn.reactos.org/svn/reactos?rev=66805&view=rev
Log:
[CRYPT32] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/crypt32/cert.c
    trunk/reactos/dll/win32/crypt32/rootstore.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/crypt32/cert.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/cert.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/cert.c	[iso-8859-1] Thu Mar 19 12:37:00 2015
@@ -975,7 +975,7 @@
 {
     CRYPT_KEY_PROV_INFO copy;
     WCHAR containerW[MAX_PATH];
-    BOOL matches = FALSE;
+    BOOL matches;
 
     MultiByteToWideChar(CP_ACP, 0, container, -1,
      containerW, sizeof(containerW) / sizeof(containerW[0]));
@@ -1133,7 +1133,7 @@
 BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert,
  DWORD dwFlags, void *pvReserved)
 {
-    BOOL matches = FALSE;
+    BOOL matches;
 
     TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved);
 
@@ -2878,7 +2878,7 @@
 
 static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit)
 {
-    BOOL set = FALSE;
+    BOOL set;
     DWORD indexIndex = bit / BITS_PER_DWORD;
 
     assert(field->cIndexes);
@@ -3090,7 +3090,6 @@
                 CryptMemFree(szProvider);
             }
         }
-        size = sizeof(info.dwKeySpec);
         /* in case no CRYPT_KEY_PROV_INFO given,
          *  we always use AT_SIGNATURE key spec
          */

Modified: trunk/reactos/dll/win32/crypt32/rootstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/rootstore.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/rootstore.c	[iso-8859-1] Thu Mar 19 12:37:00 2015
@@ -482,6 +482,7 @@
  "/usr/share/ca-certificates/ca-bundle.crt",
  "/usr/local/share/certs/",
  "/etc/sfw/openssl/certs",
+ "/etc/security/cacerts",  /* Android */
 };
 
 static const BYTE authenticode[] = {

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Mar 19 12:37:00 2015
@@ -65,7 +65,7 @@
 reactos/dll/win32/comdlg32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/compstui            # Synced to Wine-1.7.27
 reactos/dll/win32/credui              # Synced to Wine-1.7.27
-reactos/dll/win32/crypt32             # Synced to Wine-1.7.27
+reactos/dll/win32/crypt32             # Synced to WineStaging-1.7.37
 reactos/dll/win32/cryptdlg            # Synced to Wine-1.7.27
 reactos/dll/win32/cryptdll            # Synced to Wine-1.7.27
 reactos/dll/win32/cryptnet            # Synced to Wine-1.7.27