Changeset 8872 for trunk/src

Timestamp:

Jul 15, 2002, 12:19:16 PM (23 years ago)

Author:

sandervl

Message:

handle management updates for GDI32

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• menu.cpp (modified) (4 diffs)
• syscolor.cpp (modified) (4 diffs)
• user32dbg.def (modified) (2 diffs)
• winicon.cpp (modified) (13 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.72 2002-04-30 14:54:05 sandervl Exp $
+; $Id: USER32.DEF,v 1.73 2002-07-15 10:19:16 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -701 +701 @@
     _BITMAP_GetWidthBytes@8                                      @2024 NONAME
     _selectClientArea@4                                          @2025 NONAME
-    _IsSystemBrush@4                                             @2026 NONAME
-    _IsSystemPen@4                                               @2027 NONAME
 
     _CreateFakeWindowEx@8                                        @2028 NONAME

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.48 2002-07-12 19:49:21 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.49 2002-07-15 10:16:28 sandervl Exp $*/
 /*
  * Menu functions
@@ -313 +313 @@
 {
 #ifdef __WIN32OS2__
-    if(ObjGetHandleType(hMenu) == USEROBJ_MENU) {
+    if(ObjQueryHandleType(hMenu) == HNDL_MENU) {
         POPUPMENU *menu;
 
-        menu = (POPUPMENU *)ObjGetHandleData(hMenu, USEROBJ_MENU);
+        menu = (POPUPMENU *)ObjQueryHandleData(hMenu, HNDL_MENU);
         return menu;
     }
@@ -4004 +4004 @@
 #ifdef __WIN32OS2__
     if (!(menu = (LPPOPUPMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
-    if(ObjAllocateHandle(&hMenu, (DWORD)menu, USEROBJ_MENU) == FALSE) return 0;
+    if(ObjAllocateHandle(&hMenu, (DWORD)menu, HNDL_MENU) == FALSE) return 0;
 #else
     if (!(hMenu = (HMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
@@ -4061 +4061 @@
 #ifdef __WIN32OS2__
             HeapFree(GetProcessHeap(),0,(LPVOID)lppop);
-            ObjFreeHandle(hMenu);
+            ObjDeleteHandle(hMenu, HNDL_MENU);
 #else
             HeapFree(GetProcessHeap(),0,(LPVOID)hMenu);

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.31 2001-11-30 13:53:50 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.32 2002-07-15 10:16:28 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 #include "options.h"
 #include "oslibwin.h"
+#include <objhandle.h>
 
 #define DBG_LOCALLOG    DBG_syscolor
@@ -130 +131 @@
     if (SysColorPens[index]) DeleteObject(SysColorPens[index]);
     SysColorPens[index] = CreatePen(PS_SOLID, 1, color);
+
+    // Application can't delete system pens
+    ObjSetHandleFlag(SysColorPens[index], OBJHANDLE_FLAG_NODELETE, TRUE);
+
     /* set brush */
     if (SysColorBrushes[index]) DeleteObject(SysColorBrushes[index]);
     SysColorBrushes[index] = CreateSolidBrush(color);
+
+    // Application can't delete system brushes
+    ObjSetHandleFlag(SysColorBrushes[index], OBJHANDLE_FLAG_NODELETE, TRUE);
 }
 //******************************************************************************
