Module: wine Branch: master Commit: 3ca00ff8573c3941e8ee911467e01938b1d17cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca00ff8573c3941e8ee911467...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Tue Mar 14 00:40:36 2017 +0000
ole32/tests: Stop crash on XP.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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);