winex11: Check pixel format flags in X11DRV_wglChoosePixelFormatARB.

The check was dropped in e392e0ac, leaving the dwFlags variable unused.

winex11: Check pixel format flags in X11DRV_wglChoosePixelFormatARB.
6dd2ed2c · Rémi Bernon · Alexandre Julliard · 87090965 · 6dd2ed2c · 6dd2ed2c
Commit 6dd2ed2c authored Dec 16, 2022 by Rémi Bernon Committed by Alexandre Julliard Dec 21, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

opengl.c dlls/opengl32/tests/opengl.c +1 -1

opengl.c dlls/winex11.drv/opengl.c +2 -0

No files found.
--- a/dlls/opengl32/tests/opengl.c
+++ b/dlls/opengl32/tests/opengl.c
@@ -1891,7 +1891,7 @@ static void test_wglChoosePixelFormatARB(HDC hdc)

        ok(format.dwFlags & PFD_DRAW_TO_WINDOW, "got dwFlags %#lx\n", format.dwFlags);
        ok(format.dwFlags & PFD_SUPPORT_OPENGL, "got dwFlags %#lx\n", format.dwFlags);
-        todo_wine ok(format.dwFlags & PFD_SUPPORT_GDI, "got dwFlags %#lx\n", format.dwFlags);
+        ok(format.dwFlags & PFD_SUPPORT_GDI, "got dwFlags %#lx\n", format.dwFlags);

        winetest_pop_context();
    }

--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -2638,6 +2638,8 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c

        if (i == nb_pixel_formats)
            continue;
+        if ((pixel_formats[i].dwFlags & dwFlags) != dwFlags)
+            continue;

        format = &formats[format_count];
        format->format = i + 1;