From: John F. Fay <johnffay@nettally.com>
Date: Tue, 25 Jan 2011 05:43:37 +0000 (+0000)
Subject: Fixing bug 3105058.  There is a possibly substantial change on line 783, where the... 
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=a1ff6aa662af045fc32c9241ef48a6ff019e0018;p=freeglut

Fixing bug 3105058.  There is a possibly substantial change on line 783, where the "window->Window.Device" is replaced with "hDC" rather than "current_hDC" which was assigned to its value earlier.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@889 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index 3513498..c7a07c6 100644
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -733,9 +733,16 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
     PIXELFORMATDESCRIPTOR pfd;
     PIXELFORMATDESCRIPTOR* ppfd = &pfd;
     int pixelformat;
+    HDC current_hDC;
+    GLboolean success;
 
-    fghFillPFD( ppfd, window->Window.Device, layer_type );
-    pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
+    if (checkOnly)
+      current_hDC = CreateDC(TEXT("DISPLAY"), NULL ,NULL ,NULL);
+    else
+      current_hDC = window->Window.Device;
+
+    fghFillPFD( ppfd, current_hDC, layer_type );
+    pixelformat = ChoosePixelFormat( current_hDC, ppfd );
 
     /* windows hack for multismapling/sRGB */
     if ( ( fgState.DisplayMode & GLUT_MULTISAMPLE ) ||
@@ -757,10 +764,10 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
         hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.Instance, 0 );
         hDC=GetDC(hWnd);
         SetPixelFormat( hDC, pixelformat, ppfd );
-        
+
         rc = wglCreateContext( hDC );
         wglMakeCurrent(hDC, rc);
-        
+
         if ( fghIsExtensionSupported( hDC, "WGL_ARB_multisample" ) )
         {
             PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc =
@@ -773,7 +780,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                 float fAttributes[] = { 0, 0 };
                 UINT numFormats;
                 fghFillPixelFormatAttributes( attributes, ppfd );
-                bValid = wglChoosePixelFormatARBProc(window->Window.Device, attributes, fAttributes, 1, &iPixelFormat, &numFormats);
+                bValid = wglChoosePixelFormatARBProc(hDC, attributes, fAttributes, 1, &iPixelFormat, &numFormats);
 
                 if ( bValid && numFormats > 0 )
                 {
@@ -789,7 +796,12 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
         UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);
     }
 
-    return ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( window->Window.Device, pixelformat, ppfd ) );
+    success = ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( current_hDC, pixelformat, ppfd ) );
+
+    if (checkOnly)
+        DeleteDC(current_hDC);
+
+    return success;
 #endif /* defined(_WIN32_WCE) */
 }