From 71e8bf218c5f4e8446ecf1a8597ffb87a1369fab Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 8 Apr 2013 16:22:36 +0000
Subject: [PATCH] [CRYPTNET_WINETEST] * Sync with Wine 1.5.26.

svn path=/trunk/; revision=58720
---
 rostests/winetests/cryptnet/cryptnet.c | 18 +++++++++++++-----
 rostests/winetests/cryptnet/testlist.c |  5 +----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/rostests/winetests/cryptnet/cryptnet.c b/rostests/winetests/cryptnet/cryptnet.c
index 683c6b676c7..a8ead636fa6 100644
--- a/rostests/winetests/cryptnet/cryptnet.c
+++ b/rostests/winetests/cryptnet/cryptnet.c
@@ -17,14 +17,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <stdarg.h>
+//#include <stdarg.h>
 #include <stdio.h>
 #define NONAMELESSUNION
 #include <windef.h>
 #include <winbase.h>
-#include <winerror.h>
+//#include <winerror.h>
 #include <wincrypt.h>
-#include "wine/test.h"
+#include <wine/test.h>
 
 static const BYTE bigCert[] = {
 0x30,0x78,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x14,0x31,0x12,0x30,0x10,
@@ -365,9 +365,12 @@ static void test_retrieveObjectByUrl(void)
     SetLastError(0xdeadbeef);
     ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl,
      NULL, NULL, NULL, NULL);
-    /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */
+    /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG
+     * or OSS_DATA_ERROR.
+     */
     ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH ||
-                broken(GetLastError() == CRYPT_E_ASN1_BADTAG)),
+                broken(GetLastError() == CRYPT_E_ASN1_BADTAG ||
+                       GetLastError() == OSS_DATA_ERROR)),
         "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError());
 
     /* only newer versions of cryptnet do the cleanup */
@@ -698,6 +701,11 @@ static void test_verifyRevocation(void)
      * bad authority key ID extension and can't be matched with the issuer
      * cert, hence the revocation status should be unknown.
      */
+    if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+    {
+        win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n");
+        return;
+    }
     ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK ||
      broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)),
      "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());
diff --git a/rostests/winetests/cryptnet/testlist.c b/rostests/winetests/cryptnet/testlist.c
index 5321c62f438..78adf768dff 100644
--- a/rostests/winetests/cryptnet/testlist.c
+++ b/rostests/winetests/cryptnet/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_cryptnet(void);