Re: Huw Davies : opengl/tests: Skip tests if we can't find a pixel format.

[Huw Davies]

On Fri, Dec 05, 2008 at 11:04:07AM -0600, Alexandre Julliard wrote:
> Module: wine
> Branch: master
> Commit: e86ff2a3128f4a0157ecfa10fee31d1416312c71
> URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e86ff2a3128f4a0157ecfa10fe...
>
> Author: Huw Davies 
> Date:   Fri Dec  5 14:19:25 2008 +0000
>
> opengl/tests: Skip tests if we can't find a pixel format.
>
> dlls/opengl32/tests/opengl.c |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
> index 35eb8ae..a3ac3af 100644
> --- a/dlls/opengl32/tests/opengl.c
> +++ b/dlls/opengl32/tests/opengl.c
> @@ -555,7 +555,12 @@ START_TEST(opengl)
>          hdc = GetDC(hwnd);
>      iPixelFormat = ChoosePixelFormat(hdc, &pfd);
> -
>    ok(iPixelFormat > 0, "No pixelformat found!\n"); /* This should never happen as ChoosePixelFormat always returns a closest match */
> -
>    if(iPixelFormat == 0)
> -
>    {
> -
>        /* This should never happen as ChoosePixelFormat always returns a closest match, but currently this fails in Wine if we don't have glX */
> -
>        win_skip("Unable to find pixel format.\n");
> -
>        goto cleanup;
> -
>    }
>
>    /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */
>    hglrc = wglCreateContext(hdc);

Hi Alexandre,

This wasn't what I intended my patch to do.  The problem is that
Wine's ChoosePixelFormat() rets 0 on XServers without glX.  The
win_skip results in a test failure.  My patch was intended to mark
this as a todo_wine.

Huw.