Changeset 2962 for trunk/src/opengl/mesa/wmesa.c

Timestamp:

Mar 1, 2000, 7:50:02 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/wmesa.c (modified) (49 diffs)

trunk/src/opengl/mesa/wmesa.c

@@ -1 @@
-/* $Id: wmesa.c,v 1.1 2000-02-29 00:50:15 sandervl Exp $ */
+/* $Id: wmesa.c,v 1.2 2000-03-01 18:49:40 jeroen Exp $ */
 
 /*
@@ -23 +23 @@
 /*
  * $Log: wmesa.c,v $
- * Revision 1.1  2000-02-29 00:50:15  sandervl
- * created
+ * Revision 1.2  2000-03-01 18:49:40  jeroen
+ * *** empty log message ***
  *
  * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
@@ -67 +67 @@
 #define WMESA_STEREO_C
 
+#ifdef __WIN32OS2__
+#include <os2win.h>
+#else
 #include <windows.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -74 +78 @@
 #include "colors.h"
 #include "macros.h"
+#include "types.h"
 #include "context.h"
 #include "dd.h"
@@ -84 +89 @@
 #ifndef __WIN32OS2__
 #pragma warning ( disable : 4133 4761 )
+#else
+#ifdef DIVE
+#include <mesadive.h>
+extern HWND Win32ToOS2Handle(HWND);
+#endif
 #endif
 
@@ -122 +132 @@
 /* end of added code*/
 
-static PWMC Current = NULL;
+PWMC Current = NULL;
 WMesaContext WC = NULL;
 
@@ -134 +144 @@
     char Msg[512];
     sprintf(Msg,"%s %s %d",Cond,File,Line);
+#ifdef __WIN32OS2__
+    dprintf((Msg,"%s %s %d",Cond,File,Line));
+#endif
     MessageBox(NULL,Msg,"Assertion failed.",MB_OK);
     exit(1);
@@ -214 +227 @@
 static void wmSetPixelFormat( PWMC wc, HDC hDC)
 {
+  dprintf(("OPENGL32: Setting PixelFormat\n"));
+
+#ifdef DIVE
+  wc->cColorBits=DiveQueryDepth();
+
+  wc->pixelformat=DiveQueryNativePixelFormat();
+#else
     if(wc->rgb_flag)
-        wc->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);
+      wc->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);
     else
-        wc->cColorBits = 8;
+      wc->cColorBits = 8;
+
     switch(wc->cColorBits){
     case 8:
@@ -225 +246 @@
             wc->pixelformat = PF_DITHER8;
         break;
+
     case 16:
         wc->pixelformat = PF_5R6G5B;
         break;
+
     case 32:
         wc->pixelformat = PF_8R8G8B;
         break;
-    default:
+
+    default:                                    /* This also handles 24 bpp*/
         wc->pixelformat = PF_BADFORMAT;
-    }
+      break;
+    }
+#endif
+
+  dprintf(("OPENGL32: Color Bits: %d\n",wc->cColorBits));
 }
 
 //
-// This function sets the color table of a DIB section
-// to match that of the destination DC
+                     /* This function sets the color table of a DIB section*/
+                                     /* to match that of the destination DC*/
 //
 BOOL /*WINAPI*/ wmSetDibColors(PWMC pwc)
@@ -297 +325 @@
     LPBITMAPINFO pbmi = &(pwc->bmi);
     int     iUsage;
+
+    dprintf(("OPENGL32: Creating BackingStore for %08X\n",pwc));
 
     pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@@ -341 +371 @@
     DWORD   dwScanWidth = (uiScanWidth * nBypp);
 
-    dprintf(("OPENGL32: wmSetDIBits\n"));
-
     //
     // We need to round up to the nearest DWORD
@@ -400 +428 @@
         }
         ENDPROFILE(flush)
-
-}
-
-
+}
 
 /*
@@ -433 +458 @@
 * or index as specified by one of the two functions above.
 */
