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

Timestamp:

Dec 31, 2001, 1:08:23 PM (24 years ago)

Author:

sandervl

Message:

use critical section in dib section class instead of vmutex

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.61 2001-12-20 19:57:01 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.62 2001-12-31 12:08:20 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <win32type.h>
 #include <misc.h>
-#define  OS2_ONLY
-#include "dibsect.h"
-#include <vmutex.h>
 #include <win32api.h>
 #include <winconst.h>
@@ -28 +25 @@
 #include <cpuhlp.h>
 #include <dcdata.h>
+#include "dibsect.h"
 #include "oslibgpi.h"
 #include "rgbcvt.h"
@@ -33 +31 @@
 #define DBG_LOCALLOG  DBG_dibsect
 #include "dbglocal.h"
-
-static VMutex dibMutex;
 
 //******************************************************************************
@@ -176 +172 @@
    this->iUsage = iUsage;
 
-   dibMutex.enter();
+   lock();
    if(section == NULL)
    {
@@ -195 +191 @@
      dsect->next = this;
    }
-   dibMutex.leave();
+   unlock();
 }
 //******************************************************************************
@@ -216 +212 @@
         free(pOS2bmp);
 
-   dibMutex.enter();
+   lock();
    if(section == this)
    {
@@ -231 +227 @@
      dsect->next = this->next;
    }
-   dibMutex.leave();
+   unlock();
 }
 //******************************************************************************
@@ -489 +485 @@
         hdcHeight = rect.bottom - rect.top;
         hdcWidth  = rect.right - rect.left;
+        dprintf(("DIBSection::BitBlt hdc size (%d,%d) (WINDOW)", hdcWidth, hdcHeight));
   }
   else {
         hdcHeight = pHps->bitmapHeight;
         hdcWidth  = pHps->bitmapWidth;
+        dprintf(("DIBSection::BitBlt hdc size (%d,%d) (BMP)", hdcWidth, hdcHeight));
   }
 
@@ -498 +496 @@
   //This messes up the two bitmaps in the opening window of Opera 6
   //(choice between MDI & SDI interface)
-#if 0
-  if(nXdest + nDestWidth > hdcWidth) {
-        nDestWidth  = hdcWidth - nXdest;
-  }
-
-  if(nYdest + nDestHeight > hdcHeight) {
-        nDestHeight = hdcHeight - nYdest;
-  }
-#endif
 
   //win32 coordinates are relative to left top, OS/2 expects left bottom
@@ -513 +502 @@
 
   point[0].x = nXdest;
+  point[1].x = nXdest + nDestWidth - 1;
+#ifdef INVERT
   point[0].y = hdcHeight - nYdest - nDestHeight;
-  point[1].x = nXdest + nDestWidth - 1;
   point[1].y = hdcHeight - nYdest - 1;
-
-#if 0
-  //Don't check size here either. Let GpiDrawBits do that for us
-  if(nXsrc + nSrcWidth > pOS2bmp->cx) {
-        nSrcWidth  = pOS2bmp->cx - nXsrc;
-  }
-  if(nYsrc + nSrcHeight > pOS2bmp->cy) {
-        nSrcHeight = pOS2bmp->cy - nYsrc;
-  }
+#else
+  point[0].y = nYdest;
+  point[1].y = nYdest + nDestHeight - 1;
 #endif
 
   //target rectangle is inclusive-inclusive
   point[2].x = nXsrc;
+  point[3].x = nXsrc + nSrcWidth;
+#ifdef INVERT
   point[2].y = pOS2bmp->cy - nYsrc - nSrcHeight;
-  point[3].x = nXsrc + nSrcWidth;
   point[3].y = pOS2bmp->cy - nYsrc;
+#else
+  point[2].y = nYsrc;
+  point[3].y = nYsrc + nSrcHeight - 1;
+#endif
 
   dprintf(("DIBSection::BitBlt (%d,%d)(%d,%d) from (%d,%d)(%d,%d) dim (%d,%d)(%d,%d)", point[0].x, point[0].y,
@@ -540 +529 @@
   oldyinversion = GpiQueryYInversion(hps);
   if(oldyinversion != 0) {
+#ifdef DEBUG
+        POINT point;
+        GetViewportOrgEx(hps, &point);
+        dprintf(("Viewport origin (%d,%d)", point.x, point.y));
+#endif
         GpiEnableYInversion(hps, 0);
         fRestoryYInversion = TRUE;
@@ -631 +625 @@
         if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
 #endif
-            SetLastError(ERROR_SUCCESS_W);
+        SetLastError(ERROR_SUCCESS_W);
 
         return(TRUE);
@@ -661 +655 @@
       dprintf(("Sync destination dibsection: hdc y inversion = %d", oldyinversion));
       if(oldyinversion != 0) {
+#ifdef DEBUG
+          POINT point;
+          GetViewportOrgEx(hdc, &point);
+          dprintf(("Viewport origin (%d,%d)", point.x, point.y));
+#endif
           GpiEnableYInversion(hdc, 0);
       }
@@ -774 +773 @@
 
   DIBSection *dsect = section;
-  dibMutex.enter();
+  lock();
 
   do
@@ -780 +779 @@
     if(dsect->handle == handle)
     {
-        dibMutex.leave();
+        unlock();
         return(dsect);
     }
@@ -787 +786 @@
   while(dsect);
 
-  dibMutex.leave();
+  unlock();
   return(NULL);
 }
@@ -801 +800 @@
   DIBSection *dsect = section;
   
+  lock();
   do
   {
         if(dsect->hdc == hdc)
         {
+            unlock();
             return(dsect);
         }
@@ -810 +811 @@
   }
   while(dsect);
-    
+
+  unlock();   
   return(NULL);
 }
@@ -873 +875 @@
 //******************************************************************************
 //******************************************************************************
-DIBSection *DIBSection::section = NULL;
+void DIBSection::initDIBSection() 
+{
+    InitializeCriticalSection(&dibcritsect);
+}
+//******************************************************************************
+//******************************************************************************
+DIBSection      *DIBSection::section = NULL;
+CRITICAL_SECTION DIBSection::dibcritsect;