From ee2fc60c17f9fa72ad7041dc904f0d00486781b0 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Wed, 15 Oct 2008 13:24:44 -0700
Subject: [PATCH] crypt32: Fix remaining Win9x encoding test failures.

---
 dlls/crypt32/tests/encode.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index c64386d9c7c..d568eb57c06 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -6481,8 +6481,14 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding)
     SetLastError(0xdeadbeef);
     ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info,
      CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size);
-    ok(!ret && GetLastError() == E_INVALIDARG,
-     "Expected E_INVALIDARG, got %08x\n", GetLastError());
+    ok(!ret, "Expected failure, got %d\n", ret);
+    if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+    {
+        skip("no CMS_SIGNER_INFO encode support\n");
+        return;
+    }
+    ok(GetLastError() == E_INVALIDARG,
+       "Expected E_INVALIDARG, got %08x\n", GetLastError());
     /* To be encoded, a signer must have a valid cert ID, where a valid ID may
      * be a key id or a issuer serial number with at least the issuer set, and
      * the encoding must include PKCS_7_ASN_ENCODING.