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

gdi32: Use NtUserGetSysColor() directly. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-04-19 14:00:32 +01:00 committed by Alexandre Julliard
parent ff1641ce0a
commit f534e3f499
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/gdi32/uniscribe/usp10.c
View File

@ -31,6 +31,7 @@
#include "windef.h"
#include "winbase.h"
#include "ntgdi.h"
#include "ntuser.h"
#include "winuser.h"
#include "winnls.h"
#include "winreg.h"
@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR
return FALSE;
}
static DWORD get_sys_color(INT index)
{
static DWORD (WINAPI *pGetSysColor)(INT index);
if (!pGetSysColor)
{
HMODULE user = GetModuleHandleW( L"user32.dll" );
if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" );
}
return pGetSysColor(index);
}
static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
int iX,
int iY,
@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
BkMode = GetBkMode(analysis->hdc);
SetBkMode( analysis->hdc, OPAQUE);
BkColor = GetBkColor(analysis->hdc);
SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT));
SetBkColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHT));
if (!fDisabled)
{
TextColor = GetTextColor(analysis->hdc);
SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT));
SetTextColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHTTEXT));
}
}
if (analysis->glyphs[iItem].fallbackFont)