ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Handle more cases in GdipCreateBitmapFromGdiDib.

This commit is contained in:
Vincent Povirk 2010-04-24 09:39:23 -05:00 committed by Alexandre Julliard
parent 800e9ff6c5
commit 38138784e7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/gdiplus/image.c
View File

@ -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;

8
dlls/gdiplus/tests/image.c
View File

@ -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);