@@ -356 +364 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API IsSystemPen(HPEN hPen)
-{
-    for(int i=0;i<NUM_SYS_COLORS;i++) {
-        if(SysColorPens[i] == hPen) {
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API IsSystemBrush(HBRUSH hBrush)
-{
-    for(int i=0;i<NUM_SYS_COLORS;i++) {
-        if(SysColorBrushes[i] == hBrush) {
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-//******************************************************************************
-//******************************************************************************

trunk/src/user32/user32dbg.def

@@ -1 @@
-; $Id: user32dbg.def,v 1.5 2002-04-30 14:54:06 sandervl Exp $
+; $Id: user32dbg.def,v 1.6 2002-07-15 10:19:16 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -700 +700 @@
     _BITMAP_GetWidthBytes@8                                      @2024 NONAME
     _selectClientArea@4                                          @2025 NONAME
-    _IsSystemBrush@4                                             @2026 NONAME
-    _IsSystemPen@4                                               @2027 NONAME
 
     _CreateFakeWindowEx@8                                        @2028 NONAME

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.34 2002-05-31 09:54:05 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.35 2002-07-15 10:16:29 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -233 +233 @@
 #ifdef __WIN32OS2__
         HICON hIcon;
-        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, HNDL_CURSORICON) == FALSE) {
             GlobalFree(hObj);
             dprintf(("ERROR: CreateIconIndirect ObjAllocateHandle failed!!"));
@@ -267 +267 @@
     CURSORICONINFO  *ciconinfo;
 
-    hIcon = ObjGetHandleData(hIcon, USEROBJ_CURSORICON);
+    hIcon = ObjQueryHandleData(hIcon, HNDL_CURSORICON);
     if(hIcon == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));
@@ -289 +289 @@
 
 #ifdef __WIN32OS2__
-    hIcon = ObjGetHandleData(hIcon, USEROBJ_CURSORICON);
+    hIcon = ObjQueryHandleData(hIcon, HNDL_CURSORICON);
     if(hIcon == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));
@@ -426 +426 @@
 
 #ifdef __WIN32OS2__
-    hCursor = ObjGetHandleData(hCursor, USEROBJ_CURSORICON);
+    hCursor = ObjQueryHandleData(hCursor, HNDL_CURSORICON);
     if(hCursor == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));
@@ -566 +566 @@
 #ifdef __WIN32OS2__
     HICON hIcon;
-    if(ObjAllocateHandle(&hIcon, (DWORD)handle, USEROBJ_CURSORICON) == FALSE) {
+    if(ObjAllocateHandle(&hIcon, (DWORD)handle, HNDL_CURSORICON) == FALSE) {
         GlobalFree(handle);
         dprintf(("ERROR: CreateCursorIconIndirect ObjAllocateHandle failed!!"));
@@ -628 +628 @@
 
             HICON hIcon;
-            if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+            if(ObjAllocateHandle(&hIcon, (DWORD)hObj, HNDL_CURSORICON) == FALSE) {
                GlobalUnlock( hObj );
                GlobalFree(hObj);
@@ -1171 +1171 @@
     if(hObj) {
         HICON hIcon;
-        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, HNDL_CURSORICON) == FALSE) {
             GlobalFree(hObj);
             dprintf(("ERROR: CURSORICON_Load ObjAllocateHandle failed!!"));
@@ -1203 +1203 @@
 
 #ifdef __WIN32OS2__
-    HICON hIcon = ObjGetHandleData(handle, USEROBJ_CURSORICON);
+    HICON hIcon = ObjQueryHandleData(handle, HNDL_CURSORICON);
     if(hIcon == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));
@@ -1234 +1234 @@
     GlobalUnlock(hIcon);
     retv = GlobalFree( hIcon );
-    ObjFreeHandle(handle);
+    ObjDeleteHandle(handle, HNDL_CURSORICON);
 
     return (flags & CID_RESOURCE)? retv : TRUE;
@@ -1254 +1254 @@
     HGLOBAL hNew;
 
-    handle = ObjGetHandleData(handle, USEROBJ_CURSORICON);
+    handle = ObjQueryHandleData(handle, HNDL_CURSORICON);
     if(handle == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));
@@ -1277 +1277 @@
 #ifdef __WIN32OS2__
     HICON hIcon;
-    if(ObjAllocateHandle(&hIcon, (DWORD)hNew, USEROBJ_CURSORICON) == FALSE) {
+    if(ObjAllocateHandle(&hIcon, (DWORD)hNew, HNDL_CURSORICON) == FALSE) {
         GlobalFree(hNew);
         dprintf(("ERROR: CURSORICON_Copy ObjAllocateHandle failed!!"));
@@ -1317 +1317 @@
 
 #ifdef __WIN32OS2__
-    HICON hIcon = ObjGetHandleData(Handle, USEROBJ_CURSORICON);
+    HICON hIcon = ObjQueryHandleData(Handle, HNDL_CURSORICON);
     if(hIcon == -1) {
         dprintf(("ERROR: Invalid cursor/icon!"));