[v2 PATCH] ole32/tests: Stop crash on XP

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Mon Mar 13 19:40:36 CDT 2017


Fixes crash
http://test.winehq.org/data/4b1445940d47870895b7fa87b7d69d12abe701ef/xp_fg-winxp-3sp/ole32:compobj.html

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/ole32/tests/compobj.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 8f6ff71..20d2962 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -3569,7 +3569,13 @@ static void test_GlobalOptions(void)
 
     hres = CoCreateInstance(&CLSID_GlobalOptions, NULL, CLSCTX_INPROC_SERVER,
             &IID_IGlobalOptions, (void**)&global_options);
-    ok(hres == S_OK, "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres);
+    ok(hres == S_OK || broken(hres == E_NOINTERFACE), "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres);
+    if(FAILED(hres))
+    {
+        win_skip("CLSID_GlobalOptions not available\n");
+        CoUninitialize();
+        return;
+    }
 
     IGlobalOptions_Release(global_options);
 
-- 
1.9.1




More information about the wine-patches mailing list