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

Timestamp:

Dec 5, 2000, 2:04:07 PM (25 years ago)

Author:

sandervl

Message:

handle management update

File:

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

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.17 2000-11-15 13:56:46 sandervl Exp $ */
+/* $Id: region.cpp,v 1.18 2000-12-05 13:04:07 sandervl Exp $ */
 
 /*
@@ -378 +378 @@
     if(hrgn)
     {
-        hrgn = ObjGetHandleData(hrgn);
+        hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
         if(hrgn == HANDLE_OBJ_ERROR) {
             dprintf(("WARNING: SelectClipRgn: invalid region!", hdc, hrgn));
@@ -414 +414 @@
             //SvL: Must check if origin changed here. Sometimes happens when
             //     window looses focus. (don't know why....)
-            if(pHps->isClient) 
+            if(pHps->isClient)
                 selectClientArea(pHps);
             return lComplexity;
@@ -467 +467 @@
    if(hrgn)
    {
-        hrgn = ObjGetHandleData(hrgn);
+        hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
         if(hrgn == HANDLE_OBJ_ERROR) {
             dprintf(("WARNING: ExtSelectRgn %x %x %d invalid region handle", hdc, hrgn, mode));
@@ -527 +527 @@
         //SvL: Must check if origin changed here. Sometimes happens when
         //     window looses focus. (don't know why....)
-        if(pHps->isClient) 
+        if(pHps->isClient)
             selectClientArea(pHps);
 
@@ -614 +614 @@
    HRGN       hrgnClip = NULL, hrgnTemp;
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR || !pHps) {
         dprintf(("WARNING: GetClipRgn %x %x invalid handle", hdc, hrgn));
@@ -1079 +1079 @@
     }
 
-    hrgnDest = ObjGetHandleData(hrgnDest);
-    hrgnSrc1 = ObjGetHandleData(hrgnSrc1);
-    hrgnSrc2 = ObjGetHandleData(hrgnSrc2);
+    hrgnDest = ObjGetHandleData(hrgnDest, GDIOBJ_REGION);
+    hrgnSrc1 = ObjGetHandleData(hrgnSrc1, GDIOBJ_REGION);
+    hrgnSrc2 = ObjGetHandleData(hrgnSrc2, GDIOBJ_REGION);
     if(hrgnDest == HANDLE_OBJ_ERROR || hrgnSrc1 == HANDLE_OBJ_ERROR  || (hrgnSrc2 == HANDLE_OBJ_ERROR && combineMode != RGN_COPY_W)) {
         dprintf(("WARNING: CombineRgn %x %x %x %d invalid region", hrgnDest, hrgnSrc1, hrgnSrc2, combineMode));
@@ -1103 +1103 @@
    LONG lEquality;
 
-   hrgn1 = ObjGetHandleData(hrgn1);
-   hrgn2 = ObjGetHandleData(hrgn2);
+   hrgn1 = ObjGetHandleData(hrgn1, GDIOBJ_REGION);
+   hrgn2 = ObjGetHandleData(hrgn2, GDIOBJ_REGION);
    if(hrgn1 == HANDLE_OBJ_ERROR || hrgn2 == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: EqualRgn %x %x invalid region", hrgn1, hrgn2));
@@ -1130 +1130 @@
    BOOL    result = FALSE;
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: SetRectRgn %x (%d,%d)(%d,%d) invalid region handle", hrgn, left, top, right, bottom));
@@ -1154 +1154 @@
         return 0;
     }
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: GetRegionData %x %d %x; invalid region handle", hrgn, count, pData));
@@ -1212 +1212 @@
    LONG      lComplexity;
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: GetRgnBox %x %x invalid region!", hrgn, pRect));
@@ -1246 +1246 @@
     pDCData pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: InvertRgn %x %x invalid handle!", hdc, hrgn));
@@ -1294 +1294 @@
    LONG   lComplexity;
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: OffsetRgn %x %d %d invalid handle!", hrgn, xOffset, yOffset));
@@ -1340 +1340 @@
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: FrameRgn %x %x %x (%d,%d) invalid handle!", hdc, hrgn, hBrush, width, height));
@@ -1384 +1384 @@
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: FillRgn %x %x %x invalid handle!", hdc, hrgn, hBrush));
@@ -1435 +1435 @@
    LONG      lInside;
 
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: PtInRgn %x (%d,%d) invalid region!", hrgn, x, y));
@@ -1470 +1470 @@
         return FALSE;
     }
-    hrgn = ObjGetHandleData(hrgn);
+    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: RectInRgn %x %x invalid region", hrgn, pRect));
@@ -1521 +1521 @@
 
     hrgnwin = CreateRectRgn(1, 1, 2, 2);
-    hrgn = ObjGetHandleData(hrgnwin);
+    hrgn = ObjGetHandleData(hrgnwin, GDIOBJ_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: PathToRegion invalid region", hrgnwin));