shell32: Avoid a crash in testsuite.

This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner@suse.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Avoid a crash in testsuite.
5350eea7 · Marcus Meissner · Alexandre Julliard · c5a39bd9 · 5350eea7
Commit 5350eea7 authored Nov 13, 2017 by Marcus Meissner Committed by Alexandre Julliard Nov 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

shelldispatch.c dlls/shell32/tests/shelldispatch.c +4 -0

No files found.
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -1088,6 +1088,9 @@ todo_wine {
        IUnknown *unk;

        ok(disp != NULL, "got %p\n", disp);
+
+        if (disp == NULL) goto skip_disp_tests;
+
        ok(ret != HandleToUlong(hwnd), "got %d\n", ret);

        /* IDispatch-related tests */
@@ -1165,6 +1168,7 @@ if (hr == S_OK) {
        IServiceProvider_Release(sp);
        IDispatch_Release(disp);
    }
+skip_disp_tests:

    disp = (void*)0xdeadbeef;
    ret = 0xdead;