Changeset 4223 for trunk/src/gdi32
- Timestamp:
- Sep 8, 2000, 8:06:33 PM (25 years ago)
- Location:
- trunk/src/gdi32
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gdi32/objhandle.cpp
r4209 r4223 1 /* $Id: objhandle.cpp,v 1. 3 2000-09-07 22:14:51 phallerExp $ */1 /* $Id: objhandle.cpp,v 1.4 2000-09-08 18:06:32 sandervl Exp $ */ 2 2 /* 3 3 * Win32 Handle Management Code for OS/2 … … 13 13 * 14 14 */ 15 16 /*****************************************************************************17 * Includes *18 *****************************************************************************/19 20 #include <odin.h>21 #include <odinwrap.h>22 #include <os2sel.h>23 24 15 25 16 #include <os2win.h> … … 33 24 34 25 //****************************************************************************** 35 36 /*****************************************************************************37 * Defines *38 *****************************************************************************/39 40 ODINDEBUGCHANNEL(GDI32-REGION)41 42 26 43 27 static ULONG objHandleTable[MAX_OBJECT_HANDLES] = {0}; … … 218 202 //****************************************************************************** 219 203 //****************************************************************************** 220 ODINFUNCTION1(BOOL, DeleteObject, 221 HANDLE, hObj) 222 { 223 if(ObjGetHandleType(hObj) == GDIOBJ_REGION) 224 { 225 OSLibDeleteRegion(ObjGetHandleData(hObj)); 226 ObjFreeHandle(hObj); 227 SetLastError(ERROR_SUCCESS); 228 return OBJ_REGION; 204 BOOL WIN32API DeleteObject(HANDLE hObj) 205 { 206 dprintf(("GDI32: DeleteObject %x", hObj)); 207 if(ObjGetHandleType(hObj) == GDIOBJ_REGION) { 208 OSLibDeleteRegion(ObjGetHandleData(hObj)); 209 ObjFreeHandle(hObj); 210 SetLastError(ERROR_SUCCESS); 211 return OBJ_REGION; 229 212 } 230 213 DIBSection::deleteSection((DWORD)hObj); -
trunk/src/gdi32/region.cpp
r4148 r4223 1 /* $Id: region.cpp,v 1.1 1 2000-09-02 08:31:23 sandervl Exp $ */1 /* $Id: region.cpp,v 1.12 2000-09-08 18:06:33 sandervl Exp $ */ 2 2 3 3 /* … … 1499 1499 } 1500 1500 //****************************************************************************** 1501 //****************************************************************************** 1502 void OSLibDeleteRegion(HANDLE hRegion) 1501 //Needs wrapper as this file includes os2.h!! 1502 //****************************************************************************** 1503 ODINFUNCTIONNODBG1(BOOL, OSLibDeleteRegion, HANDLE, hRegion) 1503 1504 { 1504 1505 if(GpiDestroyRegion(hpsRegion, hRegion) == FALSE) { 1505 1506 dprintf(("WARNING: OSLibDeleteRegion %x; GpiDestroyRegion failed (%x)", hRegion, WinGetLastError(0))); 1506 1507 } 1508 return (0); 1507 1509 } 1508 1510 /***************************************************************************** -
trunk/src/gdi32/region.h
r3705 r4223 1 //$Id: region.h,v 1. 1 2000-06-14 13:17:51sandervl Exp $1 //$Id: region.h,v 1.2 2000-09-08 18:06:33 sandervl Exp $ 2 2 #ifndef __REGION_H__ 3 3 #define __REGION_H__ … … 5 5 BOOL InitRegionSpace(); 6 6 7 voidOSLibDeleteRegion(HANDLE hRegion);7 BOOL WIN32API OSLibDeleteRegion(HANDLE hRegion); 8 8 9 9 #endif //__REGION_H__
Note:
See TracChangeset
for help on using the changeset viewer.