Index: modules/rostests/apitests/gdi32/CreateBitmap.c
===================================================================
--- modules/rostests/apitests/gdi32/CreateBitmap.c	(revision 56551)
+++ modules/rostests/apitests/gdi32/CreateBitmap.c	(working copy)
@@ -59,6 +59,7 @@
     hbmp = CreateBitmap(0x7FFFFFF, 1, 1, 1, NULL);
     ok(hbmp != 0, "\n");
     DeleteObject(hbmp);
+    
     SetLastError(0);
     hbmp = CreateBitmap(0x8000000, 1, 1, 1, NULL);
     ok(hbmp == 0, "\n");
@@ -68,17 +69,20 @@
     hbmp = CreateBitmap(1, 0x1FFFFF00, 1, 1, NULL);
     //ok(hbmp != 0, "\n"); // fails on windows 2003
     DeleteObject(hbmp);
+    
     SetLastError(0);
     hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL);
     ok(hbmp == 0, "\n");
     ok_err(0);
 
     /* Check for overflow in width * height */
-    hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL);
-    //ok(hbmp != 0, "\n"); // fails on windows 2003
+    hbmp = CreateBitmap(0x2000, 0x4000, 1, 1, NULL); //128 MB.Should work.
+    ok(hbmp != 0, "\n"); 
     DeleteObject(hbmp);
+    
+    /* XP doesn't allow to create bitmaps larger than 128 Mb */
     SetLastError(0);
-    hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL);
+    hbmp = CreateBitmap(0x2000, 0x4001, 1, 1, NULL);//More than 128MB.Should fail.
     ok(hbmp == 0, "\n");
     ok_err(0);
 
@@ -95,7 +99,8 @@
     HBITMAP hbmp;
     BITMAP bitmap;
     int result;
-
+    int TestBitsPixel, ExpectedBitsPixel;
+    
     hbmp = CreateBitmap(0, 0, 0, 0, NULL);
     ok(hbmp != 0, "should get a 1x1 bitmap\n");
     ok(hbmp == GetStockObject(DEFAULT_BITMAP), "\n");
@@ -122,6 +127,34 @@
     ok(bitmap.bmBitsPixel == 1, "bmBitsPixel = %d\n", bitmap.bmBitsPixel);
     ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits);
     DeleteObject(hbmp);
+    
+    
+    for(TestBitsPixel = 1; TestBitsPixel <= 32; TestBitsPixel++)
+    {    /*CreateBitmap API accepts any number as BitsPixels param.
+         but it just can create 1,4,8,16,24,32 Bitmaps*/
+        if(TestBitsPixel <= 1)    ExpectedBitsPixel = 1;
+        else if(TestBitsPixel <= 4)    ExpectedBitsPixel = 4;
+        else if(TestBitsPixel <= 8)    ExpectedBitsPixel = 8;
+        else if(TestBitsPixel <= 16)    ExpectedBitsPixel = 16;
+        else if(TestBitsPixel <= 24)    ExpectedBitsPixel = 24;
+        else if(TestBitsPixel <= 32)    ExpectedBitsPixel = 32;
+        /*Calculate proper bmWidthBytes*/    
+        
+        hbmp = CreateBitmap(1, 2, 1, TestBitsPixel, NULL);
+        ok(hbmp != 0, "should get a 1x2 bitmap\n");
+        result = GetObject(hbmp, sizeof(bitmap), &bitmap);
+        ok(result > 0, "result = %d\n", result);
+        ok(bitmap.bmType == 0, "bmType = %ld\n", bitmap.bmType);
+        ok(bitmap.bmWidth == 1, "bmWidth = %ld\n", bitmap.bmWidth);
+        ok(bitmap.bmHeight == 2, "bmHeight = %ld\n", bitmap.bmHeight);
+        ok(bitmap.bmPlanes == 1, "bmPlanes = %d\n", bitmap.bmPlanes);
+        ok(bitmap.bmBitsPixel == ExpectedBitsPixel, "bmBitsPixel = %d ExpectedBitsPixel= %d \n", bitmap.bmBitsPixel, ExpectedBitsPixel);
+        ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits);
+        DeleteObject(hbmp);
+        
+    }
+        
+        
 
 
 }
@@ -130,5 +163,6 @@
 {
     Test_CreateBitmap_Params();
     Test_CreateBitmap();
+    
 }