From 385b8dcb95b2853d452ec95d140ea5fa0c05aeef Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Tue, 29 Dec 2009 19:27:14 +0300 Subject: [PATCH] user32/sysparams: Return NULL from GetSysColorBrush() for invalid index. --- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/sysparams.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09e7eb57e3c..08dde396beb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3028,7 +3028,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index ) { if (0 <= index && index < NUM_SYS_COLORS) return SysColorBrushes[index]; WARN("Unknown index(%d)\n", index ); - return GetStockObject(LTGRAY_BRUSH); + return NULL; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a9b79fa1d16..ba1c8026a89 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2770,7 +2770,7 @@ static void test_GetSysColorBrush(void) SetLastError(0xdeadbeef); hbr = GetSysColorBrush(-1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); /* greater than max index */ hbr = GetSysColorBrush(COLOR_MENUBAR); @@ -2778,7 +2778,7 @@ static void test_GetSysColorBrush(void) { SetLastError(0xdeadbeef); hbr = GetSysColorBrush(COLOR_MENUBAR + 1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); } else