Changeset 2581 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Jan 31, 2000, 11:30:08 PM (26 years ago)

Author:

sandervl

Message:

init dibsection bmp data to 0 during creation

File:

• trunk/src/gdi32/dibsect.cpp (modified) (14 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.12 1999-12-30 11:21:29 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.13 2000-01-31 22:30:07 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #define  OS2_ONLY
 #include "dibsect.h"
+#include <vmutex.h>
 
 HWND WIN32API WindowFromDC(HDC hdc);
@@ -36 +37 @@
 }
 
+static VMutex dibMutex;
 
 //NOTE:
@@ -48 +50 @@
   bmpsize = pbmi->biWidth;
   /* @@@PH 98/06/07 -- high-color bitmaps don't have palette */
-
 
   this->fFlip = fFlip;
@@ -81 +82 @@
 
    bmpBits    = (char *)malloc(bmpsize*pbmi->biHeight);
+   memset(bmpBits, 0, bmpsize*pbmi->biHeight);
 
    pOS2bmp    = (BITMAPINFO2 *)malloc(os2bmpsize);
 
-  memset(pOS2bmp, /* set header + palette entries to zero */
-         0,
-         os2bmpsize);
+   memset(pOS2bmp, /* set header + palette entries to zero */
+          0,
+          os2bmpsize);
 
    pOS2bmp->cbFix         = sizeof(BITMAPINFO2) - sizeof(RGB2);
@@ -95 +97 @@
    pOS2bmp->ulCompression = pbmi->biCompression;
    pOS2bmp->cbImage       = pbmi->biSizeImage;
+   dprintf(("handle                 %x", handle));
    dprintf(("pOS2bmp->cx            %d\n", pOS2bmp->cx));
    dprintf(("pOS2bmp->cy            %d\n", pOS2bmp->cy));
@@ -105 +108 @@
    this->handle = handle;
 
+   dibMutex.enter();
    if(section == NULL)
    {
@@ -124 +128 @@
      dsect->next = this;
    }
-
-   dprintf2(("Class created"));
+   dibMutex.leave();
 }
 //******************************************************************************
@@ -131 +134 @@
 DIBSection::~DIBSection()
 {
+   dprintf(("Delete DIBSection %x", handle));
    if(bmpBits)
         free(bmpBits);
@@ -136 +140 @@
         free(pOS2bmp);
 
+   dibMutex.enter();
    if(section == this)
    {
@@ -150 +155 @@
      dsect->next = this->next;
    }
+   dibMutex.leave();
 }
 //******************************************************************************
@@ -253 +259 @@
   if(hwndDest != 0)
   {
-    hps = WinGetPS(hwndDest);
+        hps = WinGetPS(hwndDest);
   }
   if(hps == 0)
   {
-    eprintf(("DIBSection::BitBlt, hps == 0 hwndDest = %X", hwndDest));
+    dprintf(("ERROR: DIBSection::BitBlt, hps == 0 hwndDest = %X", hwndDest));
     return(FALSE);
   }
 
-  dprintf(("DIBSection::BitBlt %X %x to(%d,%d)(%d,%d) from (%d,%d)(%d,%d) rop %x\n",
-          hdcDest, hwndDest, nXdest, nYdest, nDestWidth, nDestHeight,
-          nXsrc, nYsrc, nSrcWidth, nSrcHeight, Rop));
+  dprintf(("DIBSection::BitBlt %x %X (hps %x) %x to(%d,%d)(%d,%d) from (%d,%d)(%d,%d) rop %x flip %x",
+          handle, hdcDest, hps, hwndDest, nXdest, nYdest, nDestWidth, nDestHeight,
+          nXsrc, nYsrc, nSrcWidth, nSrcHeight, Rop, fFlip));
 
   point[0].x = nXdest;
@@ -327 +333 @@
  DIBSection *dsect = section;
 
+  dibMutex.enter();
   while(dsect)
   {
     if(dsect->handle == handle)
     {
-      return(dsect);
+        dibMutex.leave();
+        return(dsect);
     }
     dsect = dsect->next;
   }
+  dibMutex.leave();
   return(NULL);
 }
@@ -423 +432 @@
 char  DIBSection::GetBitCount()
 {
-   if(NULL==pOS2bmp)
+   if(pOS2bmp == NULL)
      return 0;
    else