Changeset 2526 for trunk/src/gdi32

Timestamp:

Jan 27, 2000, 12:20:00 AM (26 years ago)

Author:

sandervl

Message:

YD's makefile changes

Location:

trunk/src/gdi32

Files:

• gdi32.cpp (modified) (3 diffs)
• opengl.cpp (modified) (5 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.31 2000-01-21 22:35:05 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.32 2000-01-26 23:19:55 sandervl Exp $ */
 
 /*
@@ -670 +670 @@
 
     rc = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %d\n", nWidth, nHeight, cBitsPerPel, rc));
+    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x\n", nWidth, nHeight, cBitsPerPel, rc));
     return(rc);
 }
@@ -2406 +2406 @@
 }
 //******************************************************************************
-
-//******************************************************************************
-int WIN32API DescribePixelFormat(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR)
-{
-  dprintf(("GDI32: DescribePixelFormat, not implemented (GDI_ERROR)\n"));
-  return(GDI_ERROR);
-}
-//******************************************************************************
 //******************************************************************************
 BOOL WIN32API SetObjectOwner( HGDIOBJ arg1, int arg2 )

trunk/src/gdi32/opengl.cpp

@@ -1 @@
-/* $Id: opengl.cpp,v 1.4 1999-08-17 13:28:36 phaller Exp $ */
+/* $Id: opengl.cpp,v 1.5 2000-01-26 23:19:55 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 typedef BOOL (* WIN32API SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
 typedef BOOL (* WIN32API SWAPBUFFERS) (HDC hdc);
+// JVDH MOD STARTS
+typedef int  (* WIN32API DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+// JVDH MOD ENDS
 
 
@@ -39 +42 @@
  ****************************************************************************/
 
-static CHOOSEPIXELFMT glChoosePixelFormat = NULL;
-static SETPIXELFMT    glSetPixelFormat    = NULL;
-static SWAPBUFFERS    glSwapBuffers       = NULL;
-static HINSTANCE      hOpenGL             = NULL;
+static CHOOSEPIXELFMT    glChoosePixelFormat   = NULL;
+static SETPIXELFMT       glSetPixelFormat      = NULL;
+static SWAPBUFFERS       glSwapBuffers         = NULL;
+// JVDH MOD STARTS
+static DESCRIBEPIXELFMT  glDescribePixelFormat = NULL;
+// JVDH MOD ENDS
+static HINSTANCE         hOpenGL               = NULL;
 
 
@@ -84 +90 @@
   }
 
-  return(TRUE); /* OpenGL is initialized and enabled */
+// JVDH MOD STARTS
+  if(glDescribePixelFormat == NULL) {
+        glDescribePixelFormat = (DESCRIBEPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglDescribePixelFormat");
+        if(glDescribePixelFormat == NULL)
+                return(FALSE);
+  }
+// JVDH MOD ENDS
+
+  return(TRUE);                        /* OpenGL is initialized and enabled*/
 }
 
@@ -110 +124 @@
 
   return(glChoosePixelFormat(hdc, pformat));
+}
+
+ODINFUNCTION4(int,DescribePixelFormat,HDC,hdc,
+                                      int,iFormat,
+                                      UINT,nBytes,
+                                      LPPIXELFORMATDESCRIPTOR,pformat)
+{
+  if (glDescribePixelFormat == NULL)
+    if (internalOpenGLEnable() == FALSE)
+      return(0);
+
+  return(glDescribePixelFormat(hdc, iFormat, nBytes, pformat));
 }