Changeset 4223 for trunk/src/gdi32/objhandle.cpp

Timestamp:

Sep 8, 2000, 8:06:33 PM (25 years ago)

Author:

sandervl

Message:

Fixed FS bug in OSLibDeleteRegion

File:

• trunk/src/gdi32/objhandle.cpp (modified) (4 diffs)

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.3 2000-09-07 22:14:51 phaller Exp $ */
+/* $Id: objhandle.cpp,v 1.4 2000-09-08 18:06:32 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -13 +13 @@
  *
  */
-
-/*****************************************************************************
- * Includes                                                                  *
- *****************************************************************************/
-
-#include <odin.h>
-#include <odinwrap.h>
-#include <os2sel.h>
-
 
 #include <os2win.h>
@@ -33 +24 @@
 
 //******************************************************************************
-
-/*****************************************************************************
- * Defines                                                                   *
- *****************************************************************************/
-
-ODINDEBUGCHANNEL(GDI32-REGION)
-
 
 static ULONG  objHandleTable[MAX_OBJECT_HANDLES] = {0};
@@ -218 +202 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, DeleteObject,
-              HANDLE, hObj)
-{
-  if(ObjGetHandleType(hObj) == GDIOBJ_REGION) 
-  {
-    OSLibDeleteRegion(ObjGetHandleData(hObj));
-    ObjFreeHandle(hObj);
-    SetLastError(ERROR_SUCCESS);
-    return OBJ_REGION;
+BOOL WIN32API DeleteObject(HANDLE hObj)
+{
+  dprintf(("GDI32: DeleteObject %x", hObj));
+  if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
+        OSLibDeleteRegion(ObjGetHandleData(hObj));
+        ObjFreeHandle(hObj);
+        SetLastError(ERROR_SUCCESS);
+        return OBJ_REGION;
   }
   DIBSection::deleteSection((DWORD)hObj);