From 7531adec7a3416e3379bea6f17f8b131a58b8485 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 28 Jan 2003 14:28:56 +0000 Subject: [PATCH] ClearType + transparent branding text fix git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2087 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 1 + Source/exehead/exec.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 3f296855..66a2585d 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -130,6 +130,7 @@ static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lPara BOOL brush = (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA); if (brush == -1) { SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE)); + SetTextColor((HDC)wParam, GetSysColor(COLOR_BTNFACE)); return (BOOL)GetStockObject(NULL_BRUSH); } SetBkMode((HDC)wParam, TRANSPARENT); diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c index 022b649e..2db4d72f 100644 --- a/Source/exehead/exec.c +++ b/Source/exehead/exec.c @@ -142,8 +142,6 @@ static int NSISCALL ExecuteEntry(entry *entry_) char *buf3 = bufs[3]; char *buf4 = bufs[4]; - // changed by Amir Szekely 28 August 2002 - // shaves off 0.5KB int parm0 = (parms = entry_->offsets)[0]; // the ordering of these makes a size diff (4 bytes) -Justin char *var0 = g_usrvars[parm0]; int parm1 = parms[1]; @@ -153,9 +151,9 @@ static int NSISCALL ExecuteEntry(entry *entry_) int parm3 = parms[3]; char *var3 = g_usrvars[parm3]; int parm4 = parms[4]; +//char *var4 = g_usrvars[parm4]; // not used yet int parm5 = parms[5]; -//char *var4 = g_usrvars[parm4]; // not used yet -//char *var5 = g_usrvars[parm5]; +//char *var5 = g_usrvars[parm5]; // not used yet int which = entry_->which; switch (which) { @@ -805,7 +803,7 @@ static int NSISCALL ExecuteEntry(entry *entry_) f.lfItalic=parm4&1; f.lfUnderline=parm4&2; f.lfStrikeOut=parm4&4; - f.lfCharSet=DEFAULT_CHARSET; + f.lfCharSet=DEFAULT_CHARSET; process_string_fromtab(f.lfFaceName,parm1); myitoa(var0,(int)CreateFontIndirect(&f)); }