Author: tkreuzer
Date: Tue Jul 27 16:24:31 2010
New Revision: 48314
URL:
http://svn.reactos.org/svn/reactos?rev=48314&view=rev
Log:
[GDI32API]
- fix some 64 bit warnings
Modified:
trunk/rostests/apitests/gdi32api/tests/GetObject.c
trunk/rostests/apitests/gdi32api/tests/GetStockObject.c
Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G…
==============================================================================
--- trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] Tue Jul 27 16:24:31
2010
@@ -78,7 +78,7 @@
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 @@
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);
Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G…
==============================================================================
--- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c [iso-8859-1] Tue Jul 27
16:24:31 2010
@@ -12,7 +12,7 @@
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
*/