Changeset 4127 for trunk/src

Timestamp:

Aug 30, 2000, 8:05:25 PM (25 years ago)

Author:

sandervl

Message:

workaround for palette problems in PowerDVD

Location:

trunk/src/gdi32

Files:

• blit.cpp (modified) (4 diffs)
• dibsect.cpp (modified) (12 diffs)
• dibsect.h (modified) (5 diffs)
• palette.cpp (modified) (2 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.16 2000-08-18 18:14:56 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.17 2000-08-30 18:05:24 sandervl Exp $ */
 
 /*
@@ -225 +225 @@
                            const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
 {
-#if 1
  INT rc;
 
@@ -263 +262 @@
                 DIBSection *destdib = DIBSection::findHDC(hdc);
                 if(destdib) {
-                        destdib->sync(hdc, yDst, heightDst);
+                        if(widthDst == widthSrc && heightDst == heightSrc &&
+                           destdib->GetBitCount() == infoLoc->bmiHeader.biBitCount &&
+                           destdib->GetBitCount() == 8) 
+                        {
+                                destdib->sync(xDst, yDst, widthDst, heightDst, (PVOID)bits);
+                        }
+                        else    destdib->sync(hdc, yDst, heightDst);
                 }
         }
@@ -277 +282 @@
     else {
         DIBSection *destdib = DIBSection::findHDC(hdc);
-        if(destdib) {
-                destdib->sync(hdc, yDst, heightDst);
-        }
+        if(destdib) {
+                if(widthDst == widthSrc && heightDst == heightSrc &&
+                   destdib->GetBitCount() == info->bmiHeader.biBitCount &&
+                   destdib->GetBitCount() == 8) 
+                {
+                        destdib->sync(xDst, yDst, widthDst, heightDst, (PVOID)bits);
+                }
+                else    destdib->sync(hdc, yDst, heightDst);
+        }
     }
 
     return rc;
-#else
-    dprintf(("GDI32: StretchDIBits\n"));
-    return O32_StretchDIBits(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, (void *)arg10, (PBITMAPINFO)arg11, arg12, arg13);
-#endif
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.37 2000-08-18 18:14:57 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.38 2000-08-30 18:05:24 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL), bmpBitsDblBuffer(NULL)
 {
+ int  palsize=0;
+
   bmpsize = pbmi->biWidth;
   /* @@@PH 98/06/07 -- high-color bitmaps don't have palette */
@@ -50 +52 @@
   {
         case 1:
-                bmpsize = ((bmpsize + 31) & ~31) / 8;
-                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                bmpsize = ((bmpsize + 31) & ~31) / 8;
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmphdrsize += palsize;
                 break;
         case 4:
                 bmpsize = ((bmpsize + 7) & ~7) / 2;
-                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmphdrsize += palsize;
                 break;
         case 8:
-                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmphdrsize += palsize;
                 bmpsize = (bmpsize + 3) & ~3;
                 break;
@@ -79 +84 @@
 
    this->hSection = hSection;
+   this->dwOffset = dwOffset;
    if(hSection) {
         bmpBits = (char *)MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS_W, 0, dwOffset, bmpsize*pbmi->biHeight);
@@ -130 +136 @@
    dibinfo.dsBm.bmBits      = bmpBits;
 
-   dibinfo.dshSection       = handle;
+   dibinfo.dshSection       = hSection;
    dibinfo.dsOffset         = dwOffset;
 
@@ -136 +142 @@
    {
         dibinfo.dsBitfields[0] = dibinfo.dsBitfields[1] = dibinfo.dsBitfields[2] = 0;
+        if(palsize) {
+                SetDIBColorTable(0, (1 << pbmi->biBitCount), (RGBQUAD *)(pbmi+1));
+        }
    }
    else {
@@ -305 +314 @@
 
    dibinfo.dshSection       = hSection;
-   dibinfo.dsOffset         = 0; // TODO: put the correct value here (if createdibsection with file handle)
+   dibinfo.dsOffset         = dwOffset;
 
    if(coloruse == DIB_PAL_COLORS || pbmi->biBitCount <= 8)
@@ -377 +386 @@
   {
     pOS2bmp->argbColor[i].fcOptions = 0;
+#ifdef DEBUG_PALETTE
     dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&pOS2bmp->argbColor[i])) ));
+#endif
   }
 
@@ -547 +558 @@
 }
 //******************************************************************************
+int WIN32API GetDIBits(HDC hdc, HBITMAP hBitmap, UINT uStartScan, UINT cScanLines, 
+                       void *lpvBits, BITMAPINFO_W * lpbi, UINT uUsage);
+
 //******************************************************************************
 void DIBSection::sync(HDC hdc, DWORD nYdest, DWORD nDestHeight) 
