Skip to content

W
wine-winehq
Commit f534e3f4 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

gdi32: Use NtUserGetSysColor() directly.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ff1641ce
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 15 deletions
dlls/gdi32/uniscribe/usp10.c
View file @ f534e3f4
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntgdi.h" #include "ntgdi.h"
#include "ntuser.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
...@@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR ...@@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR
return FALSE; 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, static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
int iX, int iX,
int iY, int iY,
...@@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, ...@@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
BkMode = GetBkMode(analysis->hdc); BkMode = GetBkMode(analysis->hdc);
SetBkMode( analysis->hdc, OPAQUE); SetBkMode( analysis->hdc, OPAQUE);
BkColor = GetBkColor(analysis->hdc); BkColor = GetBkColor(analysis->hdc);
SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); SetBkColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHT));
if (!fDisabled) if (!fDisabled)
{ {
TextColor = GetTextColor(analysis->hdc); TextColor = GetTextColor(analysis->hdc);
SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); SetTextColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHTTEXT));
} }
} }
if (analysis->glyphs[iItem].fallbackFont) if (analysis->glyphs[iItem].fallbackFont)
......
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