Changeset 8818 for trunk/src/ddraw/OS2SURFACE.CPP

Timestamp:

Jul 1, 2002, 9:15:26 PM (23 years ago)

Author:

sandervl

Message:

fill, SurfGetDC, SurfReleaseDC fixes & changes (see ChangeLog for details)

File:

• trunk/src/ddraw/OS2SURFACE.CPP (modified) (16 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.43 2002-07-01 16:02:04 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.44 2002-07-01 19:15:24 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include <winerror.h>
 #include <os2win.h>
+#include <cpuhlp.h>
+#include "asmutil.h"
+
 #ifndef __WATCOMC__
   #include <builtin.h>
@@ -1569 +1572 @@
   }
 
-  if(NULL!=ColorFill)
+  if(NULL!=ColorFill) {
     ColorFill( pDiveBuffer, pFrameBuffer, Top, Left,
               FillWidth, FillHeight, dwPitchDB,dwPitchFB,
               dwFillColor,(16==lpDraw->dCaps.ulDepth)?(VOID*)pPal16:(VOID*)pPal24);
+    SurfChangeUniquenessValue(this);
+  }
   else
   {
@@ -2538 +2543 @@
           }
 #endif
+          SurfChangeUniquenessValue(dest);
           return DD_OK;
       }
@@ -3058 +3064 @@
                 break;
             }  // end switch
-            //if(dest->lpVtbl == dest->Vtbl4)
-            //  dest->Vtbl4->ChangeUniquenessValue(dest);
+            SurfChangeUniquenessValue(dest);
             return DD_OK;
           }
@@ -3304 +3309 @@
             // Only Source colorkey
           }
-          // if(dest->lpVtbl == dest->Vtbl4)
-          //  dest->Vtbl4->ChangeUniquenessValue(dest);
+          SurfChangeUniquenessValue(dest);
           return DD_OK;
         }
@@ -3419 +3423 @@
   }// end handling destination not framebuffer
 
-  // if(dest->lpVtbl == dest->Vtbl4)
-  //   dest->Vtbl4->ChangeUniquenessValue(dest);
+  SurfChangeUniquenessValue(dest);
   return(DD_OK);
 }
@@ -4405 +4408 @@
  DDSURFACEDESC2        LockedSurfaceDesc;
  HRESULT               rc;
- BITMAPINFOHEADER      bmihHdr;
  BITMAP bmpSurface;
  struct
@@ -4454 +4456 @@
     BitmapInfo.bmiHead.biPlanes   = 1;
     BitmapInfo.bmiHead.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
