Changeset 4754 for trunk/include/objhandle.h

Timestamp:

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

Author:

sandervl

Message:

updatedobjhandle.h

File:

• trunk/include/objhandle.h (modified) (2 diffs)

trunk/include/objhandle.h

@@ -1 @@
-/* $Id: objhandle.h,v 1.1 2000-06-14 13:19:44 sandervl Exp $ */
+/* $Id: objhandle.h,v 1.2 2000-12-05 13:03:25 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2 (GDI32)
@@ -13 +13 @@
 #define __OBJHANDLE_H__
 
-#define MAX_OBJECT_HANDLES              1024
-#define OBJHANDLE_MAGIC_MASK            0x00FFFFFF
+#define MAX_OBJECT_HANDLES      1024
+#define OBJHANDLE_MAGIC_MASK        0x00FFFFFF
 #define HANDLE_OBJ_ERROR                -1
 
 typedef enum {
+  GDIOBJ_NONE    = 0x00,
   GDIOBJ_REGION  = 0xD1,
   GDIOBJ_BITMAP  = 0xD2,
-  GDIOBJ_BRUSH   = 0xD3, 
-  GDIOBJ_PALETTE = 0xD4, 
+  GDIOBJ_BRUSH   = 0xD3,
+  GDIOBJ_PALETTE = 0xD4,
   GDIOBJ_FONT    = 0xD5,
-  GDIOBJ_ERROR   = 0xFF
+  USEROBJ_MENU   = 0xD6,
+  USEROBJ_ACCEL  = 0xD7
+//...
 } ObjectType;
 
-#define GET_OBJTYPE(a)                  (a >> 24)
-#define MAKE_HANDLE(a)                  (a << 24)
+#define MAKE_HANDLE(a)          (a << 24)
 //...
 
 BOOL  ObjAllocateHandle(HANDLE *hObject, DWORD dwUserData, ObjectType type);
 void  ObjFreeHandle(HANDLE hObject);
-DWORD ObjGetHandleData(HANDLE hObject);
+DWORD ObjGetHandleData(HANDLE hObject, ObjectType type);
 
-#define ObjWinToOS2Region(a)    ObjGetHandleData(a)
+#define ObjWinToOS2Region(a)    ObjGetHandleData(a, GDIOBJ_REGION)
 
 ObjectType ObjGetHandleType(HANDLE hObject);