@@ -555 +569 @@
   dprintf(("Sync destination dibsection %x (%x)", handle, hdc));
 
+#if 0
+  BITMAPINFO_W *tmphdr = (BITMAPINFO_W *)malloc(os2bmphdrsize + sizeof(BITMAPINFO_W));
+  tmphdr->bmiHeader.biSize = sizeof(BITMAPINFOHEADER_W);
+  GetDIBits(hdc, handle, nYdest, nDestHeight, NULL, tmphdr, 0);
+  destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
+  rc = GetDIBits(hdc, handle, nYdest, nDestHeight, destBuf, tmphdr, 0);
+#ifdef DEBUG_PALETTE
+  if(rc && tmphdr->bmiHeader.biBitCount <= 8) {
+        for(int i=0;i<(1<<tmphdr->bmiHeader.biBitCount);i++)
+        {
+                dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&tmphdr->bmiColors[i])) ));
+        }
+  }
+#endif
+
+#else
   BITMAPINFO2 *tmphdr = (BITMAPINFO2 *)malloc(os2bmphdrsize);
   memcpy(tmphdr, pOS2bmp, os2bmphdrsize);
@@ -576 +606 @@
         rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
                           tmphdr);
-  }
+#ifdef DEBUG_PALETTE
+        if(rc != GPI_ALTERROR && tmphdr->cBitCount <= 8) {
+                for(int i=0;i<(1<<tmphdr->cBitCount);i++)
+                {
+                        dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&tmphdr->argbColor[i])) ));
+                }
+        }
+#endif
+  }
+#endif
+#if 0
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
         dprintf(("DIBSection::sync: convert RGB 565 to RGB 555"));
@@ -587 +627 @@
         else    RGB565to555((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
   }
+#endif
   free(tmphdr);
   if(rc != nDestHeight) {
         DebugInt3();
   }
+}
+//******************************************************************************
+//manual sync if no stretching and bpp is the same
+//WARNING: this also assumes the colortables are the same 
+//******************************************************************************
+void DIBSection::sync(DWORD xDst, DWORD yDst, DWORD widthDst, DWORD heightDst, PVOID bits)
+{
+ char *srcbuf, *destbuf;
+ int  linesize;
+
+   srcbuf  = (char *)bits + dibinfo.dsBm.bmWidthBytes*yDst + 
+                    (xDst*dibinfo.dsBm.bmWidthBytes)/pOS2bmp->cx;
+   destbuf = (char *)GetDIBObject() + dibinfo.dsBm.bmWidthBytes*yDst + 
+                    (xDst*dibinfo.dsBm.bmWidthBytes)/pOS2bmp->cx;
+   linesize = (widthDst*dibinfo.dsBm.bmWidthBytes)/pOS2bmp->cx;
+   for(int i=0;i<heightDst;i++) {
+        memcpy(destbuf, srcbuf, linesize);
+        destbuf += dibinfo.dsBm.bmWidthBytes;
+        srcbuf  += linesize;
+   }
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.19 2000-06-14 18:30:18 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.20 2000-08-30 18:05:24 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
 } BITMAP_W, *LPBITMAP_W;
 
+typedef struct {
+        BITMAPINFOHEADER_W bmiHeader;
+        RGBQUAD bmiColors[1];
+} BITMAPINFO_W;
+typedef BITMAPINFO *LPBITMAPINFO;
+
 #ifdef OS2_ONLY
 #define DIB_RGB_COLORS   0
@@ -76 +82 @@
 
               DWORD GetBitmapHandle()        { return handle; };
+              void  SetBitmapHandle(DWORD bmphandle) { handle = bmphandle; };
               DWORD GetRGBUsage()            { return iUsage; };
 
@@ -84 +91 @@
                            DWORD Rop);
               void  sync(HDC hdc, DWORD nYdest, DWORD nDestHeight);
+              void  sync(DWORD xDst, DWORD yDst, DWORD widthDst, DWORD heightDst, PVOID bits);
                int  SetDIBColorTable(int startIdx, int cEntries, RGBQUAD *rgb);
 
@@ -100 +108 @@
 private:
           DWORD handle, iUsage;
-          DWORD hSection;
+          DWORD hSection, dwOffset;
           HWND  hwndParent;
           HDC   hdc;

trunk/src/gdi32/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.6 2000-08-18 18:14:58 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.7 2000-08-30 18:05:25 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
   HPALETTE rc;
 
+#ifdef DEBUG_PALETTE
    for(int i=0; i<arg1->palNumEntries;i++)
    {
         dprintf2(("Index %d : 0x%08X\n",i, *((DWORD*)(&arg1->palPalEntry[i])) ));
    }
+#endif
    rc = O32_CreatePalette(arg1);
    dprintf(("GDI32: CreatePalette %x %d returns 0x%08X\n", arg1, arg1->palNumEntries, rc));