-//static void clear(GLcontext* ctx,
-//                  GLboolean all,GLint x, GLint y, GLint width, GLint height )
-// TODO: I modified this function to match the prototype in dd.h. (swansma@geocities.com)
-//       dd.h does not explain what the return type is so I could not set this to the proper
-//       value.
+                                       /* static void clear(GLcontext* ctx,*/
+             /* GLboolean all,GLint x, GLint y, GLint width, GLint height )*/
+/* TODO: I modified this function to match the prototype in dd.h. (swansma@geocities.com)*/
+/* dd.h does not explain what the return type is so I could not set this to the proper*/
+                                       /* value.                           */
 static GLbitfield clear(GLcontext* ctx, GLbitfield mask,
                   GLboolean all, GLint x, GLint y, GLint width, GLint height)
@@ -449 +474 @@
     int     lines;
 
-    dprintf(("OPENGL32: clear\n"));
+    dprintf(("OPENGL32: clear - all %08d - x %d - y %d - width %d - height %d\n",
+             all,x,y,width,height));
 
     STARTPROFILE
@@ -458 +484 @@
             height=Current->height;
         }
+
+    dprintf(("OPENGL32: clear - all %08d - x %d - y %d - width %d - height %d\n",
+             all,x,y,width,height));
+
         if(Current->db_flag==GL_TRUE){
             UINT    nBypp = Current->cColorBits / 8;
             int     i = 0;
             int     iSize = 0;
+
+            dprintf(("OPENGL32: Clearing BackBuffer\n"));
 
             if(nBypp ==1 ){
@@ -520 +552 @@
             while (i<lines-1);
         }
-        else { // For single buffer
+        else
+          {                                            /* For single buffer*/
+            dprintf(("OPENGL32: Clearing FrontBuffer\n"));
+
             HDC DC=DD_GETDC;
+
+            dprintf(("OPENGL32: Clearing FrontBuffer DC is %08X\n",DC));
+
             HPEN Pen=CreatePen(PS_SOLID,1,Current->clearpixel);
             HBRUSH Brush=CreateSolidBrush(Current->clearpixel);
             HPEN Old_Pen=SelectObject(DC,Pen);
             HBRUSH Old_Brush=SelectObject(DC,Brush);
-//            Rectangle(DC,x,y,x+width,y+height);
+
+            Rectangle(DC,x,y,x+width,y+height);
+
             SelectObject(DC,Old_Pen);
             SelectObject(DC,Old_Brush);
             DeleteObject(Pen);
             DeleteObject(Brush);
+
             DD_RELEASEDC;
-        }
-
-
+          }
 
         ENDPROFILE(clear)
 
-                return mask;    // TODO: I doubt this is correct. dd.h doesn't explain what this should
-                                //       be...
+                return mask;/* TODO: I doubt this is correct. dd.h doesn't explain what this should*/
+                                       /* be...                            */
 }
 
@@ -640 +679 @@
 
    STARTPROFILE
+
    GetClientRect(Current->Window,&CR);
 
@@ -651 +691 @@
       Current->height=*height;
       Current->ScanWidth=Current->width;
+
       if ((Current->ScanWidth%sizeof(long))!=0)
          Current->ScanWidth+=(sizeof(long)-(Current->ScanWidth%sizeof(long)));
 
       if (Current->db_flag){
+#ifdef DIVE
+         if(!DiveDirectAccess())
+           if (Current->rgb_flag==GL_TRUE && Current->dither_flag!=GL_TRUE){
+              wmDeleteBackingStore(Current);
+              wmCreateBackingStore(Current, Current->width, Current->height);
+           }
+#else
 #ifdef DDRAW
          DDDeleteOffScreen(Current);
@@ -663 +711 @@
             wmCreateBackingStore(Current, Current->width, Current->height);
          }
+#endif
 #endif
       }
@@ -719 +768 @@
             }
         }
-        //   DD_RELEASEDC;
+
+                                       /* DD_RELEASEDC;                    */
         ENDPROFILE(fast_rgb_points)
 }
