Commit 85e942f9 authored by Felix Nawothnig's avatar Felix Nawothnig Committed by Alexandre Julliard

Report a todo and skip DIB tests when they fail at a non-truecolor

screen depth.
parent 8f779949
...@@ -160,8 +160,12 @@ static void test_createdibitmap(void) ...@@ -160,8 +160,12 @@ static void test_createdibitmap(void)
} }
#define test_color_todo(got, exp, txt, todo) \ #define test_color_todo(got, exp, txt, todo) \
if (todo) todo_wine { ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp); } \ if (!todo && got != exp && screen_depth < 24) { \
else ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp) todo_wine ok(0, #txt " failed at %d-bit screen depth: got 0x%06x expected 0x%06x - skipping DIB tests\n", \
screen_depth, (UINT)got, (UINT)exp); \
return; \
} else if (todo) todo_wine { ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp); } \
else ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp) \
#define test_color(hdc, color, exp, todo_setp, todo_getp) \ #define test_color(hdc, color, exp, todo_setp, todo_getp) \
{ \ { \
...@@ -192,8 +196,10 @@ static void test_dibsections(void) ...@@ -192,8 +196,10 @@ static void test_dibsections(void)
HPALETTE hpal, oldpal; HPALETTE hpal, oldpal;
COLORREF c0, c1; COLORREF c0, c1;
int i; int i;
int screen_depth;
hdc = GetDC(0); hdc = GetDC(0);
screen_depth = GetDeviceCaps(hdc, BITSPIXEL) * GetDeviceCaps(hdc, PLANES);
memset(pbmi, 0, sizeof(bmibuf)); memset(pbmi, 0, sizeof(bmibuf));
pbmi->bmiHeader.biSize = sizeof(pbmi->bmiHeader); pbmi->bmiHeader.biSize = sizeof(pbmi->bmiHeader);
pbmi->bmiHeader.biHeight = 16; pbmi->bmiHeader.biHeight = 16;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment