Alexandre Julliard : winex11: Update the pixel format through the DCE hook for window DCs to avoid races .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 70f776d3b8758ff4bbc609b9a900fd49f75065ec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=70f776d3b8758ff4bbc609b9a9...

Author: Alexandre Julliard 
Date:   Thu May  3 20:43:09 2012 +0200

winex11: Update the pixel format through the DCE hook for window DCs to avoid races.

---

dlls/winex11.drv/opengl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 708825e..b750d59 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1680,6 +1680,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev,
             ERR("Couldn't set format of the window, returning failure\n");
             return FALSE;
         }
+        /* physDev->current_pf will be set by the DCE update */
     }
     else if(physDev->bitmap) {
         if(!(value&GLX_PIXMAP_BIT)) {
@@ -1692,13 +1693,12 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev,
             WARN("Couldn't create glxpixmap for pixel format %d\n", iPixelFormat);
             return FALSE;
         }
+        physDev->current_pf = iPixelFormat;
     }
     else {
         FIXME("called on a non-window, non-bitmap object?\n");
     }

-    physDev->current_pf = iPixelFormat;
-
     if (TRACE_ON(wgl)) {
         int gl_test = 0;