Changeset 4574 for trunk/src

Timestamp:

Nov 9, 2000, 7:16:57 PM (25 years ago)

Author:

sandervl

Message:

DeleteDC + CreateDIBSection fixes

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (4 diffs)
• dibsect.cpp (modified) (6 diffs)
• dibsect.h (modified) (3 diffs)
• gdi32.cpp (modified) (4 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.10 2000-10-16 11:01:47 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.11 2000-11-09 18:16:56 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
   HBITMAP rc;
 
+  //SvL: Completely wrong result when creating a 1bpp bitmap here (converted
+  //     to 8bpp by Open32)
+  if(lpbmih->biBitCount == 1) {
+        dprintf(("WARNING: CreateDIBitmap doesn't handle 1bpp bitmaps very well!!!!!"));
+  }
+  
   //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
 
@@ -78 +84 @@
 {
     dprintf(("GDI32: CreateDisardableBitmap\n"));
-    return O32_CreateCompatibleBitmap(hDC, nWidth, nHeight);
+    return CreateCompatibleBitmap(hDC, nWidth, nHeight);
 }
 //******************************************************************************
@@ -154 +160 @@
         // and use it to set the DIBColorTable
         nrcolors = GetPaletteEntries( hpalCur, 0, 1<<PalSize, (LPPALETTEENTRY)&Pal);
-        dsect->SetDIBColorTable(0, nrcolors, (RGBQUAD*)&Pal);
+        dsect->SetDIBColorTable(0, nrcolors, (LPPALETTEENTRY)&Pal);
 
         // Restore the DC Palette

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.41 2000-10-07 11:39:16 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.42 2000-11-09 18:16:56 sandervl Exp $ */
 
 /*
@@ -395 +395 @@
 //******************************************************************************
 //******************************************************************************
+int DIBSection::SetDIBColorTable(int startIdx, int cEntries, PALETTEENTRY *palentry)
+{
+ int i;
+
+  if(startIdx + cEntries > (1 << pOS2bmp->cBitCount))
+  {
+    dprintf(("DIBSection::SetDIBColorTable, invalid nr of entries %d %d\n", startIdx, cEntries));
+    return(0);
+  }
+
+  for(i=startIdx;i<cEntries;i++)
+  {
+    pOS2bmp->argbColor[i].fcOptions = 0;
+    pOS2bmp->argbColor[i].bBlue  = palentry[i].peBlue;
+    pOS2bmp->argbColor[i].bGreen = palentry[i].peGreen;
+    pOS2bmp->argbColor[i].bRed   = palentry[i].peRed;
+  }
+
+  return(cEntries);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL DIBSection::BitBlt(HDC hdcDest, int nXdest, int nYdest, int nDestWidth,
                         int nDestHeight, int nXsrc, int nYsrc,
@@ -428 +450 @@
 
         if(fFrameWindowDC) {
-            GetWindowRect(hwndDest, &rect);
+              GetWindowRect(hwndDest, &rect);
         }
         else  GetClientRect(hwndDest, &rect);
@@ -488 +510 @@
   }
 */
+#ifdef INVERT
   oldyinversion = GpiQueryYInversion(hps);
   if(oldyinversion != 0) {
@@ -493 +516 @@
         fRestoryYInversion = TRUE;
   }
+#endif
+
+#ifdef DEBUG
+  RECTL rcltemp;
+  GreGetDCOrigin(hps, (PPOINTL)&rcltemp);
+  dprintf(("origin (%d,%d) yinv %d", rcltemp.xLeft, rcltemp.yBottom, oldyinversion));
+#endif
 
   if(fFlip & FLIP_HOR)
@@ -572 +602 @@
             destdib->sync(hps, nYdest, nDestHeight);
         }
+#ifdef INVERT
         //restore old y inversion height
         if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#endif
             SetLastError(ERROR_SUCCESS_W);
 
         return(TRUE);
   }
+#ifdef INVERT
   if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#endif
 
   dprintf(("DIBSection::BitBlt %X (%d,%d) (%d,%d) to (%d,%d) (%d,%d) returned %d\n", hps, point[0].x, point[0].y, point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y, rc));

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.21 2000-10-07 09:03:50 hugh Exp $ */
+/* $Id: dibsect.h,v 1.22 2000-11-09 18:16:56 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
   BYTE rgbReserved;
 } RGBQUAD, *LPRGBQUAD;
+
+typedef struct tagPALETTEENTRY
+{
+        BYTE peRed, peGreen, peBlue, peFlags;
+} PALETTEENTRY, *PPALETTEENTRY, *LPPALETTEENTRY;
+
 #else
 #define BITMAPINFO2     DWORD
@@ -94 +100 @@
               void  sync(DWORD xDst, DWORD yDst, DWORD widthDst, DWORD heightDst, PVOID bits);
                int  SetDIBColorTable(int startIdx, int cEntries, RGBQUAD *rgb);
+               int  SetDIBColorTable(int startIdx, int cEntries, PALETTEENTRY *rgb);
 
                int  SetDIBits(HDC hdc, HBITMAP hbitmap, UINT startscan, UINT

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.59 2000-11-05 18:48:21 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.60 2000-11-09 18:16:57 sandervl Exp $ */
 
 /*
@@ -22 +22 @@
 #include "oslibgpi.h"
 #include "oslibgdi.h"
+#include <dcdata.h>
+#include <win32wnd.h>
 
 #define DBG_LOCALLOG    DBG_gdi32
@@ -85 +87 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, DeleteDC, HDC, hdc)
-{
-  return O32_DeleteDC(hdc);
-}
-//******************************************************************************
-//******************************************************************************
 HBRUSH WIN32API CreatePatternBrush(HBITMAP arg1)
 {
@@ -137 +133 @@
     dprintf(("CreateCompatibleDC %X returned %x", hdc, newHdc));
     return newHdc;
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION1(BOOL, DeleteDC, HDC, hdc)
+{
+  pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+  if(!pHps)
+  {
+      dprintf(("WARNING: DeleteDC %x; invalid hdc!", hdc));
+      SetLastError(ERROR_INVALID_HANDLE);
+      return 0;
+  }
+  SetLastError(ERROR_SUCCESS);
+  //Must call ReleaseDC for window dcs
+  if(pHps->hdcType == TYPE_1) {
+      return ReleaseDC(OS2ToWin32Handle(pHps->hwnd), hdc);
+  }
+
+  return O32_DeleteDC(hdc);
 }
 //******************************************************************************