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

Timestamp:

Feb 14, 2000, 6:30:11 PM (26 years ago)

Author:

cbratschi

Message:

merged combobox with core 20000212

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.46 2000-02-09 15:56:16 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.47 2000-02-14 17:30:11 cbratschi Exp $ */
 
 /*
@@ -549 +549 @@
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
    if(!lpps || !wnd) {
-        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
-        O32_SetLastError (ERROR_INVALID_PARAMETER);
-        return (HDC)0;
+        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+        O32_SetLastError (ERROR_INVALID_PARAMETER);
+        return (HDC)0;
    }
    HWND hwndClient = wnd->getOS2WindowHandle();
@@ -563 +563 @@
                 if (!pHps)
                 {
-                        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+                        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
                         O32_SetLastError (ERROR_INVALID_PARAMETER);
                         return (HDC)NULLHANDLE;
                 }
-                hpsPaint = hPS_ownDC;
+                hpsPaint = hPS_ownDC;
         }
    }
    if(!hpsPaint) {
-        hpsPaint = GetDCEx(hwnd, 0, DCX_CACHE_W);
+        hpsPaint = GetDCEx(hwnd, 0, DCX_CACHE_W);
         pHps = (pDCData)GpiQueryDCData(hpsPaint);
         if (!pHps)
         {
-                dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+                dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
                 O32_SetLastError (ERROR_INVALID_PARAMETER);
                 return (HDC)NULLHANDLE;
         }
-   }  
+   }
 
 #if 0
@@ -601 +601 @@
    lComplexity = WinQueryUpdateRegion(hwndClient, hrgnUpdate);
    if(lComplexity == RGN_ERROR) {
-        dprintf (("USER32: BeginPaint update region error!!"));
+        dprintf (("USER32: BeginPaint update region error!!"));
         O32_SetLastError (ERROR_INVALID_PARAMETER);
-        return 0;
+        return 0;
    }
    WinQueryUpdateRect(hwndClient, &rectl);
 
-   if(lComplexity != RGN_NULL) { 
-        WinValidateRegion(hwndClient, hrgnUpdate, FALSE);
-
-        GpiSetClipRegion(pHps->hps, hrgnUpdate, &hrgnOld);
-        //save old clip region (restored for CS_OWNDC windows in EndPaint)
-        wnd->SetClipRegion(hrgnOld);
+   if(lComplexity != RGN_NULL) {
+        WinValidateRegion(hwndClient, hrgnUpdate, FALSE);
+
+        GpiSetClipRegion(pHps->hps, hrgnUpdate, &hrgnOld);
+        //save old clip region (restored for CS_OWNDC windows in EndPaint)
+        wnd->SetClipRegion(hrgnOld);
    }
 
@@ -621 +621 @@
    lpps->fErase = wnd->isPSErase(); //correct ??
    lpps->hdc    = (HDC)pHps->hps;
-   
+
    if(lComplexity != RGN_NULL) {
-        long height  = wnd->getClientHeight();
-        lpps->rcPaint.top    = height - rectl.yTop;
-        lpps->rcPaint.left   = rectl.xLeft;
-        lpps->rcPaint.bottom = height - rectl.yBottom;
-        lpps->rcPaint.right  = rectl.xRight;
+        long height  = wnd->getClientHeight();
+        lpps->rcPaint.top    = height - rectl.yTop;
+        lpps->rcPaint.left   = rectl.xLeft;
+        lpps->rcPaint.bottom = height - rectl.yBottom;
+        lpps->rcPaint.right  = rectl.xRight;
    }
    else {
-        lpps->rcPaint.bottom = lpps->rcPaint.top = 0;
-        lpps->rcPaint.right = lpps->rcPaint.left = 0;
-   }
-   
+        lpps->rcPaint.bottom = lpps->rcPaint.top = 0;
+        lpps->rcPaint.right = lpps->rcPaint.left = 0;
+   }
+
    HideCaret(hwnd);
 
@@ -660 +660 @@
    if (pHps && (pHps->hdcType == TYPE_3))
    {
-        GpiSetClipRegion(pHps->hps, NULLHANDLE, &hrgnOld);
-        if(hrgnOld) {
-                GpiDestroyRegion(pHps->hps, hrgnOld);
-        }
-        if(hwnd == HWND_DESKTOP || !wnd->isOwnDC()) {
-                ReleaseDC(hwnd, pPaint->hdc);
-        }
-        else 
-        if(wnd->GetClipRegion()) {
-                //TODO: What else do we need to restore here???
-                GpiSetClipRegion(pHps->hps, wnd->GetClipRegion(), &hrgnOld);
-                wnd->SetClipRegion(0);
-                pHps->hdcType = TYPE_1;
-        }
-
-////    WinEndPaint (pHps->hps);
+        GpiSetClipRegion(pHps->hps, NULLHANDLE, &hrgnOld);
+        if(hrgnOld) {
+                GpiDestroyRegion(pHps->hps, hrgnOld);
+        }
+        if(hwnd == HWND_DESKTOP || !wnd->isOwnDC()) {
+                ReleaseDC(hwnd, pPaint->hdc);
+        }
+        else
+        if(wnd->GetClipRegion()) {
+                //TODO: What else do we need to restore here???
+                GpiSetClipRegion(pHps->hps, wnd->GetClipRegion(), &hrgnOld);
+                wnd->SetClipRegion(0);
+                pHps->hdcType = TYPE_1;
+        }
+
+////    WinEndPaint (pHps->hps);
    }
    else {
-        dprintf(("EndPaint: wrong hdc %x!!", pPaint->hdc));
+        dprintf(("EndPaint: wrong hdc %x!!", pPaint->hdc));
    }
    wnd->setSuppressErase(FALSE);
@@ -714 +714 @@
    if (updateRegionExists)
    {
-        //CB: for PM empty rect is valid
-        if ((rectl.xLeft == rectl.xRight) || (rectl.yTop == rectl.yBottom)) {
-                if(pRect) {
-                        pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
-                }
-                return FALSE;
-        }
+        //CB: for PM empty rect is valid
+        if ((rectl.xLeft == rectl.xRight) || (rectl.yTop == rectl.yBottom)) {
+                if(pRect) {
+                        pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
+                }
+                return FALSE;
+        }
 #if 0
-        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
 //      if (wnd->isOwnDC() && wnd->getOwnDC())
-        if (wnd->isOwnDC())
-        {
-                pDCData pHps = NULL;
-                pHps = (pDCData)GpiQueryDCData(wnd->getOwnDC());
-                if (!pHps)
-                {
-                        O32_SetLastError (ERROR_INVALID_HANDLE);
-                        return FALSE;
-                }
-                GpiConvert (pHps->hps, CVTC_DEVICE, CVTC_WORLD, 2, (PPOINTL)&rectl);
-        }
-        else
-        {
+        if (wnd->isOwnDC())
+        {
+                pDCData pHps = NULL;
+                pHps = (pDCData)GpiQueryDCData(wnd->getOwnDC());
+                if (!pHps)
+                {
+                        O32_SetLastError (ERROR_INVALID_HANDLE);
+                        return FALSE;
+                }
+                GpiConvert (pHps->hps, CVTC_DEVICE, CVTC_WORLD, 2, (PPOINTL)&rectl);
+        }
+        else
+        {
 #endif
-                long height   = wnd->getClientHeight();
-                rectl.yTop    = height - rectl.yTop;
-                rectl.yBottom = height - rectl.yBottom;
-//////////              }
-
-        if (pRect)
-                WINRECT_FROM_PMRECT (*pRect, rectl);
-
-        if (erase)
-                sendEraseBkgnd (wnd);
+                long height   = wnd->getClientHeight();
+                rectl.yTop    = height - rectl.yTop;
+                rectl.yBottom = height - rectl.yBottom;
+//////////              }
+
+        if (pRect)
+                WINRECT_FROM_PMRECT (*pRect, rectl);
+
+        if (erase)
+                sendEraseBkgnd (wnd);
    }
    else
    {
-        if(pRect) {
-                pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
-        }
+        if(pRect) {
+                pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
+        }
    }
 
@@ -780 +780 @@
      if ((rectl.xLeft == rectl.xRight) || (rectl.yTop == rectl.yBottom)) return FALSE;
      mapOS2ToWin32Rect(hwnd,(PRECTLOS2)&rectl,pRect);
-   } 
+   }
    else
        pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
@@ -827 +827 @@
 
    if(hwnd == 0) {
-        dprintf(("error: GetDCEx window %x not found", hwnd));
-        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
+        dprintf(("error: GetDCEx window %x not found", hwnd));
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
    }
 
@@ -867 +867 @@
 
          pHps->hdcType = TYPE_1;
-         dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x hdc %x", hwnd, hrgn, flags, wnd, hps));
+         dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x hdc %x", hwnd, hrgn, flags, wnd, hps));
          return (HDC)hps;
       }
@@ -913 +913 @@
       {
 #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);
+         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();
-         else   height = wnd->getClientHeight();
+                height = wnd->getWindowHeight();
+         else   height = wnd->getClientHeight();
 
          for (; (i > 0) && success; i--, pr++) {
@@ -936 +936 @@
          }
 #endif
-      } 
+      }
       else //DCX_INTERSECTRGN_W
       {
          if(ExtSelectClipRgn(pHps->hps, hrgn, RGN_AND_W) == ERROR_W) {
-                dprintf(("ExtSelectClipRgn failed!!"));
-         }
+                dprintf(("ExtSelectClipRgn failed!!"));
+         }
       }
       if (!success)
@@ -1036 +1036 @@
 
    if(pRect) {
-          dprintf(("RedrawWindow %x (%d,%d)(%d,%d) %x %x", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom, hrgn, redraw));
+          dprintf(("RedrawWindow %x (%d,%d)(%d,%d) %x %x", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom, hrgn, redraw));
    }
    else   dprintf(("RedrawWindow %x %x %x %x", hwnd, pRect, hrgn, redraw));
@@ -1090 +1090 @@
    //     deciding to skip erase?
    if(redraw & RDW_NOERASE_W || ((redraw & (RDW_INVALIDATE_W|RDW_ERASE_W|RDW_ERASENOW_W)) == RDW_INVALIDATE_W)) {
-        wnd->setSuppressErase(TRUE);
-   }
-   else wnd->setSuppressErase(FALSE);
+        wnd->setSuppressErase(TRUE);
+   }
+   else wnd->setSuppressErase(FALSE);
 
    if (hrgn)
@@ -1160 +1160 @@
    if(WinQueryUpdateRect(hwnd, NULL))
    {
-        if(redraw & RDW_UPDATENOW_W) {
-                wnd->MsgPaint (0, FALSE);
-        }
-        else 
-        if((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
-                wnd->setEraseBkgnd (FALSE, !sendEraseBkgnd (wnd));
+        if(redraw & RDW_UPDATENOW_W) {
+                wnd->MsgPaint (0, FALSE);
+        }
+        else
+        if((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
+                wnd->setEraseBkgnd (FALSE, !sendEraseBkgnd (wnd));
    }
    else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
    {
-        if(redraw & RDW_UPDATENOW_W)
-                wnd->MsgPaint (0, FALSE);
-        else    PostMessageA(hwnd, WINWM_PAINT, 0, 0);
+        if(redraw & RDW_UPDATENOW_W)
+                wnd->MsgPaint (0, FALSE);
+        else    PostMessageA(hwnd, WINWM_PAINT, 0, 0);
    }
 
@@ -1200 +1200 @@
 
    if(!wnd) {
-        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return FALSE;
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
    }