@@ -753 +803 @@
 
     if (0 /*Current->gl_ctx->VB->MonoColor*/) {
-        pixel = Current->pixel;  /* use current color */
+        pixel = Current->pixel;                        /* use current color*/
     }
     else {
-        pixel = RGB((GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][0]),
-                    (GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][1]),
-                    (GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][2]));
+        dprintf(("OPENGL32: READADDR: %08X - pv %d - LINE R-G-B is %d,%d,%d\n",
+                 Current->gl_ctx->VB->ColorPtr->data[pv],
+                 pv,
+                 Current->gl_ctx->VB->ColorPtr->data[pv][0],
+                 Current->gl_ctx->VB->ColorPtr->data[pv][1],
+                 Current->gl_ctx->VB->ColorPtr->data[pv][2]));
+
+        pixel = RGB((GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][0]/* *255.0*/),
+                    (GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][1]/* *255.0*/),
+                    (GLubyte)(Current->gl_ctx->VB->ColorPtr->data[pv][2]/* *255.0*/));
+
+        dprintf(("OPENGL32: PIXEL set to %08X",pixel));
     }
 
@@ -769 +828 @@
     BEGINGDICALL
 
-    Pen=CreatePen(PS_SOLID,1,pixel);
+    Pen=CreatePen(PS_SOLID,1,(COLORREF)pixel);
     Old_Pen=SelectObject(DC,Pen);
     MoveToEx(DC,x0,y0,NULL);
@@ -902 +961 @@
         }
     }
+
     ENDPROFILE(write_rgba_span)
 
@@ -945 +1005 @@
         }
     }
+
     ENDPROFILE(write_rgb_span)
 
@@ -963 +1024 @@
     assert(Current->rgb_flag==GL_TRUE);
     y=FLIP(y);
+
     if(Current->rgb_flag==GL_TRUE){
         for (i=0; i<n; i++)
             if (mask[i])
-                // Trying
+                                       /* Trying                           */
                 wmSetPixel(pwc,y,x+i,GetRValue(Current->pixel), GetGValue(Current->pixel), GetBValue(Current->pixel));
     }
@@ -975 +1037 @@
     }
     DD_RELEASEDC;
+
     ENDPROFILE(write_mono_rgba_span)
 }
@@ -1033 +1096 @@
 {
     STARTPROFILE
+
         GLuint i;
     PWMC    pwc = Current;
     HDC DC=DD_GETDC;
     assert(Current->rgb_flag==GL_TRUE);
+
     for (i=0; i<n; i++)
        if (mask[i])
           wmSetPixel(pwc, FLIP(y[i]),x[i],rgba[i][RCOMP],rgba[i][GCOMP],rgba[i][BCOMP]);
+
     DD_RELEASEDC;
     ENDPROFILE(write_rgba_pixels)
@@ -1060 +1126 @@
     HDC DC=DD_GETDC;
     assert(Current->rgb_flag==GL_TRUE);
+
     for (i=0; i<n; i++)
         if (mask[i])
             wmSetPixel(pwc, FLIP(y[i]),x[i],GetRValue(Current->pixel),
                        GetGValue(Current->pixel), GetBValue(Current->pixel));
+
     DD_RELEASEDC;
     ENDPROFILE(write_mono_rgba_pixels)
@@ -1285 +1353 @@
 }
 
-
-WMesaContext WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
+void WMesaUpdateScreenPos(PWMC c,HWND hWnd)
+{
+  RECT CR;
+
+  GetWindowRect(hWnd,&CR);
+
+  c->WinPos.x=CR.left+GetSystemMetrics(SM_CXFRAME);
+  c->WinPos.y=CR.top+GetSystemMetrics(SM_CYCAPTION)+GetSystemMetrics(SM_CYFRAME);
+
+  c->width=CR.right-CR.left-2*GetSystemMetrics(SM_CXFRAME);
+  c->height=CR.bottom-CR.top-GetSystemMetrics(SM_CYCAPTION)-2*GetSystemMetrics(SM_CYFRAME);
+
+  dprintf(("OPENGL32: WMesaUpdateScreenPos %08X - x/y %d/%d, w/h %d/%d\n",
+           hWnd,
+           c->WinPos.x,
+           c->WinPos.y,
+           c->width,
+           c->height));
+}
+
+WMesaContext WIN32API WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
                                 GLboolean rgb_flag,
                                 GLboolean db_flag )
