[PATCH 3/3] comdlg32/tests: Fix failures on newer Windows 10.

Zhiyi Zhang zzhang at codeweavers.com
Fri Sep 7 08:19:27 CDT 2018


Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
 dlls/comdlg32/tests/itemdlg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c
index 6b63063e29..c9ba23d045 100644
--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -1069,7 +1069,7 @@ static void test_advise_helper(IFileDialog *pfd)
     for(i = 0; i < 10; i++) {
         hr = IFileDialog_Advise(pfd, pfde, &cookie[i]);
         ok(hr == S_OK, "got 0x%08x\n", hr);
-        ok(cookie[i] == i+1, "Got cookie: %d\n", cookie[i]);
+        ok(cookie[i] == i+cookie[0], "Got cookie: %d\n", cookie[i]);
     }
     ok(pfdeimpl->ref == 10+1, "got ref %d\n", pfdeimpl->ref);
     ensure_zero_events(pfdeimpl);
@@ -1102,7 +1102,8 @@ static void test_advise_helper(IFileDialog *pfd)
 
     hr = IFileDialog_Advise(pfd, pfde, &cookie[0]);
     ok(hr == S_OK, "got 0x%08x\n", hr);
-    todo_wine ok(cookie[0] == 1, "got cookie: %d\n", cookie[0]);
+    /* cookie[0] is 4 on Windows 10 17134 */
+    todo_wine ok(cookie[0] == 1 || cookie[0] == 4, "got cookie: %d\n", cookie[0]);
     ok(pfdeimpl->ref == 1+1, "got ref %d\n", pfdeimpl->ref);
     ensure_zero_events(pfdeimpl);
 
-- 
2.18.0




More information about the wine-devel mailing list