From 6f3fdd66500d76c46447dfd8ecdb30431336b04d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 27 Jan 2003 15:05:50 +0000
Subject: [PATCH] BrandingText now automatically resizes for all languages in
 the MUI

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2082 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh |   8 ++++++++
 Contrib/UIs/modern.exe       | Bin 6144 -> 6144 bytes
 Contrib/UIs/modern2.exe      | Bin 6144 -> 6144 bytes
 Contrib/UIs/modern3.exe      | Bin 6144 -> 6144 bytes
 Source/exehead/Ui.c          |   5 +++++
 Source/exehead/exec.c        |   9 ++++++++-
 Source/exehead/fileform.h    |   5 +++--
 Source/script.cpp            |   7 +++++++
 Source/tokens.cpp            |   1 +
 Source/tokens.h              |   1 +
 10 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index a2f17a0b..2f52fb5e 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -335,6 +335,14 @@
   GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039
   SetStaticBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
 
+  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028
+  SetStaticBkColor ${MUI_TEMP1} -1
+  GetWindowText ${MUI_TEMP2} ${MUI_TEMP1}
+  #ShowWindow ${MUI_TEMP1} ${SW_HIDE}
+  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
+  SetStaticBkColor ${MUI_TEMP1} -1
+  SendMessage ${MUI_TEMP1} ${WM_SETTEXT} ${NSIS_MAX_STRLEN} "STR:${MUI_TEMP2}"
+
   Pop ${MUI_TEMP2}
   Pop ${MUI_TEMP1}
   
diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe
index 77171652c2a70780f8449f72ef5f169af48c2827..d14387e1326a238156fc00807b5e5c8dca382822 100644
GIT binary patch
delta 111
zcmZoLXfW7d!>`N2!~h2;+!z=v7~xz71`h^?1xVZln=|>dnK}8uLf(w`CQsxy+{`D;
k$jBAI%CLvQiIIch#pH(q!jpMKI9NeE77%Z<j>r~f0A!*PrvLx|

delta 100
zcmZoLXfW7d!>{{<kpT`?xG^wTAn_l#GcYWG%Q7%DY|iA*X6EDt3wbl%n>>-<a5JAU
eBjaR!5mwd&1`Y<6$qxmDH~WZeVV>N;r~m*U@)6Jg

diff --git a/Contrib/UIs/modern2.exe b/Contrib/UIs/modern2.exe
index 7c5c650e81db2d59304c15c44ac29d5f4625382f..be3d52cc57b0d3d0dc796233f052b34c8bd0eb88 100644
GIT binary patch
delta 129
zcmZoLXfW82!pJm%b8;b*_vDR?^BE^>4rF@Gqszj?00$@B7#J)V;amm=4+e$>NZbXR
zGx@WbIr+ds-i-GqPvke;%qPsq$Q8iKu!q5kk%QsI<c9*nlX*lqSV24%5O1@N$QEV*
DYZw_H

delta 118
zcmZoLXfW82!pKy>Ik}L@d-6uc`HTgd1DRg)=ssa&fP)oo3=9@X{0Hs~3=8103=9pM
xGx@WbIeEcC-i-GqPvke;%qPsqI9XqWl{JBZgMnr8LjmE<J|bI~CpR!E0071j7zh9W

diff --git a/Contrib/UIs/modern3.exe b/Contrib/UIs/modern3.exe
index f5df94ce169aef598d85356fdb7e7b5d73cd077e..eef814cc47b978b3c816f10b907f5560efc3feb2 100644
GIT binary patch
delta 129
zcmZoLXfW82!pIcBIk}L@d-6uc`HTUZ1DRg)=&~>|z(I!_1A_%4oXc>)oq=Hig3FMw
zIg?+TnUfDJ<jr_*@<e{a&F6#|8My*j8TK$ZF>)}xnEX&cc=8!x4ptD41;pF@M)(Ue
E0Ap1f8vp<R

delta 118
zcmZoLXfW82!pLO6Ik}L@d-6uc`HTje1DRg)=ssa&fP)M-1_lcx{sMOfh6Qk01_p=C
xnf%(!oV;KmZ^nC*C-NI^J}1P;IQhLWD{BG+2LsFGhXTTzc|^W2Pi|mT004U87zO|U

diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index 798b2ad7..3f296855 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -127,6 +127,11 @@ static BOOL NSISCALL SetDlgItemTextFromLang_(HWND dlg, int id, int lid) {
 #define HandleStaticBkColor() _HandleStaticBkColor(uMsg, wParam, lParam)
 static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lParam) {
   if (uMsg == WM_CTLCOLORSTATIC) {
+    BOOL brush = (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
+    if (brush == -1) {
+      SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
+      return (BOOL)GetStockObject(NULL_BRUSH);
+    }
     SetBkMode((HDC)wParam, TRANSPARENT);
     return (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
   }
diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index 9aa97897..18012297 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -762,12 +762,19 @@ static int NSISCALL ExecuteEntry(entry *entry_)
         )
       );
     return 0;
+    case EW_GETWINTEXT:
+      my_GetWindowText(
+        (HWND)process_string_fromparm_toint(1),
+        var0,
+        NSIS_MAX_STRLEN
+      );
+    return 0;
     case EW_SETSTATICBKCOLOR:
       DeleteObject(
         (HGDIOBJ)SetWindowLong(
           (HWND)process_string_fromparm_toint(0),
           GWL_USERDATA,
-          (LONG)CreateSolidBrush(parm1)
+          parm1==-1?parm1:(LONG)CreateSolidBrush(parm1)
         )
       );
     return 0;
diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h
index 29aaee38..40f9abe9 100644
--- a/Source/exehead/fileform.h
+++ b/Source/exehead/fileform.h
@@ -93,8 +93,9 @@ enum
 #endif
 
 #ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
-  EW_GETDLGITEM,        // GetDlgItem:        3 [outputvar, dialog, item_id]
-  EW_SETSTATICBKCOLOR,  // SerStaticBkColor:  3 [hwnd, color]
+  EW_GETDLGITEM,        // GetDlgItem:        3: [outputvar, dialog, item_id]
+  EW_GETWINTEXT,        // GetWindowText:     2: [outputvar, hwnd]
+  EW_SETSTATICBKCOLOR,  // SerStaticBkColor:  3: [hwnd, color]
   EW_SETBRANDINGIMAGE,  // SetBrandingImage:  1: [Bitmap file]
   EW_CREATEFONT,        // CreateFont:        5: [handle output, face name, height, weight, flags]
   EW_SHOWWINDOW,        // ShowWindow:        2: [hwnd, show state]
diff --git a/Source/script.cpp b/Source/script.cpp
index 32fd0c3d..826e52a1 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -2651,6 +2651,13 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       ent.offsets[2]=add_string(line.gettoken_str(3));
       SCRIPT_MSG("GetDlgItem: output=%s dialog=%s item=%s\n",line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3));
     return add_entry(&ent);
+    case TOK_GETWINTEXT:
+      ent.which=EW_GETWINTEXT;
+      ent.offsets[0]=line.gettoken_enum(1,usrvars);
+      if (ent.offsets[0]<0) PRINTHELP();
+      ent.offsets[1]=add_string(line.gettoken_str(2));
+      SCRIPT_MSG("GetWindowText: output=%s hwnd=%s\n",line.gettoken_str(1),line.gettoken_str(2));
+    return add_entry(&ent);
     case TOK_SETSTATICBKCOLOR:
       ent.which=EW_SETSTATICBKCOLOR;
       ent.offsets[0]=add_string(line.gettoken_str(1));
diff --git a/Source/tokens.cpp b/Source/tokens.cpp
index 630210ee..e0b48b47 100644
--- a/Source/tokens.cpp
+++ b/Source/tokens.cpp
@@ -76,6 +76,7 @@ static tokenType tokenlist[TOK__LAST] =
 {TOK_GETDLGITEM,"GetDlgItem",3,0,"$(user_var: handle output) dialog item_id"},
 {TOK_GETFULLPATHNAME,"GetFullPathName",2,1,"[/SHORT] $(user_var: result) path_or_file"},
 {TOK_GETTEMPFILENAME,"GetTempFileName",1,0,"$(user_var: name output)"},
+{TOK_GETWINTEXT,"GetWindowText",2,0,"$(user_var: handle output) hwnd"},
 {TOK_HIDEWINDOW,"HideWindow",0,0,""},
 {TOK_ICON,"Icon",1,0,"local_icon.ico"},
 {TOK_IFERRORS,"IfErrors",1,1,"label_to_goto_if_errors [label_to_goto_if_no_errors]"},
diff --git a/Source/tokens.h b/Source/tokens.h
index e6f53582..f99620bd 100644
--- a/Source/tokens.h
+++ b/Source/tokens.h
@@ -172,6 +172,7 @@ enum
   TOK_SENDMESSAGE,
   TOK_ISWINDOW,
   TOK_GETDLGITEM,
+  TOK_GETWINTEXT,
   TOK_SETSTATICBKCOLOR,
   TOK_SETWINDOWLONG,
   TOK_FINDFIRST,