Changeset 10453 for trunk/src/gdi32/region.cpp

Timestamp:

Feb 12, 2004, 1:44:13 PM (22 years ago)

Author:

sandervl

Message:

PathToRegion failure bugfix + leak fixed; SelectClipPath can fail in printer DCs. Pretend success.

File:

• trunk/src/gdi32/region.cpp (modified) (6 diffs)

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.38 2004-02-10 15:35:39 sandervl Exp $ */
+/* $Id: region.cpp,v 1.39 2004-02-12 12:44:13 sandervl Exp $ */
 
 /*
@@ -2011 +2011 @@
 //Returned region in device coordinates (undocumented behaviour)
 //******************************************************************************
-HRGN WIN32API PathToRegion( HDC  hdc)
-{
+HRGN WIN32API PathToRegion(HDC hdc)
+{
+    HRGN hrgn = 0, hrgnTemp = 0, hrgnwin = 0;
+
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     if(!pHps)
@@ -2020 +2022 @@
         return NULLHANDLE;
     }
-
-    HRGN hrgn, hrgnTemp, hrgnwin;
-
     dprintf(("GDI32: PathToRegion %x", hdc));
 
     hrgnTemp = GpiPathToRegion(pHps->hps, 1, (pHps->polyFillMode == ALTERNATE_W) ? FPATH_ALTERNATE : FPATH_WINDING);
-    if(hrgnTemp == NULLHANDLE)
+    if(hrgnTemp == NULLHANDLE) {
+        dprintf(("GpiPathToRegion failed with %x", WinGetLastError(0)));
         goto error;
+    }
 
     hrgnwin = CreateRectRgn(1, 1, 2, 2);
@@ -2048 +2049 @@
         DeleteObject(hrgnwin);
 
+    if(hrgnTemp)
+        GpiDestroyRegion(pHps->hps, hrgnTemp);
+
     SetLastError(ERROR_INVALID_HANDLE_W);       //todo right error
     return NULLHANDLE;
@@ -2054 +2058 @@
 //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)
@@ -2069 +2072 @@
 
     if(hrgn == NULLHANDLE || ret == FALSE) {
-        dprintf(("GDI32: SelectClipPath FAILED %x %d", hrgn, ret));
+        dprintf(("GDI32: SelectClipPath FAILED %x %d PRETEND success", hrgn, ret));
+        ret = TRUE;
     }
     return ret;