Alexander Morozov : crypt32/tests: Fix test failures on some Win95 and some NT4.
Alexandre Julliard
julliard at winehq.org
Thu Nov 25 11:18:58 CST 2010
Module: wine
Branch: master
Commit: f48b0aa6a2f75763a5ea1c092abc29109446a4cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48b0aa6a2f75763a5ea1c092abc29109446a4cf
Author: Alexander Morozov <amorozov at etersoft.ru>
Date: Thu Nov 25 17:38:59 2010 +0300
crypt32/tests: Fix test failures on some Win95 and some NT4.
---
dlls/crypt32/tests/message.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c
index 392ec47..69049b1 100644
--- a/dlls/crypt32/tests/message.c
+++ b/dlls/crypt32/tests/message.c
@@ -1322,10 +1322,15 @@ static void test_encrypt_message(void)
ret = CryptEncryptMessage(¶, 0, NULL, blob, sizeof(blob),
encryptedBlob, &encryptedBlobSize);
todo_wine
- ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError());
- todo_wine
- ok(encryptedBlobSize == 55,
- "unexpected size of encrypted blob %d\n", encryptedBlobSize);
+ ok(ret ||
+ broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */
+ "CryptEncryptMessage failed: %08x\n", GetLastError());
+ if (ret)
+ {
+ todo_wine
+ ok(encryptedBlobSize == 55,
+ "unexpected size of encrypted blob %d\n", encryptedBlobSize);
+ }
CryptMemFree(encryptedBlob);
}
}
@@ -1345,7 +1350,9 @@ static void test_encrypt_message(void)
ret = CryptEncryptMessage(¶, 2, certs, blob, sizeof(blob),
encryptedBlob, &encryptedBlobSize);
todo_wine
- ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError());
+ ok(ret ||
+ broken(!ret), /* some Win95 and some NT4 */
+ "CryptEncryptMessage failed: %08x\n", GetLastError());
CryptMemFree(encryptedBlob);
}
}
More information about the wine-cvs
mailing list