Re: shell32/tests: Better check the result of SHGetDesktopFolder

[Austin English]

2011/10/12 André Hentschel <nerv(a)dawncrow.de>:
> Might fix the crash in some NT4 systems
> ---
>  dlls/shell32/tests/brsfolder.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c
> index 7b87967..6e5e73b 100644
> --- a/dlls/shell32/tests/brsfolder.c
> +++ b/dlls/shell32/tests/brsfolder.c
> @@ -331,7 +331,8 @@ static void test_selection(void)
>
>     hr = SHGetDesktopFolder(&desktop_object);
>     ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr);
> -    if (FAILED(hr)) {
> +    ok (desktop_object, "Expected desktop_object to be a valid interface\n");
> +    if (FAILED(hr) || !desktop_object) {
>         skip("SHGetDesktopFolder failed - skipping\n");
>         return;
>     }
> --
>
> Best Regards, André Hentschel

Causes a compiler warning on Buildbot:

Errors:
brsfolder.c: In function 'test_selection':
brsfolder.c:334:5: error: passing argument 1 of 'winetest_ok' makes
integer from pointer without a cast [-Werror]
make[1]: *** [brsfolder.o] Error 1

-- 
-Austin