Hans Leidekker : wintrust/tests: Fix test failures on Windows 8.1 and 10.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Mon Dec 19 11:38:55 2016 +0100

wintrust/tests: Fix test failures on Windows 8.1 and 10.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wintrust/tests/crypt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index cfed53b..503831e 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -1020,8 +1020,11 @@ static void test_cdf_parsing(void)
     catmember = NULL;
     catmembertag = NULL;
     while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, cdf_callback, &catmember, FALSE, NULL))) ;
-    todo_wine
-    CHECK_EXPECT(CRYPTCAT_E_AREA_MEMBER, CRYPTCAT_E_CDF_MEMBER_FILE_PATH);
+    ok(error_area == 0xffffffff || broken(error_area == CRYPTCAT_E_AREA_MEMBER) /* < win81 */,
+       "Expected area 0xffffffff, got %08x\n", error_area);
+    ok(local_error == 0xffffffff || broken(local_error == CRYPTCAT_E_CDF_MEMBER_FILE_PATH) /* < win81 */,
+       "Expected error 0xffffffff, got %08x\n", local_error);
+
     pCryptCATCDFClose(catcdf);
     DeleteFileA(cdffileA);
     todo_wine