[GDI32_APITEST]

Simplify code

svn path=/trunk/; revision=56586

diff --git a/rostests/apitests/gdi32/CreateDIBitmap.c b/rostests/apitests/gdi32/CreateDIBitmap.c
index 1e54371..f2ce391 100644 (file)
--- a/rostests/apitests/gdi32/CreateDIBitmap.c
+++ b/rostests/apitests/gdi32/CreateDIBitmap.c
@@ -28,7 +28,7 @@ GetExpected(
         return FALSE;
     }
 
         return FALSE;
     }
 

-    if (fuUsage != 0)
+    if (fuUsage != DIB_RGB_COLORS)

     {
         if (hdc == (HDC)-1)
         {
     {
         if (hdc == (HDC)-1)
         {


@@ -76,16 +76,6 @@ GetExpected(
         return TRUE;
     }
 
         return TRUE;
     }
 

-    if (lpbmih && (lpbmih != (PVOID)0xc0000000) && (lpbmih->biSize != 0))
-    {
-        if (hdc == (HDC)-1)
-        {
-            *pdwError = ERROR_INVALID_PARAMETER;
-            return FALSE;
-        }
-    }
-
-

     if ((lpbmih == NULL) ||
         (lpbmih == (PVOID)0xC0000000) ||
         (lpbmih->biSize == 0))
     if ((lpbmih == NULL) ||
         (lpbmih == (PVOID)0xC0000000) ||
         (lpbmih->biSize == 0))


@@ -93,6 +83,13 @@ GetExpected(
         return FALSE;
     }
 
         return FALSE;
     }
 

+    if (hdc == (HDC)-1)
+    {
+        *pdwError = ERROR_INVALID_PARAMETER;
+        return FALSE;
+    }
+
+

     if (lpbmi == (PVOID)0xc0000000) return FALSE;
 
 
     if (lpbmi == (PVOID)0xc0000000) return FALSE;