commit 613ead7f0fae629b1e1c33c6e5cf2f2984295387
author Alexandre Julliard <julliard@winehq.org> Fri Oct 04 00:27:10 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 04 00:27:10 2002 +0000
tree 9ff943d7a58a5b752e6a432e0c9e01528be4599b
parent dd0c4c16ae5a000bd1023233ef9ed489b6b8a01d

Fixed some handle conversions in prevision of void* handles.

objects/gdiobj.c

diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 8c1e140..caac258 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -726,7 +726,7 @@
 {
     HGDIOBJ new_handle;
 
-    if (handle & 2)  /* GDI heap handle */
+    if ((UINT_PTR)handle & 2)  /* GDI heap handle */
     {
         LOCAL_Unlock( GDI_HeapSel, handle );
         if ((new_handle = LOCAL_ReAlloc( GDI_HeapSel, handle, size, LMEM_MOVEABLE )))
@@ -764,7 +764,7 @@
 
     object->wMagic = 0;  /* Mark it as invalid */
     object->funcs  = NULL;
-    if (handle & 2)  /* GDI heap handle */
+    if ((UINT_PTR)handle & 2)  /* GDI heap handle */
     {
         LOCAL_Unlock( GDI_HeapSel, handle );
         LOCAL_Free( GDI_HeapSel, handle );
@@ -798,7 +798,7 @@
 
     _EnterSysLevel( &GDI_level );
 
-    if (handle & 2)  /* GDI heap handle */
+    if ((UINT_PTR)handle & 2)  /* GDI heap handle */
     {
         ptr = (GDIOBJHDR *)LOCAL_Lock( GDI_HeapSel, handle );
         if (ptr)
@@ -814,7 +814,7 @@
     }
     else  /* large heap handle */
     {
-        int i = (handle >> 2) - FIRST_LARGE_HANDLE;
+        int i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE;
         if (i >= 0 && i < MAX_LARGE_HANDLES)
         {
             ptr = large_handles[i];
@@ -840,7 +840,7 @@
  */
 void GDI_ReleaseObj( HGDIOBJ handle )
 {
-    if (handle & 2) LOCAL_Unlock( GDI_HeapSel, handle );
+    if ((UINT_PTR)handle & 2) LOCAL_Unlock( GDI_HeapSel, handle );
     TRACE_SEC( handle, "leave" );
     _LeaveSysLevel( &GDI_level );
 }