- set debug messages after a TRACE_ON test

- prevent crash when making the NULL context current

- set debug messages after a TRACE_ON test
61e42835 · Lionel Ulmer · Alexandre Julliard · c6369b0b · 61e42835 · 61e42835
Commit 61e42835 authored May 14, 2000 by Lionel Ulmer Committed by Alexandre Julliard May 14, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

wgl.c dlls/opengl32/wgl.c +3 -1

opengl.c graphics/x11drv/opengl.c +3 -1

No files found.
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -199,7 +199,9 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
  physDev =(X11DRV_PDEVICE *)dc->physDev;

  ENTER_GL();
-  ret = glXMakeCurrent(display, physDev->drawable, (GLXContext) hglrc);
+  ret = glXMakeCurrent(display,
+		       (hglrc == NULL ? None : physDev->drawable),
+		       (GLXContext) hglrc);
  LEAVE_GL();
  
  return ret;

--- a/graphics/x11drv/opengl.c
+++ b/graphics/x11drv/opengl.c
@@ -253,7 +253,9 @@ int X11DRV_DescribePixelFormat(DC *dc,

  ppfd->iLayerType = PFD_MAIN_PLANE;
  
-  dump_PIXELFORMATDESCRIPTOR(ppfd);
+  if (TRACE_ON(opengl)) {
+    dump_PIXELFORMATDESCRIPTOR(ppfd);
+  }
  
  return MAX_PIXELFORMATS;
 }