Changeset 923 for trunk/src/user32/new/dc.cpp

Timestamp:

Sep 13, 1999, 6:13:46 PM (26 years ago)

Author:

dengert

Message:

some more DC related functions

File:

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

trunk/src/user32/new/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.3 1999-09-12 15:44:20 dengert Exp $ */
+/* $Id: dc.cpp,v 1.4 1999-09-13 16:13:46 dengert Exp $ */
 
 /*
@@ -268 +268 @@
 ULONG   OPEN32API _O32_GetRegionData (HRGN hrgn, ULONG count, PRGNDATA_W pData);
 BOOL    OPEN32API _O32_DeleteObject (LHANDLE hgdiobj);
+int     OPEN32API _O32_ReleaseDC (HWND hwnd, HDC hdc);
+
+#ifndef DEVESC_SETPS
+  #define DEVESC_SETPS  49149L
+#endif
 
 #define FLOAT_TO_FIXED(x) ((FIXED) ((x) * 65536.0))
@@ -649 +654 @@
 }
 
+void releaseOwnDC (HDC hps)
+{
+   pDCData pHps = (pDCData)GpiQueryDCData ((HPS)hps);
+
+   if (pHps) {
+      if (pHps->hrgnHDC)
+         GpiDestroyRegion (pHps->hps, pHps->hrgnHDC);
+
+      GpiSetBitmap (pHps->hps, NULL);
+      _O32_DeleteObject (pHps->nullBitmapHandle);
+      GpiDestroyPS(pHps->hps);
+
+      if (pHps->hdc)
+         DevCloseDC(pHps->hdc);
+
+// how can a memory chunk allocated by GpiAllocateDCData freed by delete?
+//      delete pHps;
+   }
+}
+
 HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
 {
@@ -916 +941 @@
       PRECTL pr;
       int i;
+      LONG height = OSLibQueryScreenHeight();
 
       if (!hrgn)
@@ -931 +957 @@
       success = TRUE;
       if (flags & DCX_EXCLUDERGN_W)
-         for (; (i > 0) && success; i--, pr++)
+         for (; (i > 0) && success; i--, pr++) {
+            LONG y = pr->yBottom;
+
+            pr->yBottom = height - pr->yTop;
+            pr->yTop    = height - y;
             success &= GpiExcludeClipRectangle (pHps->hps, pr);
+         }
       else
-         for (; (i > 0) && success; i--, pr++)
+         for (; (i > 0) && success; i--, pr++) {
+            LONG y = pr->yBottom;
+
+            pr->yBottom = height - pr->yTop;
+            pr->yTop    = height - y;
             success &= GpiIntersectClipRectangle (pHps->hps, pr);
+         }
       if (!success)
          goto error;
@@ -978 +1014 @@
 }
 
-
+HDC WIN32API GetWindowDC (HWND hwnd)
+{
+  return GetDCEx (hwnd, NULL, DCX_WINDOW_W);
+}
+
+int WIN32API ReleaseDC (HWND hwnd, HDC hdc)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL isOwnDC = FALSE;
+   int rc;
+
+   if (hwnd)
+   {
+      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+      isOwnDC = wnd->isOwnDC();
+   }
+   if (isOwnDC)
+      rc = TRUE;
+   else
+      rc = _O32_ReleaseDC (0, hdc);
+
+   SetFS(sel);
+   return (rc);
+}
 //******************************************************************************
 //******************************************************************************