From 31c9d59bc1a1eaba91cedbea7ba5664bd9217c0b Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 19 Mar 2015 12:37:21 +0000
Subject: [PATCH] [CRYPT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=66806
---
 rostests/winetests/crypt32/base64.c |  2 +-
 rostests/winetests/crypt32/ctl.c    | 16 ++--------------
 rostests/winetests/crypt32/encode.c |  3 +--
 rostests/winetests/crypt32/msg.c    |  4 ++--
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/rostests/winetests/crypt32/base64.c b/rostests/winetests/crypt32/base64.c
index 5f9fdca6bde..59d13602750 100644
--- a/rostests/winetests/crypt32/base64.c
+++ b/rostests/winetests/crypt32/base64.c
@@ -57,7 +57,7 @@ struct BinTests
 
 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"
diff --git a/rostests/winetests/crypt32/ctl.c b/rostests/winetests/crypt32/ctl.c
index e3b773c90e9..25fa03cacf6 100644
--- a/rostests/winetests/crypt32/ctl.c
+++ b/rostests/winetests/crypt32/ctl.c
@@ -390,20 +390,8 @@ static void testAddCTLToStore(void)
      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,
diff --git a/rostests/winetests/crypt32/encode.c b/rostests/winetests/crypt32/encode.c
index 03d007ae498..71d3294abff 100644
--- a/rostests/winetests/crypt32/encode.c
+++ b/rostests/winetests/crypt32/encode.c
@@ -3732,7 +3732,7 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected,
         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 @@ static void test_decodeCTL(DWORD dwEncoding)
     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;
diff --git a/rostests/winetests/crypt32/msg.c b/rostests/winetests/crypt32/msg.c
index 58662153a63..639e4271371 100644
--- a/rostests/winetests/crypt32/msg.c
+++ b/rostests/winetests/crypt32/msg.c
@@ -2666,12 +2666,12 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got,
     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 */
 }