From dade22f4797c7de5a81d8701519586feb9696345 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Sun, 21 Jan 2018 00:22:36 +0300 Subject: [PATCH] [WIN32K:NTUSER] Fix hardcoded color for MF_GRAYED menu items CORE-14196 #resolve --- win32ss/user/ntuser/menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 965a72b81d9..1407ef1d0a7 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2511,11 +2511,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC if (!(lpitem->fState & MF_HILITE) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, RGB(0xff, 0xff, 0xff)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); DrawTextW( hdc, Text, i, &rect, uFormat ); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); } DrawTextW( hdc, Text, i, &rect, uFormat); @@ -2538,11 +2538,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC if (!(lpitem->fState & MF_HILITE) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, RGB(0xff, 0xff, 0xff)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, RGB(0x80, 0x80, 0x80)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); } DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); }