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

user32: When repainting a static control with SS_BITMAP style, do not erase the background if there is no valid bitmap to paint.

This commit is contained in:
Rein Klazes 2009-04-13 19:22:34 +02:00 committed by Alexandre Julliard
parent aadd07ca9d
commit dbfbce975d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/user32/static.c
View File

@ -874,12 +874,6 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
SelectObject(hMemDC, oldbitmap); SelectObject(hMemDC, oldbitmap);
DeleteDC(hMemDC); DeleteDC(hMemDC);
} }
else
{
RECT rcClient;
GetClientRect( hwnd, &rcClient );
FillRect( hdc, &rcClient, hbrush );
}
} }

10
dlls/user32/tests/static.c
View File

@ -56,6 +56,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara
ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n");
DeleteObject(hrgn); DeleteObject(hrgn);
g_nReceivedColorStatic++; g_nReceivedColorStatic++;
return (LRESULT) GetStockObject(BLACK_BRUSH);
} }
break; break;
} }
@ -81,7 +82,11 @@ static void test_updates(int style, int flags)
InvalidateRect(hStatic, NULL, FALSE); InvalidateRect(hStatic, NULL, FALSE);
UpdateWindow(hStatic); UpdateWindow(hStatic);
if( (style & SS_TYPEMASK) == SS_BITMAP) {
HDC hdc = GetDC( hStatic);
COLORREF colour = GetPixel( hdc, 10, 10);
ok ( colour != 0, "pixel should NOT be painted black!\n");
}
if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT)
exp = 4; exp = 4;
else else
@ -89,7 +94,7 @@ static void test_updates(int style, int flags)
if (flags & TODO_COUNT) if (flags & TODO_COUNT)
todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); }
else if (style == SS_ICON || style == SS_BITMAP) else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP)
ok( g_nReceivedColorStatic == exp || ok( g_nReceivedColorStatic == exp ||
broken(g_nReceivedColorStatic == 0), /* win9x */ broken(g_nReceivedColorStatic == 0), /* win9x */
"expected %u got %u\n", exp, g_nReceivedColorStatic ); "expected %u got %u\n", exp, g_nReceivedColorStatic );
@ -125,6 +130,7 @@ START_TEST(static)
test_updates(SS_SIMPLE, 0); test_updates(SS_SIMPLE, 0);
test_updates(SS_ICON, 0); test_updates(SS_ICON, 0);
test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP, 0);
test_updates(SS_BITMAP | SS_CENTERIMAGE, 0);
test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_BLACKRECT, TODO_COUNT);
test_updates(SS_WHITERECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT);
test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDHORZ, TODO_COUNT);