From 47e481a3bf718fc1732488a1f121a88f0184a300 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 8 Jun 2013 18:48:38 +0000
Subject: [PATCH] Default verbosity is /V3 without logo, MakeNSISW still uses
 /V4

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6375 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/makensisw.cpp |  4 +++-
 Contrib/Makensisw/makensisw.h   |  4 +++-
 Contrib/Makensisw/utils.cpp     | 25 +++++++++++++++++++------
 Contrib/Makensisw/utils.h       |  1 +
 Docs/src/history.but            |  4 ++++
 Source/build.cpp                |  4 ++--
 Source/makenssi.cpp             |  2 +-
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 11a0e6e4..bbd66c6a 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -51,9 +51,11 @@ int WINAPI _tWinMain(HINSTANCE hInst,HINSTANCE hOldInst,LPTSTR CmdLineParams,int
   memset(&g_sdata,0,sizeof(NSCRIPTDATA));
   memset(&g_resize,0,sizeof(NRESIZEDATA));
   memset(&g_find,0,sizeof(NFINDREPLACE));
-  g_sdata.hInstance=hInst;
+  g_sdata.hInstance = hInst;
   g_sdata.symbols = NULL;
   g_sdata.sigint_event_legacy = CreateEvent(NULL, FALSE, FALSE, MakensisAPI::SigintEventNameLegacy);
+  g_sdata.verbosity = (unsigned char) ReadRegSettingDW(REGVERBOSITY, 4);
+  if (g_sdata.verbosity > 4) g_sdata.verbosity = 4;
   RestoreSymbols();
 
   HINSTANCE hRichEditDLL = LoadLibrary(_T("RichEd20.dll"));
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index d8c5add3..a8bc934e 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -52,6 +52,7 @@
 #define REGSECDEF    HKEY_LOCAL_MACHINE
 #define REGKEY       _T("Software\\NSIS")
 #define REGLOC       _T("MakeNSISWPlacement")
+#define REGVERBOSITY _T("MakeNSISWVerbosity")
 #define REGCOMPRESSOR _T("MakeNSISWCompressor")
 #define REGSYMSUBKEY _T("Symbols")
 #define REGMRUSUBKEY _T("MRU")
@@ -185,7 +186,8 @@ typedef struct NSISScriptData {
   char  *brandingv;
   TCHAR **symbols;
   int retcode;
-  BOOL userSelectCompressor;
+  bool userSelectCompressor;
+  unsigned char verbosity;
   DWORD logLength;
   DWORD warnings;
   HINSTANCE hInstance;
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index f5531809..7a8af544 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -285,11 +285,12 @@ void CompileNSISScript() {
     TCHAR *args = (TCHAR *) GlobalLock(g_sdata.script_cmd_args);
 
     size_t byteSize = sizeof(TCHAR)*(
-      /* makensis.exe        */ lstrlen(EXENAME)                  + /* space */ 1 +
-      /* script path         */ lstrlen(g_sdata.script)           + /* space */ 1 +
-      /* script cmd args     */ lstrlen(args)  + /* space */ 1 +
-      /* defines /Dblah=...  */ lstrlen(symbols)                  + /* space */ 1 +
-      /* /XSetCompressor...  */ lstrlen(compressor)               + /* space */ 1 +
+      /* makensis.exe        */ lstrlen(EXENAME)        + /* space */ 1 +
+      /* script path         */ lstrlen(g_sdata.script) + /* space */ 1 +
+      /* script cmd args     */ lstrlen(args)           + /* space */ 1 +
+      /* defines /Dblah=...  */ lstrlen(symbols)        + /* space */ 1 +
+      /* /XSetCompressor...  */ lstrlen(compressor)     + /* space */ 1 +
+      /* /V + UINT8          */ 2 + 3                   + /* space */ 1 +
       /* /NOTIFYHWND + HWND  */ COUNTOF(_T("/NOTIFYHWND -4294967295")) + /* space */ 1
       +6); /* for -- \"\" and NULL */
       
@@ -297,8 +298,9 @@ void CompileNSISScript() {
 
     wsprintf(
       g_sdata.compile_command,
-      _T("%s %s %s /NOTIFYHWND %d %s -- \"%s\""),
+      _T("%s /V%u %s %s /NOTIFYHWND %d %s -- \"%s\""),
       EXENAME,
+      g_sdata.verbosity,
       compressor,
       symbols,
       g_sdata.hwnd,
@@ -340,6 +342,17 @@ bool OpenRegSettingsKey(HKEY &hKey, bool create) {
   return false;
 }
 
+DWORD ReadRegSettingDW(LPCTSTR name, const DWORD defval) {
+  DWORD val = defval, siz = sizeof(val), typ;
+  HKEY hKey;
+  if (OpenRegSettingsKey(hKey)) {
+    if (RegQueryValueEx(hKey,name,NULL,&typ,(LPBYTE)&val,&siz) || REG_DWORD != typ || sizeof(val) != siz)
+      val = defval;
+    RegCloseKey(hKey);
+  }
+  return val;
+}
+
 void RestoreWindowPos(HWND hwnd) {
   HKEY hKey;
   WINDOWPLACEMENT p;
diff --git a/Contrib/Makensisw/utils.h b/Contrib/Makensisw/utils.h
index 7e44081d..c35c8425 100644
--- a/Contrib/Makensisw/utils.h
+++ b/Contrib/Makensisw/utils.h
@@ -56,6 +56,7 @@ void Items(HWND hwnd, int on);
 /*void DisableItems(HWND hwnd);
 void EnableItems(HWND hwnd);*/
 bool OpenRegSettingsKey(HKEY &hKey, bool create = false);
+DWORD ReadRegSettingDW(LPCTSTR name, const DWORD defval);
 void RestoreWindowPos(HWND hwnd);
 void SaveWindowPos(HWND hwnd);
 void ResetObjects();
diff --git a/Docs/src/history.but b/Docs/src/history.but
index b45059e5..45ffb49b 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -6,6 +6,10 @@ Released on ?, 2013
 
 \S1{v3.0a1-cl} Changelog
 
+\S2{} Major Changes
+
+\b Default verbosity is /V3 without logo, MakeNSISW still uses /V4.
+
 \S2{} Minor Changes
 
 \b Fixed !searchparse
diff --git a/Source/build.cpp b/Source/build.cpp
index 3ed90fa7..e898a822 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -109,10 +109,10 @@ CEXEBuild::CEXEBuild() :
   curlinereader = 0;
   curfilename = 0;
 
-  display_info=1;
-  display_script=1;
   display_errors=1;
   display_warnings=1;
+  display_info=1;
+  display_script=0;
 
   cur_ifblock=NULL;
   last_line_had_slash=0;
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index 96923302..7a084231 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -284,7 +284,7 @@ int _tmain(int argc, TCHAR **argv)
   int argpos=0;
   bool in_files=false;
   bool do_cd=true;
-  bool no_logo=false;
+  bool no_logo=true;
   bool initialparsefail=false;
   bool noconfig=false;
 #ifdef _WIN32