[ros-diffs] [akhaldi] 66806: [CRYPT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Thu Mar 19 12:37:21 2015
New Revision: 66806

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

Modified:
    trunk/rostests/winetests/crypt32/base64.c
    trunk/rostests/winetests/crypt32/ctl.c
    trunk/rostests/winetests/crypt32/encode.c
    trunk/rostests/winetests/crypt32/msg.c

Modified: trunk/rostests/winetests/crypt32/base64.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.…
==============================================================================
--- trunk/rostests/winetests/crypt32/base64.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/crypt32/base64.c	[iso-8859-1] Thu Mar 19 12:37:21 2015
@@ -57,7 +57,7 @@
 
 static const BYTE toEncode1[] = { 0 };
 static const BYTE toEncode2[] = { 1,2 };
-static const BYTE toEncode3[] = { 1,2,3 };
+/* static const BYTE toEncode3[] = { 1,2,3 }; */
 static const BYTE toEncode4[] =
  "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"
  "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"

Modified: trunk/rostests/winetests/crypt32/ctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/ctl.c?r…
==============================================================================
--- trunk/rostests/winetests/crypt32/ctl.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/crypt32/ctl.c	[iso-8859-1] Thu Mar 19 12:37:21 2015
@@ -390,20 +390,8 @@
      signedCTLWithCTLInnerContentAndBadSig,
      sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW,
      NULL);
-    if (ret)
-    {
-        /* win9x */
-        ok(GetLastError() == CRYPT_E_NOT_FOUND ||
-           GetLastError() == OSS_DATA_ERROR /* some win98 */,
-           "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError());
-    }
-    else
-    {
-        ok(!ret && (GetLastError() == CRYPT_E_EXISTS ||
-           GetLastError() == OSS_DATA_ERROR),
-           "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret,
-           GetLastError());
-    }
+    ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() ==
OSS_DATA_ERROR),
+     "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret,
GetLastError());
     CertCloseStore(store, 0);
 
     store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

Modified: trunk/rostests/winetests/crypt32/encode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.…
==============================================================================
--- trunk/rostests/winetests/crypt32/encode.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/crypt32/encode.c	[iso-8859-1] Thu Mar 19 12:37:21 2015
@@ -3732,7 +3732,7 @@
         case CERT_ALT_NAME_IP_ADDRESS:
             ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData,
                "Unexpected IP address length %d\n", U(*got).IPAddress.cbData);
-            ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData,
+            ok(!memcmp(U(*got).IPAddress.pbData, U(*expected).IPAddress.pbData,
                        U(*got).IPAddress.cbData), "Unexpected value\n");
             break;
         }
@@ -5762,7 +5762,6 @@
     info.SubjectAlgorithm.Parameters.cbData = 0;
     info.ThisUpdate.dwLowDateTime = info.ThisUpdate.dwHighDateTime = 0;
     info.NextUpdate.dwLowDateTime = info.NextUpdate.dwHighDateTime = 0;
-    info.SubjectAlgorithm.pszObjId = oid2;
     info.SubjectAlgorithm.pszObjId = NULL;
     value1.cbData = sizeof(emptySequence);
     value1.pbData = (LPBYTE)emptySequence;

Modified: trunk/rostests/winetests/crypt32/msg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/msg.c?r…
==============================================================================
--- trunk/rostests/winetests/crypt32/msg.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/crypt32/msg.c	[iso-8859-1] Thu Mar 19 12:37:21 2015
@@ -2666,12 +2666,12 @@
     ok(got->Issuer.cbData == expected->Issuer.cbData,
      "Expected issuer size %d, got %d\n", expected->Issuer.cbData,
      got->Issuer.cbData);
-    ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData),
+    ok(!memcmp(got->Issuer.pbData, expected->Issuer.pbData,
got->Issuer.cbData),
      "Unexpected issuer\n");
     ok(got->SerialNumber.cbData == expected->SerialNumber.cbData,
      "Expected serial number size %d, got %d\n",
expected->SerialNumber.cbData,
      got->SerialNumber.cbData);
-    ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData,
+    ok(!memcmp(got->SerialNumber.pbData, expected->SerialNumber.pbData,
      got->SerialNumber.cbData), "Unexpected serial number\n");
     /* FIXME: check more things */
 }