Changeset 5799 for trunk/src

Timestamp:

May 25, 2001, 12:05:29 PM (24 years ago)

Author:

sandervl

Message:

dib section sync, setdibits & setpalette bugfixes

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (3 diffs)
• dibsect.cpp (modified) (3 diffs)
• palette.cpp (modified) (3 diffs)
• text.cpp (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.15 2001-03-27 20:47:52 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.16 2001-05-25 10:05:28 sandervl Exp $ */
 
 /*
@@ -301 +301 @@
                        const BITMAPINFO *pBitmapInfo, UINT usage)
 {
+    int ret;
+
     dprintf(("GDI32: SetDIBits %x %x %x %x %x %x %x", hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage));
 
-    if(DIBSection::getSection() != NULL)
-    {
-        DIBSection *dsect;
-
-        dsect = DIBSection::findObj(hBitmap);
-        if(dsect) {
-           return dsect->SetDIBits(hdc, hBitmap, startscan, numlines, pBits, (BITMAPINFOHEADER_W *)&pBitmapInfo->bmiHeader, usage);
-        }
-    }
     //SvL: Open32's SetDIBits really messes things up for 1 bpp bitmaps, must use SetBitmapBits
     if(pBitmapInfo->bmiHeader.biBitCount == 1 && startscan == 0 && numlines == pBitmapInfo->bmiHeader.biHeight)
@@ -344 +337 @@
     }
 #endif
-    return O32_SetDIBits(hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage);
-}
-//******************************************************************************
-//******************************************************************************
+    ret = O32_SetDIBits(hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage);
+    if(DIBSection::getSection() != NULL)
+    {
+        DIBSection *dsect;
+
+        dsect = DIBSection::findObj(hBitmap);
+        if(dsect) {
+             HBITMAP hBmpOld = SelectObject(hdc, hBitmap);
+             dsect->sync(hdc, 0, dsect->GetHeight());
+             SelectObject(hdc, hBmpOld);
+        }
+    }
+
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.50 2001-05-10 17:03:18 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.51 2001-05-25 10:05:29 sandervl Exp $ */
 
 /*
@@ -389 +389 @@
  int i;
 
+  dprintf(("SetDIBColorTable %d %d %x", startIdx, cEntries, rgb));
   if(startIdx + cEntries > (1 << pOS2bmp->cBitCount))
   {
@@ -713 +714 @@
 #endif
   }
+  memcpy(pOS2bmp, tmphdr, os2bmphdrsize);
 
 #if 0

trunk/src/gdi32/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.7 2000-08-30 18:05:25 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.8 2001-05-25 10:05:29 sandervl Exp $ */
 
 /*
@@ -81 +81 @@
 HPALETTE WIN32API SelectPalette(HDC hdc, HPALETTE hPalette, BOOL bForceBackground)
 {
+  HPALETTE hPal;
+
   dprintf(("GDI32: SelectPalette (0x%08X, 0x%08X, 0x%08X)", hdc, hPalette, bForceBackground));
+  hPal = O32_SelectPalette(hdc, hPalette, bForceBackground);
   if(DIBSection::getSection() != NULL)
   {
@@ -87 +90 @@
     if(dsect)
     {
-      int nrcolors;
-      PALETTEENTRY Pal[256];
-      char PalSize = dsect->GetBitCount();
-      dprintf(("       - Set Palette Values in DIBSection\n"));
-      if(PalSize<=8)
-      {
-        nrcolors = GetPaletteEntries( hPalette, 0, 1<<PalSize, (LPPALETTEENTRY)&Pal);
-        dsect->SetDIBColorTable(0, nrcolors, (RGBQUAD*)&Pal);
-      }
-
+        dsect->sync(hdc, 0, dsect->GetHeight());
     }
   }
-  return O32_SelectPalette(hdc, hPalette, bForceBackground);
+  return hPal;
 }
 //******************************************************************************

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.21 2001-05-24 19:26:31 sandervl Exp $ */
+/* $Id: text.cpp,v 1.22 2001-05-25 10:05:29 sandervl Exp $ */
 
 /*
@@ -874 +874 @@
    //     in the Settings dialog box of VirtualPC. Strings are clipped.
    //     (e.g.: Hard Disk 1 -> Hard Disk)
-   return O32_GetTextExtentPoint(hdc, lpsz, cbString, lpsSize);
+   dprintf(("GDI32: GetTextExtentPointA %s\n", lpsz));
+   BOOL rc = O32_GetTextExtentPoint(hdc, lpsz, cbString, lpsSize);
+   if(rc) {
+      dprintf(("GDI32: GetTextExtentPointA %x %s %d returned %d (%d,%d)", hdc, lpsz, cbString, rc, lpsSize->cx, lpsSize->cy));
+      SetLastError(ERROR_SUCCESS);
+      return TRUE;
+   }
+   return FALSE;
 #else
    BOOL       rc;