Juan Lang : crypt32: Fix some test failures on older crypt32 versions.
Alexandre Julliard
julliard at winehq.org
Wed Nov 11 08:33:23 CST 2009
Module: wine
Branch: master
Commit: 49c1a34721a1ccd453b1c5b856ef5612f764f7c8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c1a34721a1ccd453b1c5b856ef5612f764f7c8
Author: Juan Lang <juan.lang at gmail.com>
Date: Tue Nov 10 11:16:47 2009 -0800
crypt32: Fix some test failures on older crypt32 versions.
---
dlls/crypt32/tests/encode.c | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index a46022b..934aceb 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -7523,7 +7523,13 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding)
memset(&info, 0, sizeof(info));
ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info,
CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
- ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError());
+ ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND),
+ "CryptEncodeObjectEx failed: %08x\n", GetLastError());
+ if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+ {
+ win_skip("no policy mappings support\n");
+ return;
+ }
if (ret)
{
ok(size == sizeof(emptySequence), "unexpected size %d\n", size);
@@ -7582,7 +7588,13 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding)
ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i],
emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL,
&info, &size);
- ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError());
+ ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND),
+ "CryptDecodeObjectEx failed: %08x\n", GetLastError());
+ if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+ {
+ win_skip("no policy mappings support\n");
+ return;
+ }
if (ret)
{
ok(info->cPolicyMapping == 0,
@@ -7649,7 +7661,13 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding)
*/
ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info,
CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
- ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError());
+ ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND),
+ "CryptEncodeObjectEx failed: %08x\n", GetLastError());
+ if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+ {
+ win_skip("no policy constraints support\n");
+ return;
+ }
if (ret)
{
ok(size == sizeof(emptySequence), "unexpected size %d\n", size);
@@ -7716,7 +7734,13 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding)
ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS,
emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL,
&info, &size);
- ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError());
+ ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND),
+ "CryptDecodeObjectEx failed: %08x\n", GetLastError());
+ if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
+ {
+ win_skip("no policy mappings support\n");
+ return;
+ }
if (ret)
{
ok(!info->fRequireExplicitPolicy,
More information about the wine-cvs
mailing list