[cwittich] 41581: sync crypt32_winetest with wine 1.1.24

Author: cwittich
Date: Tue Jun 23 15:47:46 2009
New Revision: 41581

URL: http://svn.reactos.org/svn/reactos?rev=41581&view=rev
Log:
sync crypt32_winetest with wine 1.1.24

Modified:
    trunk/rostests/winetests/crypt32/encode.c
    trunk/rostests/winetests/crypt32/oid.c

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] Tue Jun 23 15:47:46 2009
@@ -5843,7 +5843,8 @@
      * I doubt an app depends on that.
      */
     ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD ||
-     GetLastError() == CRYPT_E_ASN1_CORRUPT || OSS_MORE_INPUT /* Win9x */),
+     GetLastError() == CRYPT_E_ASN1_CORRUPT ||
+     GetLastError() == OSS_MORE_INPUT /* Win9x */),
      "Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, or OSS_MORE_INPUT, got
%x\n",
      GetLastError());
     ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE,

Modified: trunk/rostests/winetests/crypt32/oid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/oid.c?r…
==============================================================================
--- trunk/rostests/winetests/crypt32/oid.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/crypt32/oid.c [iso-8859-1] Tue Jun 23 15:47:46 2009
@@ -384,7 +384,7 @@
     static const char func[] = "CertDllOpenStoreProv";
     char buf[MAX_PATH];
     BOOL ret;
-    long rc;
+    LSTATUS rc;
     HKEY key;
 
     ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL);
@@ -419,7 +419,7 @@
     ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError());
     sprintf(buf, fmt, 0, func);
     rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key);
-    ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc);
+    ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %d\n", rc);
     if (rc == 0)
     {
         static const CHAR dllA[] = "Dll";
@@ -432,7 +432,7 @@
         size = sizeof(dllBuf) / sizeof(dllBuf[0]);
         rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size);
         ok(rc == 0,
-         "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc);
+         "Expected Dll value to exist, RegQueryValueExA failed: %d\n", rc);
         ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n",
type);
         /* bogusDll was registered first, so that should be first */
         ptr = dllBuf;