Changeset 2676 for trunk/src/user32/dc.cpp

Timestamp:

Feb 7, 2000, 3:30:18 PM (26 years ago)

Author:

sandervl

Message:

Fix for DCX_INTERSECTRGN in GetDCEx

File:

• trunk/src/user32/dc.cpp (modified) (11 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.43 2000-02-06 22:00:22 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.44 2000-02-07 14:30:18 sandervl Exp $ */
 
 /*
@@ -77 +77 @@
 int  WIN32API ReleaseDC(HWND hwnd, HDC hdc);
 BOOL WIN32API PostMessageA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+int  WIN32API ExtSelectClipRgn(HDC hdc, HRGN hrgn, int fnMode);
 
 //******************************************************************************
@@ -437 +438 @@
 //******************************************************************************
 //******************************************************************************
+#if 1
+HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
+{
+   HWND     hwnd = hWnd ? hWnd : HWND_DESKTOP;
+   pDCData  pHps = NULLHANDLE;
+   RECTL    rect;
+   HPS      hPS_ownDC = NULLHANDLE;
+
+   if ( !lpps )
+   {
+      O32_SetLastError (ERROR_INVALID_PARAMETER);
+      return (HDC)NULLHANDLE;
+   }
+
+   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+#if 0
+   if ((hwnd != HWND_DESKTOP) && wnd->isOwnDC())
+   {
+        hPS_ownDC = wnd->getOwnDC();
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+        if(hPS_ownDC) {
+                pHps = (pDCData)GpiQueryDCData(hPS_ownDC);
+                if (!pHps)
+                {
+                        O32_SetLastError (ERROR_INVALID_PARAMETER);
+                        return (HDC)NULLHANDLE;
+                }
+        }
+   }
+#endif
+
+   HWND hwndClient = wnd->getOS2WindowHandle();
+   HPS  hps = WinBeginPaint(hwndClient, hPS_ownDC, &rect);
+
+   if (!pHps)
+   {
+      HDC hdc = HPSToHDC (hwndClient, hps, NULL, NULL);
+      pHps = (pDCData)GpiQueryDCData(hps);
+   }
+
+   if (hPS_ownDC == 0)
+      setMapMode (wnd, pHps, MM_TEXT_W);
+   else
+      setPageXForm (wnd, pHps);
+
+   pHps->hdcType = TYPE_3;
+   lpps->hdc = (HDC)hps;
+
+   if(!wnd->isSuppressErase()) {
+        wnd->setSuppressErase(TRUE);
+        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
+   }
+   lpps->fErase = wnd->isPSErase();
+
+   if (!hPS_ownDC)
+   {
+      long height  = wnd->getClientHeight();
+      rect.yTop    = height - rect.yTop;
+      rect.yBottom = height - rect.yBottom;
+   }
+   else
+   {
+      rect.yTop--;
+      rect.yBottom--;
+      GpiConvert(pHps->hps, CVTC_DEVICE, CVTC_WORLD, 2, (PPOINTL)&rect);
+   }
+
+   WINRECT_FROM_PMRECT(lpps->rcPaint, rect);
+   dprintf(("USER32: BeginPaint %x -> hdc %x (%d,%d)(%d,%d)", hWnd, pHps->hps, lpps->rcPaint.left, lpps->rcPaint.top, lpps->rcPaint.right, lpps->rcPaint.bottom));
+
+   O32_SetLastError(0);
+   return (HDC)pHps->hps;
+}
+
+BOOL WIN32API EndPaint (HWND hwnd, const PAINTSTRUCT_W *pPaint)
+{
+ pDCData pHps;
+
+   dprintf (("USER32: EndPaint(%x)", hwnd));
+
+   if (!pPaint || !pPaint->hdc )
+      return TRUE;
+
+   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+   if (!wnd) goto exit;
+
+   //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+   pHps = (pDCData)GpiQueryDCData((HPS)pPaint->hdc);
+   if (pHps && (pHps->hdcType == TYPE_3)) {
+          WinEndPaint (pHps->hps);
+   }
+   wnd->setSuppressErase(FALSE);
+
+exit:
+   O32_SetLastError(0);
+   return TRUE;
+}
+#else
 HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
 {
@@ -563 +664 @@
                 GpiDestroyRegion(pHps->hps, hrgnOld);
         }
-        //todo restore old clip region for CS_OWNDC windows
         if(hwnd == HWND_DESKTOP || !wnd->isOwnDC()) {
                 ReleaseDC(hwnd, pPaint->hdc);
@@ -587 +687 @@
    return TRUE;
 }
+#endif
 //******************************************************************************
 //******************************************************************************
@@ -710 +811 @@
 // DCX_EXCLUDERGN (complex regions allowed)
 // DCX_INTERSECTRGN (complex regions allowed)
+//
+//TODO: WM_SETREDRAW affects drawingAllowed flag!!
 //******************************************************************************
 HDC WIN32API GetDCEx (HWND hwnd, HRGN hrgn, ULONG flags)
@@ -806 +909 @@
          goto error;
 
-      BytesNeeded = O32_GetRegionData (hrgn, 0, NULL);
-      RgnData = (PRGNDATA_W)_alloca (BytesNeeded);
-      if (RgnData == NULL)
-          goto error;
-      O32_GetRegionData (hrgn, BytesNeeded, RgnData);
-
-      i = RgnData->rdh.nCount;
-      pr = (PRECT)(RgnData->Buffer);
-
       success = TRUE;
       if (flags & DCX_EXCLUDERGN_W)
@@ -820 +914 @@
 #if 0 //CB: todo
          long height;
+
+         BytesNeeded = GetRegionData (hrgn, 0, NULL);
+         RgnData = (PRGNDATA_W)_alloca (BytesNeeded);
+         if (RgnData == NULL)
+                goto error;
+         GetRegionData (hrgn, BytesNeeded, RgnData);
+
+         i = RgnData->rdh.nCount;
+         pr = (PRECT)(RgnData->Buffer);
+
          if (flags & DCX_WINDOW_W)
                 height = wnd->getWindowHeight();
@@ -835 +939 @@
       else //DCX_INTERSECTRGN_W
       {
-        O32_SelectClipRgn(pHps->hps,hrgn); //CB: works so far
+         if(ExtSelectClipRgn(pHps->hps, hrgn, RGN_AND_W) == ERROR_W) {
+                dprintf(("ExtSelectClipRgn failed!!"));
+         }
       }
       if (!success)
@@ -846 +952 @@
    pHps->psType  = psType;
    pHps->hdcType = TYPE_1;
+   //TODO: WM_SETREDRAW affects drawingAllowed flag!!
    GpiSetDrawControl (hps, DCTL_DISPLAY, drawingAllowed ? DCTL_ON : DCTL_OFF);
 
@@ -980 +1087 @@
    if (redraw & RDW_UPDATENOW_W) redraw &= ~RDW_ERASENOW_W;
 
-   if (redraw & RDW_NOERASE_W || !(redraw & (RDW_ERASE_W|RDW_ERASENOW_W))) {
+   if (redraw & RDW_NOERASE_W) {
         wnd->setSuppressErase(TRUE);
    }
    else wnd->setSuppressErase(FALSE);
-
-//   if (redraw & RDW_NOERASE_W)
-//      wnd->setEraseBkgnd (FALSE);
-
-//SvL: Test
-//   if (redraw & RDW_UPDATENOW_W)
-//      wnd->setSuppressErase (FALSE);
-//   else if (redraw & RDW_ERASENOW_W)
-//      wnd->setSuppressErase (FALSE);
 
    if (hrgn)