Juan Lang : cryptui: Fix a few test failures on older Windows versions.

Alexandre Julliard julliard at winehq.org
Fri Jan 30 07:58:18 CST 2009


Module: wine
Branch: master
Commit: 3b7c62f80b6fb40c226cd4ec5aac5d19e399cf03
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b7c62f80b6fb40c226cd4ec5aac5d19e399cf03

Author: Juan Lang <juan.lang at gmail.com>
Date:   Thu Jan 29 16:52:41 2009 -0800

cryptui: Fix a few test failures on older Windows versions.

---

 dlls/cryptui/tests/cryptui.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c
index 2cac521..534d0e7 100644
--- a/dlls/cryptui/tests/cryptui.c
+++ b/dlls/cryptui/tests/cryptui.c
@@ -406,7 +406,9 @@ static void test_crypt_ui_wiz_import(void)
         if (ca)
         {
             ret = find_and_delete_cert_in_store(ca, info.u.pCertContext);
-            ok(ret, "expected to find v1CertWithValidPubKey in CA store\n");
+            ok(ret ||
+             broken(!ret) /* Win9x/NT4 */,
+             "expected to find v1CertWithValidPubKey in CA store\n");
             CertCloseStore(ca, 0);
         }
     }
@@ -463,7 +465,9 @@ static void test_crypt_ui_wiz_import(void)
      CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE, 0, NULL, &info, store);
     ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError());
     ret = find_and_delete_cert_in_store(store, info.u.pCertContext);
-    ok(ret, "expected to find iTunesCert3 in memory store\n");
+    ok(ret ||
+     broken(!ret) /* Win9x/NT4 */,
+     "expected to find iTunesCert3 in memory store\n");
     CertFreeCertificateContext(info.u.pCertContext);
     CertCloseStore(store, 0);
 
@@ -503,7 +507,9 @@ static void test_crypt_ui_wiz_import(void)
         if (ca)
         {
             ret = find_and_delete_cert_in_store(ca, info.u.pCertContext);
-            ok(ret, "expected to find iTunesCert2 in CA store\n");
+            ok(ret ||
+             broken(!ret) /* Win9x/NT4 */,
+             "expected to find iTunesCert2 in CA store\n");
             CertCloseStore(ca, 0);
         }
     }




More information about the wine-cvs mailing list