[GDI32API]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Tue, 27 Jul 2010 16:24:31 +0000 (16:24 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Tue, 27 Jul 2010 16:24:31 +0000 (16:24 +0000)
- fix some 64 bit warnings

svn path=/trunk/; revision=48314

rostests/apitests/gdi32api/tests/GetObject.c
rostests/apitests/gdi32api/tests/GetStockObject.c

index ae5d556..08b93d1 100644 (file)
@@ -78,7 +78,7 @@ Test_Bitmap(PTESTINFO pti)
        RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), NULL) == sizeof(BITMAP));
        RTEST(GetObjectA(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP));
        RTEST(GetObjectA(hBitmap, 0, NULL) == sizeof(BITMAP));
-       RTEST(GetObjectA((HANDLE)((UINT)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP));
+       RTEST(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP));
        RTEST(GetObjectA(hBitmap, 5, NULL) == sizeof(BITMAP));
        RTEST(GetObjectA(hBitmap, -5, NULL) == sizeof(BITMAP));
        RTEST(GetObjectA(hBitmap, 0, Buffer) == 0);
@@ -416,7 +416,7 @@ Test_MetaDC(PTESTINFO pti)
 
        hMetaDC = CreateMetaFile(NULL);
        if(!hMetaDC) return FALSE;
-       if(((UINT)hMetaDC & GDI_HANDLE_TYPE_MASK) != GDI_OBJECT_TYPE_METADC) return FALSE;
+       if(((UINT_PTR)hMetaDC & GDI_HANDLE_TYPE_MASK) != GDI_OBJECT_TYPE_METADC) return FALSE;
 
        SetLastError(ERROR_SUCCESS);
        RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 0, NULL) == 0);
index 02ceccf..afcbae8 100644 (file)
@@ -12,7 +12,7 @@ Test_GetStockObject(PTESTINFO pti)
        RTEST(GetLastError() == ERROR_SUCCESS);
 
        /* Test for the stock bit */
-       RTEST((UINT)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK);
+       RTEST((UINT_PTR)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK);
 
        /* Test for correct types */
        RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 0 */