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

[Jacek Caban]

Hi Alistair,

On 12.03.2017 22:11, Alistair Leslie-Hughes wrote:
> Fixes crash
> http://test.winehq.org/data/4b1445940d47870895b7fa87b7d69d12abe701ef/xp_fg-w...
>
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  dlls/ole32/tests/compobj.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
> index 8f6ff7107c..db68fd05c6 100644
> --- a/dlls/ole32/tests/compobj.c
> +++ b/dlls/ole32/tests/compobj.c
> @@ -3569,7 +3569,12 @@ 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);

Instead of removing ok(), please change it with '|| broken(hres ==
E_NOINTERFACE)'.
> +    if(FAILED(hres))
> +    {
> +        win_skip("CLSID_GlobalOptions not available\n");
> +        CoUninitialize();
> +        return;
> +    }
>
> IGlobalOptions_Release(global_options);

Jacek