commit 43ce10d168997929a0639e6ab02f556458ef9b33
author Rico Schüller <kgbricola@web.de> Sat Sep 19 15:52:36 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 22 17:47:10 2009 +0200
tree e4b26b1d24f3357ac5e6cf443a6a83960b2bf0b3
parent 8c414df17f57840e0687db1ece53857e4e791d74

gdi32: Check the current context in wglMakeCurrent().

dlls/gdi32/opengl.c

diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c
index 204fc2b..63ba433 100644
--- a/dlls/gdi32/opengl.c
+++ b/dlls/gdi32/opengl.c
@@ -193,7 +193,15 @@
     /* When the context hglrc is NULL, the HDC is ignored and can be NULL.
      * In that case use the global hDC to get access to the driver.  */
     if(hglrc == NULL)
+    {
+        if( hdc == NULL && !wglGetCurrentContext() )
+        {
+            WARN( "Current context is NULL\n");
+            SetLastError( ERROR_INVALID_HANDLE );
+            return FALSE;
+        }
         dc = OPENGL_GetDefaultDC();
+    }
     else
         dc = get_dc_ptr( hdc );