[PATCH] shell32: avoid a crash in testsuite

[Marcus Meissner]

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(a)suse.de>
---
 dlls/shell32/tests/shelldispatch.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 9825c3a4e9..92562650f3 100644
--- 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;
-- 
2.15.0

[Alex Henrie]

2017-11-13 5:31 GMT-07:00 Marcus Meissner <meissner(a)suse.de>:
> +       if (disp == NULL) goto skip_disp_tests;

Please use spaces instead of tabs to match the surrounding code.

-Alex