-    memset(&bmihHdr, 0, sizeof(bmihHdr));
-    bmihHdr.biSize     = sizeof(BITMAPINFOHEADER);
-    bmihHdr.biWidth    = LockedSurfaceDesc.dwWidth;
-    bmihHdr.biHeight   = LockedSurfaceDesc.dwHeight;
-    bmihHdr.biPlanes   = 1;
-    bmihHdr.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
 
     switch(LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
@@ -4487 +4483 @@
         }
         me->hbmImage = CreateDIBitmap( me->hdcImage,
-                                       &bmihHdr,
+                                       &BitmapInfo.bmiHead,
                                        CBM_INIT,
                                        LockedSurfaceDesc.lpSurface,
@@ -4503 +4499 @@
         *((DWORD *) &(BitmapInfo.bmiCols[2])) = me->DDSurfaceDesc.ddpfPixelFormat.dwBBitMask;
         me->hbmImage = CreateDIBitmap( me->hdcImage,
-                                       &bmihHdr,
+                                       &BitmapInfo.bmiHead,
                                        CBM_INIT,
                                        LockedSurfaceDesc.lpSurface,
@@ -4908 +4904 @@
    RGBQUAD           bmiCols[256];
  } BitmapInfo;
-// BITMAP bmpData;
  int rc;
 
@@ -4916 +4911 @@
     return(DDERR_INVALIDOBJECT);
 
-  #if 1
   //unselect our bitmap
   SelectObject(me->hdcImage, me->hgdiOld);
+
   memset(&BitmapInfo,0, sizeof(BitmapInfo));
   BitmapInfo.bmiHead.biSize     = sizeof(BITMAPINFOHEADER);
-  /*
-  BitmapInfo.bmiHead.biWidth    = me->DDSurfaceDesc.lPitch/ (me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount>>3);
+  BitmapInfo.bmiHead.biBitCount = me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
+  BitmapInfo.bmiHead.biPlanes   = 1;
+  BitmapInfo.bmiHead.biWidth    = me->DDSurfaceDesc.dwWidth; /// (me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount>>3);
   BitmapInfo.bmiHead.biHeight   = me->DDSurfaceDesc.dwHeight;
-  BitmapInfo.bmiHead.biPlanes   = 1;
-  BitmapInfo.bmiHead.biBitCount = 0; // me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
-  */
+
   switch(me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
   {
@@ -4966 +4960 @@
       break;
     case 16:
+      BitmapInfo.bmiHead.biCompression = BI_BITFIELDS;
+      BitmapInfo.bmiHead.biClrUsed     = 3;
+      *((DWORD *) &(BitmapInfo.bmiCols[0])) = me->DDSurfaceDesc.ddpfPixelFormat.dwRBitMask;
+      *((DWORD *) &(BitmapInfo.bmiCols[1])) = me->DDSurfaceDesc.ddpfPixelFormat.dwGBitMask;
+      *((DWORD *) &(BitmapInfo.bmiCols[2])) = me->DDSurfaceDesc.ddpfPixelFormat.dwBBitMask;
+      GetDIBits(hdc, me->hbmImage, 0, me->DDSurfaceDesc.dwHeight,
+                me->DDSurfaceDesc.lpSurface,(PBITMAPINFO)&BitmapInfo,DIB_RGB_COLORS);
+
+      //GetDIBits returns data in RGB555 format; convert if surface is in RGB565 format
+      if(me->DDSurfaceDesc.ddpfPixelFormat.dwGBitMask == 0x7E0) {
+        int imgsize = BitmapInfo.bmiHead.biWidth*BitmapInfo.bmiHead.biHeight*2;
+
+        if(CPUFeatures & CPUID_MMX) {
+             DDrawRGB555to565MMX((char *)me->DDSurfaceDesc.lpSurface, (char *)me->DDSurfaceDesc.lpSurface, imgsize/sizeof(WORD));
+        }
+        else DDrawRGB555to565((char *)me->DDSurfaceDesc.lpSurface, (char *)me->DDSurfaceDesc.lpSurface, imgsize/sizeof(WORD));
+      }
+      break;
+
     case 32:
       BitmapInfo.bmiHead.biCompression = BI_BITFIELDS;
@@ -4975 +4988 @@
                 me->DDSurfaceDesc.lpSurface,(PBITMAPINFO)&BitmapInfo,DIB_RGB_COLORS);
       break;
+
     case 24:
       BitmapInfo.bmiHead.biCompression = BI_RGB;
@@ -4985 +4999 @@
       break;
   } // end switch (me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
-  #else
-
-  rc = GetObjectA( me->hbmImage,
-                  sizeof(BITMAP),
-                  &bmpData);
-  dprintf( ("GetObject returned rc=%d\n BitmapInfo:\n Size:(%dx%d)\n Pitch: %d\n Bits %d\n @mem %08X",
-            rc,
-            bmpData.bmWidth, bmpData.bmHeight,
-            bmpData.bmWidthBytes,
-            bmpData.bmBitsPixel,
-            bmpData.bmBits));
-  #endif
+
   me->Vtbl.Unlock(me,NULL);
   me->dwLastDCUnique = me->dwUniqueValue; // Store this to see if the surface was locked after we released the DC