Changeset 8872 for trunk/src/user32/winicon.cpp

Timestamp:

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

Author:

sandervl

Message:

handle management updates for GDI32

File:

• trunk/src/user32/winicon.cpp (modified) (13 diffs)

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!"));