@@ -1294 +1381 @@
     GLboolean true_color_flag;
     c = (struct wmesa_context * ) calloc(1,sizeof(struct wmesa_context));
+
+    dprintf(("OPENGL32: Creating MESA Context (%s)\n",
+             db_flag?"DOUBLE BUFFERED":"SINGLE_BUFFERED"));
+
     if (!c)
         return NULL;
@@ -1300 +1391 @@
     c->hDC = GetDC(hWnd);
     true_color_flag = GetDeviceCaps(c->hDC, BITSPIXEL) > 8;
-#ifdef DDRAW
+
+#if defined(DDRAW) || defined(DIVE)
     if(true_color_flag) c->rgb_flag = rgb_flag = GL_TRUE;
 #endif
@@ -1316 +1408 @@
 #endif
 
+    dprintf(("OPENGL32: WMesaCreateContext - db_flag is %d\n",db_flag));
 
     if (rgb_flag==GL_FALSE)
     {
         c->rgb_flag = GL_FALSE;
-        //    c->pixel = 1;
-        c->db_flag = db_flag =GL_TRUE; // WinG requires double buffering
-        printf("Single buffer is not supported in color index mode, setting to double buffer.\n");
+#ifndef DIVE
+        c->db_flag = db_flag =GL_TRUE;    /* WinG requires double buffering*/
+
+        dprintf(("OPENGL32: Single buffer is not supported in color index mode, setting to double buffer.\n"));
+#endif
     }
     else
     {
         c->rgb_flag = GL_TRUE;
-        //    c->pixel = 0;
-    }
+                                       /* c->pixel = 0;                    */
+    }
+
     GetClientRect(c->Window,&CR);
+
     c->width=CR.right;
     c->height=CR.bottom;
+
     if (db_flag)
     {
         c->db_flag = 1;
         /* Double buffered */
-#ifndef DDRAW
-        //  if (c->rgb_flag==GL_TRUE && c->dither_flag != GL_TRUE )
+#if !defined(DDRAW) && !defined(DIVE)
+                 /* if (c->rgb_flag==GL_TRUE && c->dither_flag != GL_TRUE )*/
         {
             wmCreateBackingStore(c, c->width, c->height);
 
         }
+#else
+#ifdef DIVE
+            /* Dive direct access unavailable - switch to DIB mode */
+            if(!DiveDirectAccess())
+              wmCreateBackingStore(c, c->width, c->height);
+#endif
 #endif
     }
@@ -1350 +1454 @@
             c->db_flag = 0;
     }
+
+    /* Also set the correct PixelFormat now! */
+    wmSetPixelFormat(c, c->hDC);
+
+#ifdef DIVE
+    /* Store window position for DIVE draws - all x/y's are relative to this */
+    /* base position of the screen...                                        */
+    dprintf(("OPENGL32: Creating context (%08X)\n",c));
+
+    WMesaUpdateScreenPos(c,hWnd);
+
+    if(DiveDirectAccess())
+      if(!DiveInit(c,hWnd))
+        {
+          free( (void *) c );
+          Current=0;
+          dprintf(("OPENGL32: DIVEINIT failed - exiting!\n"));
+          MessageBoxA( hWnd, "Dive Init FAILED", "", MB_OK );
+          exit(1);
+        }
+#else
 #ifdef DDRAW
     if (DDInit(c,hWnd) == GL_FALSE) {
         free( (void *) c );
+        dprintf(("OPENGL32: DIVEINIT failed - exiting!\n"));
         exit(1);
     }
 #endif
