Changeset 10442 for trunk/src

Timestamp:

Feb 10, 2004, 4:35:39 PM (22 years ago)

Author:

sandervl

Message:

Wrong GdiCopyClipRgn return value; Implemented SelectClipPath

Location:

trunk/src/gdi32

Files:

• devcontext.cpp (modified) (3 diffs)
• gdi32.cpp (modified) (2 diffs)
• region.cpp (modified) (5 diffs)

trunk/src/gdi32/devcontext.cpp

@@ -1 @@
-/* $Id: devcontext.cpp,v 1.1 2004-01-11 11:42:09 sandervl Exp $ */
+/* $Id: devcontext.cpp,v 1.2 2004-02-10 15:35:38 sandervl Exp $ */
 
 /*
@@ -364 +364 @@
     }
     //overwrite the current clip region with the copy
+    dprintf2(("New win32 clip region %x", hClipRgn));
     pHps->hrgnWin32Clip = hClipRgn;
     return id;
@@ -393 +394 @@
         // Activate previous clip region
         GdiCombineVisRgnClipRgn(pHps, pHps->hrgnWin32Clip, RGN_AND);
+
+        dprintf2(("New win32 clip region %x", pHps->hrgnWin32Clip));
     }
     return ret;

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.92 2004-01-30 22:19:59 bird Exp $ */
+/* $Id: gdi32.cpp,v 1.93 2004-02-10 15:35:38 sandervl Exp $ */
 
 /*
@@ -831 +831 @@
 }
 //******************************************************************************
-//Selects the current path as a clipping region for a device context, combining
-//any existing clipping region by using the specified mode
-//TODO: Can be emulated with SelectClipRegion??
-//******************************************************************************
-BOOL WIN32API SelectClipPath(HDC hdc, int iMode)
-{
-  dprintf(("GDI32: SelectClipPath, not implemented!(TRUE)\n"));
-  return(TRUE);
-}
-//******************************************************************************
 //TODO: Sets the color adjustment values for a device context. (used to adjust
 //      the input color of the src bitmap for calls of StretchBlt & StretchDIBits

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.37 2004-01-30 22:20:00 bird Exp $ */
+/* $Id: region.cpp,v 1.38 2004-02-10 15:35:39 sandervl Exp $ */
 
 /*
@@ -721 +721 @@
         dprintf(("ERROR: GdiCopyClipRgn: GpiCreateRegion failed!!"));
         DebugInt3();
-        return 0;
+        return NULLHANDLE;
     }
     lComplexity = GpiCombineRegion(pHps->hps, hrgnNewClip, pHps->hrgnWin32Clip, NULLHANDLE, CRGN_COPY);
     if (lComplexity != RGN_ERROR)
     {
-        return TRUE;
-    }
+        return hrgnNewClip;
+    }
+    dprintf(("GpiCombineRegion %x %x %x failed!!", pHps->hps, hrgnNewClip, pHps->hrgnWin32Clip));
     DebugInt3();
-    return FALSE;
+    return NULLHANDLE;
 }
 //******************************************************************************
@@ -808 +809 @@
         if(!interpretRegionAs(pHps, 0, hrgn, AS_DEVICE) )
         {
+            dprintf(("interpretRegionAs failed!!"));
             return ERROR_W;
         }
@@ -857 +859 @@
         }
    }
+   dprintf(("GpiCombineRegion failed %x %x %x %d", hrgnCurrent, hrgnSrc1, hrgnSrc2, lMode));
    GpiDestroyRegion(pHps->hps, hrgnCurrent); //delete newly created region
 
@@ -2049 +2052 @@
 }
 //******************************************************************************
+//Selects the current path as a clipping region for a device context, combining
+//any existing clipping region by using the specified mode
+//TODO: Can be emulated with SelectClipRegion??
+//******************************************************************************
+BOOL WIN32API SelectClipPath(HDC hdc, int iMode)
+{
+    HRGN hrgn;
+    BOOL ret = FALSE;
+
+    hrgn = PathToRegion(hdc);
+    if(hrgn) 
+    {
+        ret = ExtSelectClipRgn(hdc, hrgn, iMode) != ERROR_W;
+        DeleteObject(hrgn);
+    }
+
+    if(hrgn == NULLHANDLE || ret == FALSE) {
+        dprintf(("GDI32: SelectClipPath FAILED %x %d", hrgn, ret));
+    }
+    return ret;
+}
+//******************************************************************************
 //Needs wrapper as this file includes os2.h!!
 //******************************************************************************