[PATCH] crypt32/tests: Accept Windows 10 results.

Detlef Riekenberg wine.dev at web.de
Sun Mar 13 09:50:13 CDT 2016


Windows 10 succeeds with some of our test data.

Modified test, which dump some CryptStringToBinary results:
https://testbot.winehq.org/JobDetails.pl?Key=21391&log_209=1#k209

--
Bye bye ... Detlef

Signed-off-by: Detlef Riekenberg <wine.dev at web.de>
---
 dlls/crypt32/tests/base64.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c
index 335b9b7..cc3e8e5 100644
--- a/dlls/crypt32/tests/base64.c
+++ b/dlls/crypt32/tests/base64.c
@@ -336,11 +336,13 @@ static void testStringToBinaryA(void)
     /* Bad strings */
     for (i = 0; i < sizeof(badStrings) / sizeof(badStrings[0]); i++)
     {
-        bufLen = 0;
+        bufLen = 0xdeadbeef;
+        SetLastError(0xdeadbeef);
+        /* This succeeds on Windows 10 with our CRYPT_STRING_BASE64 test data */
         ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format,
          NULL, &bufLen, NULL, NULL);
-        ok(!ret && GetLastError() == ERROR_INVALID_DATA,
-         "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError());
+        ok((!ret && GetLastError() == ERROR_INVALID_DATA) || broken(ret),
+         "%d: Expected FALSE with ERROR_INVALID_DATA, got ret=%d le=%u len=%d\n", i, ret, GetLastError(), bufLen);
     }
     /* Good strings */
     for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
-- 
2.5.0




More information about the wine-patches mailing list