comdlg32/tests: Fix crashes.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32/tests: Fix crashes.
b89e0e70 · Zhiyi Zhang · Alexandre Julliard · 074de925 · b89e0e70
Commit b89e0e70 authored Sep 13, 2018 by Zhiyi Zhang Committed by Alexandre Julliard Sep 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

itemdlg.c dlls/comdlg32/tests/itemdlg.c +8 -4

No files found.
--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd)
    pfde = IFileDialogEvents_Constructor();
    pfdeimpl = impl_from_IFileDialogEvents(pfde);

-    hr = IFileDialog_Advise(pfd, NULL, NULL);
-    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
-    hr = IFileDialog_Advise(pfd, pfde, NULL);
-    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    /* Null pointer tests crash on Windows 10 16299 or newer */
+    if (0)
+    {
+        hr = IFileDialog_Advise(pfd, NULL, NULL);
+        ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+        hr = IFileDialog_Advise(pfd, pfde, NULL);
+        ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    }
    hr = IFileDialog_Advise(pfd, NULL, &cookie[0]);
    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
    ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref);