Huw Davies : dssenh/tests: Fix a failing test on Windows 7.

Alexandre Julliard julliard at winehq.org
Fri Feb 3 13:31:33 CST 2017


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Feb  3 11:22:28 2017 +0000

dssenh/tests: Fix a failing test on Windows 7.

This makes it symmetric with the test directly preceding it.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dssenh/tests/dssenh.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c
index f07b0d3..ccb7dcd 100644
--- a/dlls/dssenh/tests/dssenh.c
+++ b/dlls/dssenh/tests/dssenh.c
@@ -1174,15 +1174,14 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_
         ok((!result && GetLastError() ==  ERROR_INVALID_PARAMETER) ||
             broken(!result && GetLastError() ==  NTE_BAD_DATA) || /* Vista.64 */
             broken(!result && GetLastError() ==  NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */
-            broken(!result && GetLastError() ==  NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */
-            broken(result), /* WinNT4 */
+            broken(!result && GetLastError() ==  NTE_BAD_ALGID),  /* W7SP164 (32 bit dssenh) */
             "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError());
 
         result = CryptImportKey(hProv, pubKeyBuffer1, pubKeyLen1, privKey2, 0, &sessionKey2);
         ok((!result && GetLastError() ==  ERROR_INVALID_PARAMETER) ||
+            broken(!result && GetLastError() ==  NTE_BAD_DATA) || /* Win 7 */
             broken(!result && GetLastError() ==  NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */
-            broken(!result && GetLastError() ==  NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */
-            broken(result), /* WinNT4 */
+            broken(!result && GetLastError() ==  NTE_BAD_ALGID),  /* W7SP164 (32 bit dssenh) */
             "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError());
 
         /* Set the shared key parameters to matching type */




More information about the wine-cvs mailing list