-
+#endif
+
+/* JvdH - Enable software Alpha! (was FALSE!!) */
 
     c->gl_visual = gl_create_visual(rgb_flag,
-                                    GL_FALSE,   /* software alpha */
-                                    db_flag,    /* db_flag */
-                                    GL_FALSE,   /* stereo */
-                                    16,         /* depth_bits */
-                                    8,          /* stencil_bits */
-                                    8,          /* accum_bits */
-                                    0,          /* index bits */
-                                    8,8,8,8 );  /* r, g, b, a bits */
+                                    GL_TRUE,              /* software alpha*/
+                                    db_flag,                     /* db_flag*/
+                                    GL_FALSE,                     /* stereo*/
+                                    16,                       /* depth_bits*/
+                                    8,                      /* stencil_bits*/
+                                    8,                        /* accum_bits*/
+                                    0,                        /* index bits*/
+                                    8,8,8,8 );           /* r, g, b, a bits*/
 
     if (!c->gl_visual) {
@@ -1382 +1510 @@
 
     c->gl_buffer = gl_create_framebuffer( c->gl_visual );
+
     if (!c->gl_buffer) {
         gl_destroy_visual( c->gl_visual );
@@ -1389 +1518 @@
     }
 
-        c->gl_ctx->Driver.UpdateState = setup_DD_pointers;
-
-    //  setup_DD_pointers(c->gl_ctx);
+    c->gl_ctx->Driver.UpdateState = setup_DD_pointers;
+
+                                       /* setup_DD_pointers(c->gl_ctx);    */
+
+    dprintf(("OPENGL32: Created context %08X - (%s)\n",c,c->db_flag?"DOUBLE":"SINGLE"));
 
     return c;
 }
 
