Changeset 2581 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

init dibsection bmp data to 0 during creation

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (14 diffs)
• gdi32.cpp (modified) (9 diffs)
• line.cpp (modified) (3 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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.35 2000-01-30 15:04:40 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.36 2000-01-31 22:30:08 sandervl Exp $ */
 
 /*
@@ -319 +319 @@
 
     OSLibGpiSetCp(newHdc, oldcp);
+    dprintf(("CreateCompatibleDC %X returned %x", hdc, newHdc));
     return newHdc;
 }
@@ -329 +330 @@
 {
 #if 1
-    dprintf(("GDI32: StretchDIBits"));
+    dprintf(("GDI32: StretchDIBits %x to (%d,%d) (%d,%d) from (%d,%d) (%d,%d), %x %x %x %x", hdc, xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, bits, info, wUsage, dwRop));
 
     if(wUsage == DIB_PAL_COLORS && info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
@@ -1246 +1247 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API GetCurrentObject( HDC arg1, UINT arg2)
-{
-    dprintf(("GDI32: GetCurrentObject"));
-    return (HANDLE)O32_GetCurrentObject(arg1, arg2);
+HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
+{
+    dprintf(("GDI32: GetCurrentObject %x %x", hdc, arg2));
+    return (HANDLE)O32_GetCurrentObject(hdc, arg2);
 }
 //******************************************************************************
@@ -1515 +1516 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API GetTextExtentPoint32A( HDC arg1, LPCSTR arg2, int arg3, PSIZE  lpSize)
-{
-    dprintf(("GDI32: GetTextExtentPoint32A"));
+BOOL WIN32API GetTextExtentPoint32A( HDC hdc, LPCSTR lpsz, int cbString, PSIZE  lpSize)
+{
+ BOOL rc;
+
     lpSize->cx = lpSize->cy = 0;
-    return O32_GetTextExtentPoint32(arg1, arg2, arg3, lpSize);
+    rc = O32_GetTextExtentPoint32(hdc, lpsz, cbString, lpSize);
+    dprintf(("GDI32: GetTextExtentPoint32A %x %s %d returned %d (%d,%d)", hdc, lpsz, cbString, rc, lpSize->cx, lpSize->cy));
+    return rc;
 }
 //******************************************************************************
@@ -1896 +1900 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SelectClipRgn( HDC arg1, HRGN  arg2)
-{
-    dprintf(("GDI32: SelectClipRgn"));
-    return O32_SelectClipRgn(arg1, arg2);
+int WIN32API SelectClipRgn( HDC hdc, HRGN hRgn)
+{
+    dprintf(("GDI32: SelectClipRgn %x %x", hdc, hRgn));
+    return O32_SelectClipRgn(hdc, hRgn);
 }
 //******************************************************************************
@@ -2006 +2010 @@
 //    if(xDest == 0 && yDest == 0 && xSrc == 0 && ySrc == 0 && cx == width && cy == height) {
 //      result = OSLibSetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (WINBITMAPINFOHEADER*)info, coloruse);
+//      result = lines;
 //    }
 //    else {
@@ -2241 +2246 @@
   if(pbmi->bmiHeader.biWidth < 0)
   {
-    pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
-    fFlip = FLIP_HOR;
+        dprintf(("CreateDIBSection: width %d", pbmi->bmiHeader.biWidth));
+        pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
+        fFlip = FLIP_HOR;
   }
   iHeight = pbmi->bmiHeader.biHeight;
   if(pbmi->bmiHeader.biHeight < 0)
   {
-    pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
-    fFlip |= FLIP_VERT;
+        dprintf(("CreateDIBSection: height %d", pbmi->bmiHeader.biHeight));
+        pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
+        fFlip |= FLIP_VERT;
   }
 
@@ -2288 +2295 @@
       pbmi->bmiHeader.biHeight = iHeight;
 
-      dprintf(("GDI32: return %08X\n",res));
       return(res);
     }

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.3 1999-12-27 22:52:39 cbratschi Exp $ */
+/* $Id: line.cpp,v 1.4 2000-01-31 22:30:08 sandervl Exp $ */
 /*
  * Line API's
@@ -71 +71 @@
   PVOID pHps = OSLibGpiQueryDCData(hdc);
 
-  dprintf(("GDI32: MoveToEx\n"));
+  dprintf(("GDI32: MoveToEx %x (%d,%d)", hdc, X, Y));
 
   if (pHps)
@@ -105 +105 @@
   BOOL rc = TRUE;
 
-  dprintf(("GDI32: LineTo"));
+  dprintf(("GDI32: LineTo %x (%d,%d)", hdc, nXEnd, nYEnd));
 
   if (pHps)