gdiplus: Handle more cases in GdipCreateBitmapFromGdiDib.

dlls/gdiplus/image.c

@@ -1242,9 +1242,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info,
     case 8:
         format = PixelFormat8bppIndexed;
         break;
+    case 16:
+        format = PixelFormat16bppRGB555;
+        break;
     case 24:
         format = PixelFormat24bppRGB;
         break;
+    case 32:
+        format = PixelFormat32bppRGB;
+        break;
     default:
         FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount);
         *bitmap = NULL;

dlls/gdiplus/tests/image.c

@@ -188,8 +188,8 @@ static void test_FromGdiDib(void)
     expect(InvalidParameter, stat);
 
     stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm);
-    todo_wine expect(Ok, stat);
-    todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n");
+    expect(Ok, stat);
+    ok(NULL != bm, "Expected bitmap to be initialized\n");
     if (stat == Ok)
     {
         stat = GdipGetImagePixelFormat((GpImage*)bm, &format);
@@ -214,8 +214,8 @@ static void test_FromGdiDib(void)
 
     bmi->bmiHeader.biBitCount = 16;
     stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm);
-    todo_wine expect(Ok, stat);
-    todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n");
+    expect(Ok, stat);
+    ok(NULL != bm, "Expected bitmap to be initialized\n");
     if (stat == Ok)
     {
         stat = GdipGetImagePixelFormat((GpImage*)bm, &format);