-void WMesaDestroyContext( void )
+void WIN32API WMesaDestroyContext( void )
 {
     WMesaContext c = Current;
+
     ReleaseDC(c->Window,c->hDC);
+
     WC = c;
+
     if(c->hPalHalfTone != NULL)
         DeleteObject(c->hPalHalfTone);
+
     gl_destroy_visual( c->gl_visual );
     gl_destroy_framebuffer( c->gl_buffer );
@@ -1408 +1543 @@
 
     if (c->db_flag)
+#ifdef DIVE
+    if(DiveDirectAccess())
+      {
+        DiveFree(c);
+                                       /* Clean up the screen on exit      */
+        RedrawWindow( NULL, NULL, NULL, RDW_INVALIDATE | RDW_ERASE |
+            RDW_ALLCHILDREN );
+      }
+    else
+      wmDeleteBackingStore(c);
+#else
 #ifdef DDRAW
+      {
         DDFree(c);
+      }
 #else
     wmDeleteBackingStore(c);
 #endif
+#endif
     free( (void *) c );
-    //Following code is added to enable parallel render
-    // Parallel render only work in double buffer mode
+
+    /* Set current context to 0, otherwise exitlist-routine will trap */
+    Current=0;
+                       /* Following code is added to enable parallel render*/
+                         /* Parallel render only work in double buffer mode*/
 #if !defined(NO_PARALLEL)
     if(parallelMachine)
         PRDestroyRenderBuffer();
 #endif
-    // End modification
-}
-
-
+                                       /* End modification                 */
+}
 
 void WIN32API WMesaMakeCurrent( WMesaContext c )
 {
+  dprintf(("OPENGL32: WMesaMakeCurrent %08X\n",c));
+
     if(!c){
         Current = c;
@@ -1459 +1611 @@
 {
     HDC DC = Current->hDC;
+
+    dprintf(("OPENGL32: WMesaSwapBuffers() - Current %08X (%s)\n",
+             Current,Current->db_flag?"DOUBLE":"SINGLE"));
+
     if (Current->db_flag)
         wmFlush(Current);
@@ -1469 +1625 @@
     int vRet;
     LPPALETTEENTRY pPal;
+    ULONG rc;
+
+    dprintf(("OPENGL32: WMesaPaletteChange - Pal %08X",Pal));
+
     if (Current && (Current->rgb_flag==GL_FALSE || Current->dither_flag == GL_TRUE))
     {
         pPal = (PALETTEENTRY *)malloc( 256 * sizeof(PALETTEENTRY));
         Current->hPal=Pal;
-        //  GetPaletteEntries( Pal, 0, 256, pPal );
+                                 /* GetPaletteEntries( Pal, 0, 256, pPal );*/
         GetPalette( Pal, (RGBQUAD *)pPal );
+#ifdef DIVE
+/*        rc=DiveSetSourcePalette(Current->hDiveInstance,
+                                0,
+                                256,
+                                (PBYTE)pPal);
+*/
+        dprintf(("OPENGL32: DiveSetupSourcePalette rc %d\n",rc));
+#else
 #ifdef DDRAW
         Current->lpDD->lpVtbl->CreatePalette(Current->lpDD,DDPCAPS_8BIT,
@@ -1481 +1649 @@
             Current->lpDDSPrimary->lpVtbl->SetPalette(Current->lpDDSPrimary,Current->lpDDPal);
 #else
-        vRet = SetDIBColorTable(Current->dib.hDC,0,256,(RGBQUAD *)pPal);
+        vRet = SetDIBColorTable(Current->dib.hDC,0,256, (RGBQUAD *)pPal);
+#endif
 #endif
         free( pPal );
@@ -1577 +1746 @@
 }
 
+void DibSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+   if (Current->db_flag)
+   {
+       LPBYTE  lpb = pwc->pbPixels;
+       LPDWORD lpdw;
+       LPWORD  lpw;
+       UINT    nBypp = pwc->cColorBits >> 3;
+       UINT    nOffset = iPixel % nBypp;
+
+       // Move the pixel buffer pointer to the scanline that we
+       // want to access
+
+       //      pwc->dib.fFlushed = FALSE;
+
+       lpb += pwc->ScanWidth * iScanLine;
+                                      /* Now move to the desired pixel    */
+       lpb += iPixel * nBypp;
+       lpb = PIXELADDR(iPixel, iScanLine);
+       lpdw = (LPDWORD)lpb;
+       lpw = (LPWORD)lpb;
+
+       if(nBypp == 1){
+           if(pwc->dither_flag)
+               *lpb = DITHER_RGB_2_8BIT(r,g,b,iScanLine,iPixel);
+           else
+               *lpb = BGR8(r,g,b);
+       }
+       else if(nBypp == 2)
+           *lpw = BGR16(r,g,b);
+       else if (nBypp == 3){
+           *lpdw = BGR24(r,g,b);
+       }
+       else if (nBypp == 4)
+           *lpdw = BGR32(r,g,b);
+   }
+   else{
+       SetPixel(Current->hDC, iPixel, iScanLine, RGB(r,g,b));
+       DD_RELEASEDC;
+   }
+}
+
 void /*WINAPI*/ wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
 {
-    if (Current->db_flag) {
-        LPBYTE  lpb = pwc->pbPixels;
-        LPDWORD lpdw;
-        LPWORD  lpw;
-        UINT    nBypp = pwc->cColorBits >> 3;
-        UINT    nOffset = iPixel % nBypp;
-
-        // Move the pixel buffer pointer to the scanline that we
-        // want to access
-
-        //      pwc->dib.fFlushed = FALSE;
-
-        lpb += pwc->ScanWidth * iScanLine;
-        // Now move to the desired pixel
-        lpb += iPixel * nBypp;
-        lpb = PIXELADDR(iPixel, iScanLine);
-        lpdw = (LPDWORD)lpb;
-        lpw = (LPWORD)lpb;
-
-        if(nBypp == 1){
-            if(pwc->dither_flag)
-                *lpb = DITHER_RGB_2_8BIT(r,g,b,iScanLine,iPixel);
-            else
-                *lpb = BGR8(r,g,b);
+#ifdef DIVE
+  if(DiveDirectAccess())
+    {
+      if (Current->db_flag)
+        {
+          /* We're using a buffered context - write to the backbuffer */
+          DiveWriteBackbuffer(pwc,iScanLine,iPixel,r,g,b);
         }
-        else if(nBypp == 2)
-            *lpw = BGR16(r,g,b);
-        else if (nBypp == 3){
-            *lpdw = BGR24(r,g,b);
+      else
+        {
+          /* We're using a non-buffered context - write to the video mem! */
+          /* TODO: What about cards that do not support direct access??   */
+          DiveWriteFrontbuffer(pwc,iScanLine,iPixel,r,g,b);
         }
-        else if (nBypp == 4)
-            *lpdw = BGR32(r,g,b);
-    }
-    else{
-        SetPixel(Current->hDC, iPixel, iScanLine, RGB(r,g,b));
-        DD_RELEASEDC;
-    }
+    }
+  else
+    DibSetPixel(pwc, iScanLine, iPixel, r, g, b);
+#else
+   DibSetPixel(pwc, iScanLine, iPixel, r, g, b);
+#endif
 }
 
 void /*WINAPI*/ wmCreateDIBSection(
                                    HDC   hDC,
-                                   PWMC pwc,    // handle of device context
-                                   CONST BITMAPINFO *pbmi,  // address of structure containing bitmap size, format, and color data
-                                   UINT iUsage  // color data type indicator: RGB values or palette indices
+                                   PWMC pwc,   /* handle of device context */
+                                   CONST BITMAPINFO *pbmi,/* address of structure containing bitmap size, format, and color data*/
+                                   UINT iUsage/* color data type indicator: RGB values or palette indices*/
                                    )
 {
@@ -1641 +1835 @@
     dwSize = sizeof(BITMAPINFO) + (dwScanWidth * pwc->height);
 
+#ifdef __WIN32OS2__
+    pwc->dib.hFileMap = CreateFileMappingA((HANDLE)PAGE_FILE,
+#else
     pwc->dib.hFileMap = CreateFileMapping((HANDLE)PAGE_FILE,
+#endif
         NULL,
         PAGE_READWRITE | SEC_COMMIT,
@@ -1668 +1866 @@
     memcpy(pwc->dib.base, pbmi, sizeof(BITMAPINFO));
 
+#ifdef __WIN32OS2__
+    hic = CreateICA("display", NULL, NULL, NULL);
+#else
     hic = CreateIC("display", NULL, NULL, NULL);
+#endif
     pwc->dib.hDC = CreateCompatibleDC(hic);
 
@@ -1693 +1895 @@
         0);
     */
-    dprintf(("CreateDIBSection set pix %08X\n",pwc->pbPixels));
 
     pwc->ScreenMem = pwc->addrOffScreen = pwc->pbPixels;
@@ -1711 +1912 @@
     BOOL    bRet = 0;
     DWORD   dwErr = 0;
+#ifdef DIVE
+    ULONG rc;
+#endif
 #ifdef DDRAW
     HRESULT             ddrval;
 #endif
 
-    // Now search through the torus frames and mark used colors
     if(pwc->db_flag){
+#ifdef DIVE
+       if(DiveDirectAccess())
+         DiveFlush(pwc);
+       else
+         bRet = BitBlt(pwc->hDC, 0, 0, pwc->width, pwc->height,
+                       pwc->dib.hDC, 0, 0, SRCCOPY);
+#else
 #ifdef DDRAW
         if (pwc->lpDDSOffScreen == NULL)
@@ -1756 +1966 @@
                 pwc->dib.hDC, 0, 0, SRCCOPY);
 #endif
+#endif
     }
 
@@ -1956 +2167 @@
 {
     DDFree(wc);
+#ifdef __WIN32OS2__
+    MessageBoxA( hwnd, "DirectDraw Init FAILED", "", MB_OK );
+#else
     MessageBox( hwnd, "DirectDraw Init FAILED", "", MB_OK );
+#endif
     return FALSE;
 
@@ -2124 +2339 @@
 
    return 0; /* Eliminate compiler warning */
-} /* DDInit */
+}                                                                 /* DDInit*/
 
 static void DDFree( WMesaContext wc)
@@ -2135 +2350 @@
         wc->lpDD = NULL;
     }
-    // Clean up the screen on exit
+                                       /* Clean up the screen on exit      */
     RedrawWindow( NULL, NULL, NULL, RDW_INVALIDATE | RDW_ERASE |
         RDW_ALLCHILDREN );
@@ -2153 +2368 @@
     }
 }
-
-
 
 /*