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

Timestamp:

Jul 15, 2002, 12:02:30 PM (23 years ago)

Author:

sandervl

Message:

Handle management updates

File:

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

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.27 2002-02-05 11:45:46 sandervl Exp $ */
+/* $Id: region.cpp,v 1.28 2002-07-15 10:02:29 sandervl Exp $ */
 
 /*
@@ -396 +396 @@
     if(hrgn)
     {
-        hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+        hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
         if(hrgn == HANDLE_OBJ_ERROR) {
             dprintf(("WARNING: SelectClipRgn: invalid region!", hdc, hrgn1));
@@ -488 +488 @@
    if(hrgn)
    {
-        hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+        hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
         if(hrgn == HANDLE_OBJ_ERROR) {
             dprintf(("WARNING: ExtSelectRgn %x %x %d invalid region handle", hdc, hrgn1, mode));
@@ -637 +637 @@
 #endif
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR || !pHps) {
         dprintf(("WARNING: GetClipRgn %x %x invalid handle", hdc, hrgn1));
@@ -832 +832 @@
    }
 
-   if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+   if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -856 +856 @@
    }
 
-   if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+   if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -891 +891 @@
    }
 
-   if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+   if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -1004 +1004 @@
     }
 
-    if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+    if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -1027 +1027 @@
     hrgn = GpiCreateEllipticRegion(hpsRegion, &rectl);
 
-    if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+    if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -1077 +1077 @@
     hrgn = GpiCreatePolygonRegion(hpsRegion, 1, &polygon, POLYGON_BOUNDARY | flMode);
 
-    if(ObjAllocateHandle(&hrgn, hrgn, GDIOBJ_REGION) == FALSE) {
+    if(ObjAllocateHandle(&hrgn, hrgn, HNDL_REGION) == FALSE) {
         GpiDestroyRegion(hpsRegion, hrgn);
         SetLastError(ERROR_OUTOFMEMORY_W);
@@ -1120 +1120 @@
     }
 
-    hrgnDest = ObjGetHandleData(hrgnDest, GDIOBJ_REGION);
-    hrgnSrc1 = ObjGetHandleData(hrgnSrc1, GDIOBJ_REGION);
-    hrgnSrc2 = ObjGetHandleData(hrgnSrc2, GDIOBJ_REGION);
+    hrgnDest = ObjQueryHandleData(hrgnDest, HNDL_REGION);
+    hrgnSrc1 = ObjQueryHandleData(hrgnSrc1, HNDL_REGION);
+    hrgnSrc2 = ObjQueryHandleData(hrgnSrc2, HNDL_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", hrgn1, hrgn2, hrgn3, combineMode));
@@ -1149 +1149 @@
 #endif
 
-   hrgn1 = ObjGetHandleData(hrgn1, GDIOBJ_REGION);
-   hrgn2 = ObjGetHandleData(hrgn2, GDIOBJ_REGION);
+   hrgn1 = ObjQueryHandleData(hrgn1, HNDL_REGION);
+   hrgn2 = ObjQueryHandleData(hrgn2, HNDL_REGION);
    if(hrgn1 == HANDLE_OBJ_ERROR || hrgn2 == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: EqualRgn %x %x invalid region", hrgnt1, hrgnt2));
@@ -1179 +1179 @@
 #endif
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: SetRectRgn %x (%d,%d)(%d,%d) invalid region handle", hrgn1, left, top, right, bottom));
@@ -1208 +1208 @@
         return 0;
     }
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: GetRegionData %x %d %x; invalid region handle", hrgn1, count, pData));
@@ -1269 +1269 @@
 #endif
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: GetRgnBox %x %x invalid region!", hrgn1, pRect));
@@ -1305 +1305 @@
     pDCData pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: InvertRgn %x %x invalid handle!", hdc, hrgn));
@@ -1356 +1356 @@
 #endif
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: OffsetRgn %x %d %d invalid handle!", hrgn, xOffset, yOffset));
@@ -1405 +1405 @@
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: FrameRgn %x %x %x (%d,%d) invalid handle!", hdc, hrgn, hBrush, width, height));
@@ -1452 +1452 @@
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(!pHps || hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: FillRgn %x %x %x invalid handle!", hdc, hrgn1, hBrush));
@@ -1506 +1506 @@
 #endif
 
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: PtInRgn %x (%d,%d) invalid region!", hrgn1, x, y));
@@ -1544 +1544 @@
         return FALSE;
     }
-    hrgn = ObjGetHandleData(hrgn, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgn, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: RectInRgn %x %x invalid region", hrgn1, pRect));
@@ -1595 +1595 @@
 
     hrgnwin = CreateRectRgn(1, 1, 2, 2);
-    hrgn = ObjGetHandleData(hrgnwin, GDIOBJ_REGION);
+    hrgn = ObjQueryHandleData(hrgnwin, HNDL_REGION);
     if(hrgn == HANDLE_OBJ_ERROR) {
         dprintf(("WARNING: PathToRegion invalid region", hrgnwin));