[ros-diffs] [akhaldi] 58720: [CRYPTNET_WINETEST] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Mon Apr  8 16:22:36 2013
New Revision: 58720

URL: http://svn.reactos.org/svn/reactos?rev=58720&view=rev
Log:
[CRYPTNET_WINETEST]
* Sync with Wine 1.5.26.

Modified:
    trunk/rostests/winetests/cryptnet/cryptnet.c
    trunk/rostests/winetests/cryptnet/testlist.c

Modified: trunk/rostests/winetests/cryptnet/cryptnet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn…
==============================================================================
--- trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] Mon Apr  8 16:22:36 2013
@@ -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 @@
     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 @@
      * 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());

Modified: trunk/rostests/winetests/cryptnet/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/testli…
==============================================================================
--- trunk/rostests/winetests/cryptnet/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/cryptnet/testlist.c [iso-8859-1] Mon Apr  8 16:22:36 2013
@@ -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);