From 124d08ff5936b30e9c970da9087a462b917da5b7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertn@the-nelsons.org>
Date: Wed, 6 Sep 2006 17:12:00 +0000
Subject: [PATCH] Fixed symbol file generation on Microsoft Visual Studio
 builds.

Change daemon /kill processing to pause .5 second between attempts to post WM_CLOSE message.

Installer changes:
  -  Add new Install Type page, used to select between Automatic and Custom installs.  Automatic installs only prompt for configuration items that can't be reasonably defaulted.
  -  Added Bacula logo to page headers.
  -  Added Upgrade support
       Configuration and component selection is migrated from pre-1.39 installs.
       Configuration of upgraded components is preserved and not prompted for
       Configuration of new components is handled according the Automatic / Custom selection.
       New components are shown in bold on Component page.
       Component selection is defaulted to previously selected components.
  -  Installation of Server components is disabled on Windows 95, 98 and ME.
  -  Changed installer to use previous executable to /kill and /remove services being upgraded.

Added URLs for support, info and upgrades to Bacula entry in Add/Remove Programs.

Added Version info to Bacula entry in Add/Remove Programs.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3417 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/win32/filed/baculafd.vcproj        |   2 +-
 bacula/src/win32/filed/winservice.cpp         |   5 +-
 bacula/src/win32/installer/ConfigPage1.nsh    |  50 +-
 bacula/src/win32/installer/ConfigPage2.nsh    | 442 +++++++++-------
 bacula/src/win32/installer/InstallType.ini    |  51 ++
 bacula/src/win32/installer/InstallType.nsh    | 141 +++++
 bacula/src/win32/installer/bacula-dir.conf.in |   2 +-
 bacula/src/win32/installer/bacula-fd.conf.in  |   4 +-
 bacula/src/win32/installer/bacula-logo.bmp    | Bin 0 -> 26046 bytes
 bacula/src/win32/installer/installer.vcproj   |   8 +
 bacula/src/win32/installer/winbacula.nsi      | 492 +++++++++++-------
 bacula/src/win32/libbac/libbac.vcproj         |   5 +-
 .../src/win32/stored/baculasd/winservice.cpp  |   5 +-
 13 files changed, 805 insertions(+), 402 deletions(-)
 create mode 100644 bacula/src/win32/installer/InstallType.ini
 create mode 100644 bacula/src/win32/installer/InstallType.nsh
 create mode 100644 bacula/src/win32/installer/bacula-logo.bmp

diff --git a/bacula/src/win32/filed/baculafd.vcproj b/bacula/src/win32/filed/baculafd.vcproj
index b813a6b74f..6883602fab 100644
--- a/bacula/src/win32/filed/baculafd.vcproj
+++ b/bacula/src/win32/filed/baculafd.vcproj
@@ -156,7 +156,7 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/bacula/src/win32/filed/winservice.cpp b/bacula/src/win32/filed/winservice.cpp
index bb2afa8f50..f386abc89d 100644
--- a/bacula/src/win32/filed/winservice.cpp
+++ b/bacula/src/win32/filed/winservice.cpp
@@ -171,8 +171,9 @@ bacService::RunningAsService()
 BOOL
 bacService::KillRunningCopy()
 {
-  while (PostToBacula(WM_CLOSE, 0, 0))
-      {  }
+  while (PostToBacula(WM_CLOSE, 0, 0)) {
+     Sleep(500);
+  }
   return TRUE;
 }
 
diff --git a/bacula/src/win32/installer/ConfigPage1.nsh b/bacula/src/win32/installer/ConfigPage1.nsh
index 0eb9c16652..2a16fb55fe 100644
--- a/bacula/src/win32/installer/ConfigPage1.nsh
+++ b/bacula/src/win32/installer/ConfigPage1.nsh
@@ -1,21 +1,21 @@
 Function EnterConfigPage1
-  Call IsClientSelected
-  Pop $R0
+  ${If} $AutomaticInstall = 1
+    Abort
+  ${EndIf}
 
-  Call IsStorageSelected
-  Pop $R1
+  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
 
   ${If} $R0 = 0
-  ${AndIf} $R1 = 0
     Abort
   ${EndIf}
-  
+
   FileOpen $R5 "$PLUGINSDIR\ConfigPage1.ini" w
 
   StrCpy $R6 1  ; Field Number
   StrCpy $R7 0  ; Top
-  
-  ${If} $R0 = 1
+
+  IntOp $R0 $NewComponents & ${ComponentFile}
+  ${If} $R0 <> 0
     IntOp $R8 $R7 + 52
     FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Client"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
     IntOp $R6 $R6 + 1
@@ -70,7 +70,8 @@ Function EnterConfigPage1
     IntOp $R7 $R7 + 16
   ${Endif}
 
-  ${If} $R1 = 1
+  IntOp $R0 $NewComponents & ${ComponentStorage}
+  ${If} $R0 <> 0
     IntOp $R8 $R7 + 52
     FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Storage"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
     IntOp $R6 $R6 + 1
@@ -139,7 +140,8 @@ Function EnterConfigPage1
 
   StrCpy $R6 1  ; Field Number
 
-  ${If} $R0 = 1
+  IntOp $R0 $NewComponents & ${ComponentFile}
+  ${If} $R0 <> 0
     IntOp $R6 $R6 + 2
 
     ; Client Name
@@ -160,8 +162,9 @@ Function EnterConfigPage1
 
     IntOp $R6 $R6 + 5
   ${Endif}
-  
-  ${If} $R1 = 1
+
+  IntOp $R0 $NewComponents & ${ComponentStorage}
+  ${If} $R0 <> 0
     IntOp $R6 $R6 + 2
 
     ; Storage Name
@@ -183,16 +186,14 @@ Function EnterConfigPage1
     IntOp $R6 $R6 + 5
   ${Endif}
 
-  Push $R0
   !insertmacro MUI_INSTALLOPTIONS_SHOW
-  Pop $R0
 
-  ;
   ; Process results
-  ;
+
   StrCpy $R6 3
-  
-  ${If} $R0 = 1
+
+  IntOp $R0 $NewComponents & ${ComponentFile}
+  ${If} $R0 <> 0
     !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientName "ConfigPage1.ini" "Field $R6" "State"
 
     IntOp $R6 $R6 + 2
@@ -217,8 +218,9 @@ Function EnterConfigPage1
 
     IntOp $R6 $R6 + 3
   ${Endif}
-  
-  ${If} $R1 = 1
+
+  IntOp $R0 $NewComponents & ${ComponentStorage}
+  ${If} $R0 <> 0
     !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageName "ConfigPage1.ini" "Field $R6" "State"
 
     IntOp $R6 $R6 + 2
@@ -247,8 +249,9 @@ FunctionEnd
 
 Function LeaveConfigPage1
   StrCpy $R6 5
-  
-  ${If} $R0 = 1
+
+  IntOp $R0 $NewComponents & ${ComponentFile}
+  ${If} $R0 <> 0
     !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
     ${If} $R0 < 1024
     ${OrIf} $R0 > 65535
@@ -268,7 +271,8 @@ Function LeaveConfigPage1
     IntOp $R6 $R6 + 9
   ${Endif}
   
-  ${If} $R1 = 1
+  IntOp $R0 $NewComponents & ${ComponentStorage}
+  ${If} $R0 <> 0
     !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
     ${If} $R0 < 1024
     ${OrIf} $R0 > 65535
diff --git a/bacula/src/win32/installer/ConfigPage2.nsh b/bacula/src/win32/installer/ConfigPage2.nsh
index d5b07163d7..f120259576 100644
--- a/bacula/src/win32/installer/ConfigPage2.nsh
+++ b/bacula/src/win32/installer/ConfigPage2.nsh
@@ -1,33 +1,26 @@
 Function EnterConfigPage2
-  Call IsClientSelected
-  Pop $R0
-
-  Call IsStorageSelected
-  Pop $R1
-
-  Call IsDirectorSelected
-  Pop $R2
-
-  Call IsConsoleSelected
-  Pop $R3
+  IntOp $R0 $NewComponents & ${ComponentsRequiringUserConfig}
 
   ${If} $R0 = 0
-  ${AndIf} $R1 = 0
-  ${AndIf} $R2 = 0
-  ${AndIf} $R3 = 0
     Abort
   ${EndIf}
-  
+
   FileOpen $R5 "$PLUGINSDIR\ConfigPage2.ini" w
 
   StrCpy $R6 1  ; Field Number
   StrCpy $R7 0  ; Top
-  
-  ${If} $R2 = 1
-    IntOp $R8 $R7 + 92
-  FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
+
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 <> 0
+    ${If} $AutomaticInstall = 1
+      IntOp $R8 $R7 + 54
+    ${Else}
+      IntOp $R8 $R7 + 92
+    ${EndIf}
+    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
   ${Else}
-    ${If} $R3 = 1
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+    ${If} $R0 <> 0
       IntOp $R8 $R7 + 54
     ${Else}
       IntOp $R8 $R7 + 26
@@ -38,12 +31,8 @@ Function EnterConfigPage2
   IntOp $R6 $R6 + 1
   IntOp $R7 $R7 + 12
 
-  IntOp $R8 $R7 + 8
-  FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-  IntOp $R6 $R6 + 1
-  IntOp $R7 $R7 - 2
-
-  ${If} $R2 = 1
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 <> 0
     ${If} "$ConfigDirectorName" == ""
       StrCpy $ConfigDirectorName "$HostName-dir"
     ${EndIf}
@@ -54,57 +43,77 @@ Function EnterConfigPage2
     ${If} "$ConfigDirectorName" == "$HostName-dir"
       StrCpy $ConfigDirectorName ""
     ${EndIf}
+    ${If} "$ConfigDirectorPassword" == "$LocalDirectorPassword"
+      StrCpy $ConfigDirectorPassword ""
+    ${EndIf}
   ${EndIf}
-  
-  IntOp $R8 $R8 + 2
-  FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-  IntOp $R6 $R6 + 1
 
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 = 0
+  ${OrIf} $AutomaticInstall = 0
+    IntOp $R8 $R7 + 8
+    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
     IntOp $R6 $R6 + 1
     IntOp $R7 $R7 - 2
 
     IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-  ${EndIf}
-
-  ${If} $R2 = 1
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
+    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
+    IntOp $R6 $R6 + 1
+
+    ${If} $AutomaticInstall = 0
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+      ${If} $R0 <> 0
+        IntOp $R7 $R7 + 2
+        IntOp $R8 $R8 - 2
+        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
+        IntOp $R6 $R6 + 1
+        IntOp $R7 $R7 - 2
+
+        IntOp $R8 $R8 + 2
+        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+
+      IntOp $R0 $NewComponents & ${ComponentDirector}
+      ${If} $R0 <> 0
+        IntOp $R7 $R7 + 2
+        IntOp $R8 $R8 - 2
+        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
+        IntOp $R6 $R6 + 1
+        IntOp $R7 $R7 - 2
+
+        IntOp $R8 $R8 + 2
+        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+    ${EndIf}
 
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
+    IntOp $R7 $R7 + 14
   ${EndIf}
 
-  IntOp $R7 $R7 + 14
-
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R7 + 8
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+  ${If} $R0 <> 0
+  ${OrIf} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R7 $R7 + 2
+      IntOp $R8 $R7 + 8
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 - 2
+      IntOp $R8 $R8 + 2
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 14
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R2 = 1
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 <> 0
     IntOp $R7 $R7 + 2
     IntOp $R8 $R7 + 8
 
@@ -176,65 +185,69 @@ Function EnterConfigPage2
 
     IntOp $R6 $R6 + 1
     IntOp $R7 $R7 + 12
-    IntOp $R8 $R7 + 10
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
+    ${If} $AutomaticInstall = 0
+      IntOp $R8 $R7 + 10
+      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
 
-    IntOp $R6 $R6 + 1
+      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 12
+    ${EndIf}
+  ${Else}
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R7 $R7 + 2
+      IntOp $R8 $R7 + 8
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-  ${ElseIf} $R3 = 1
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R7 + 8
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 - 2
+      IntOp $R8 $R8 + 2
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
-    IntOp $R8 $R7 + 8
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 14
+      IntOp $R8 $R7 + 8
+    ${EndIf}
   ${EndIf}
 
   IntOp $R7 $R7 + 4
-  
-  ${If} $R0 = 1
-    ${OrIf} $R1 = 1
-    ${OrIf} $R2 = 1
 
-    IntOp $R8 $R7 + 42
+  ${If} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
+    ${If} $R0 <> 0
+      IntOp $R8 $R7 + 42
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Monitor"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
+      FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Monitor"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 12
 
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
+      IntOp $R8 $R7 + 8
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 - 2
 
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=150$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-    IntOp $R8 $R7 + 8
+      IntOp $R8 $R8 + 2
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=150$\r$\nBottom=$R8$\r$\n$\r$\n'
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 16
+      IntOp $R8 $R7 + 8
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
+      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 - 2
+      IntOp $R8 $R8 + 2
 
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
+      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
 
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 20
+      IntOp $R6 $R6 + 1
+      IntOp $R7 $R7 + 20
+    ${EndIf}
   ${EndIf}
 
   IntOp $R6 $R6 - 1
@@ -242,94 +255,127 @@ Function EnterConfigPage2
 
   FileClose $R5
 
+  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
   ${If} $R0 = 0
-  ${AndIf} $R1 = 0
+  ${OrIf} $AutomaticInstall = 1
     !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"
   ${Else}
     !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage2)" "$(SUBTITLE_ConfigPage2)"
   ${EndIf}
+
   !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage2.ini"
   Pop $HDLG ;HWND of dialog
 
   ; Initialize Controls
-  StrCpy $R6 3  ; Field Number
+  StrCpy $R6 2  ; Field Number
 
-  ; Name
-  !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-  SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-  IntOp $R6 $R6 + 1
-
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 = 0
+  ${OrIf} $AutomaticInstall = 0
+    ; Name
     IntOp $R6 $R6 + 1
-    ; Port Number
     !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 5 0
+    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
     IntOp $R6 $R6 + 1
-  ${EndIf}
 
-  ${If} $R2 = 1
-    IntOp $R6 $R6 + 1
-    ; Max Jobs
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-    IntOp $R6 $R6 + 1
+    ${If} $AutomaticInstall = 0
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+      ${If} $R0 <> 0
+        IntOp $R6 $R6 + 1
+        ; Port Number
+        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
+        SendMessage $HCTL ${EM_LIMITTEXT} 5 0
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+
+      IntOp $R0 $NewComponents & ${ComponentDirector}
+      ${If} $R0 <> 0
+        IntOp $R6 $R6 + 1
+        ; Max Jobs
+        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
+        SendMessage $HCTL ${EM_LIMITTEXT} 3 0
+
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
-    IntOp $R6 $R6 + 2
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+  ${If} $R0 <> 0
+  ${OrIf} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 2
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R2 = 1
-    IntOp $R6 $R6 + 11
-  ${ElseIf} $R3 = 1
-    IntOp $R6 $R6 + 2
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 <> 0
+    IntOp $R6 $R6 + 9
+
+    ${If} $AutomaticInstall = 0
+      IntOp $R6 $R6 + 2
+    ${EndIf}
+  ${Else}
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 2
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R0 = 1
-    ${OrIf} $R1 = 1
-    ${OrIf} $R2 = 1
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-    IntOp $R6 $R6 + 2
+  ${If} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 2
+      !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
+      SendMessage $HCTL ${EM_LIMITTEXT} 30 0
+      IntOp $R6 $R6 + 2
+    ${EndIf}
   ${EndIf}
 
-  Push $R0
   !insertmacro MUI_INSTALLOPTIONS_SHOW
-  Pop $R0
 
-  ;
   ; Process results
-  ;
-  StrCpy $R6 3
 
-  !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorName "ConfigPage2.ini" "Field $R6" "State"
-  IntOp $R6 $R6 + 1
+  StrCpy $R6 2
 
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 = 0
+  ${OrIf} $AutomaticInstall = 0
     IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPort "ConfigPage2.ini" "Field $R6" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorName "ConfigPage2.ini" "Field $R6" "State"
     IntOp $R6 $R6 + 1
-  ${EndIf}
 
-  ${If} $R2 = 1
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMaxJobs "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
+    ${If} $AutomaticInstall = 0
+      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+      ${If} $R0 <> 0
+        IntOp $R6 $R6 + 1
+        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPort "ConfigPage2.ini" "Field $R6" "State"
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+
+      IntOp $R0 $NewComponents & ${ComponentDirector}
+      ${If} $R0 <> 0
+        IntOp $R6 $R6 + 1
+        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMaxJobs "ConfigPage2.ini" "Field $R6" "State"
+        IntOp $R6 $R6 + 1
+      ${EndIf}
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPassword "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
+  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+  ${If} $R0 <> 0
+  ${OrIf} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 1
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPassword "ConfigPage2.ini" "Field $R6" "State"
+      IntOp $R6 $R6 + 1
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R2 = 1
+  IntOp $R0 $NewComponents & ${ComponentDirector}
+  ${If} $R0 <> 0
     IntOp $R6 $R6 + 1
     !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailServer "ConfigPage2.ini" "Field $R6" "State"
     IntOp $R6 $R6 + 2
@@ -356,50 +402,58 @@ Function EnterConfigPage2
     ${Endif}
     IntOp $R6 $R6 + 1
 
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorInstallService "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorStartService "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
-  ${ElseIf} $R3 = 1
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorAddress "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
+    ${If} $AutomaticInstall = 0
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorInstallService "ConfigPage2.ini" "Field $R6" "State"
+      IntOp $R6 $R6 + 1
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorStartService "ConfigPage2.ini" "Field $R6" "State"
+      IntOp $R6 $R6 + 1
+    ${EndIf}
+  ${Else}
+    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 1
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorAddress "ConfigPage2.ini" "Field $R6" "State"
+      IntOp $R6 $R6 + 1
+    ${EndIf}
   ${EndIf}
 
-  ${If} $R0 = 1
-    ${OrIf} $R1 = 1
-    ${OrIf} $R2 = 1
-
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorName "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorPassword "ConfigPage2.ini" "Field $R6" "State"
+  ${If} $AutomaticInstall = 0
+    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 2
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorName "ConfigPage2.ini" "Field $R6" "State"
+      IntOp $R6 $R6 + 2
+      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorPassword "ConfigPage2.ini" "Field $R6" "State"
+    ${EndIf}
   ${EndIf}
 FunctionEnd
 
 Function LeaveConfigPage2
-  StrCpy $R6 4
-
-  ${If} $R2 = 1
-  ${OrIf} $R3 = 1
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R0 < 1024
-    ${OrIf} $R0 > 65535
-      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-      Abort
+  ${If} $AutomaticInstall = 0
+    StrCpy $R6 4
+
+    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 1
+      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
+      ${If} $R0 < 1024
+      ${OrIf} $R0 > 65535
+        MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
+        Abort
+      ${EndIf}
+      IntOp $R6 $R6 + 1
     ${EndIf}
-    IntOp $R6 $R6 + 1
-  ${EndIf}
 
-  ${If} $R2 = 1
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R0 < 1
-    ${OrIf} $R0 > 99
-      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-      Abort
+    IntOp $R0 $NewComponents & ${ComponentDirector}
+    ${If} $R0 <> 0
+      IntOp $R6 $R6 + 1
+      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
+      ${If} $R0 < 1
+      ${OrIf} $R0 > 99
+        MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
+        Abort
+      ${EndIf}
+      IntOp $R6 $R6 + 1
     ${EndIf}
-    IntOp $R6 $R6 + 1
   ${EndIf}
 FunctionEnd
diff --git a/bacula/src/win32/installer/InstallType.ini b/bacula/src/win32/installer/InstallType.ini
new file mode 100644
index 0000000000..a09d907c31
--- /dev/null
+++ b/bacula/src/win32/installer/InstallType.ini
@@ -0,0 +1,51 @@
+[Settings]
+NumFields=6
+
+[Field 1]
+Type=Label
+Text=This is a new installation.  Please choose the installation type.
+Left=0
+Right=300
+Top=0
+Bottom=28
+
+[Field 2]
+Type=GroupBox
+Text=Installation Type
+Left=0
+Right=300
+Top=32
+Bottom=126
+
+[Field 3]
+Type=RadioButton
+Text=Automatic
+State=1
+Left=6
+Right=52
+Top=44
+Bottom=54
+
+[Field 4]
+Type=RadioButton
+Text=Custom
+Left=6
+Right=44
+Top=80
+Bottom=90
+
+[Field 5]
+Type=Label
+Text=The software will be installed in the default directory "Program Files\\Bacula".  The configuration files will be generated using defaults applicable to most installations.
+Left=17
+Right=295
+Top=58
+Bottom=76
+
+[Field 6]
+Type=Label
+Text=You may choose the installation directory.  The configuration defaults will be displayed and you will be given the chance to make changes before the configuration files are written.
+Left=17
+Right=295
+Top=94
+Bottom=122
diff --git a/bacula/src/win32/installer/InstallType.nsh b/bacula/src/win32/installer/InstallType.nsh
new file mode 100644
index 0000000000..d219f733d2
--- /dev/null
+++ b/bacula/src/win32/installer/InstallType.nsh
@@ -0,0 +1,141 @@
+Function EnterInstallType
+  Push $R0
+  Push $R1
+  Push $R2
+
+  ; Check if this is an upgrade by looking for an uninstaller configured 
+  ; in the registry.
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString"
+
+  ${If} "$R0" != ""
+    ; Processing Upgrade - Get Install Directory
+    ${GetParent} $R0 $OldInstallDir
+
+    ; Check registry for new installer
+    ReadRegStr $R0 HKLM "Software\Bacula" "InstallLocation"
+    ${If} "$R0" != ""
+      ; New Installer 
+      StrCpy $InstallType ${UpgradeInstall}
+
+      SetShellVarContext all
+
+      StrCpy $R1 "$APPDATA\Bacula"
+      StrCpy $R2 "$INSTDIR\Doc"
+
+      ; Debugging code
+      ${If} "$R0" != "$OldInstallDir"
+        DetailPrint "Uninstall directory = $OldInstallDir, Install Location = $R0"
+        StrCpy $OldInstallDir $R0
+      ${EndIf}
+
+      ReadRegDWORD $PreviousComponents HKLM "Software\Bacula" "Components"
+
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "A previous installation has been found in $OldInstallDir.  Please choose the installation type for any additional components you select."
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The configuration files for additional components will be generated using defaults applicable to most installations."
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "The configuration defaults for additional components will be displayed and you will be given the chance to make changes before the configuration files are written."
+    ${Else}
+      ; Old Installer 
+      StrCpy $InstallType ${MigrateInstall}
+      StrCpy $R1 "$OldInstallDir\bin"
+      StrCpy $R2 "$OldInstallDir\Doc"
+
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "An old installation has been found in $OldInstallDir.  The Configuration will be migrated.  Please choose the installation type for any additional components you select."
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" 'The software will be installed in the default directory "$PROGRAMFILES\Bacula".  The configuration files for additional components will be generated using defaults applicable to most installations.'
+      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "You may choose the installation directory.  The configuration defaults will be displayed and you will be given the chance to make changes before the configuration files are written."
+    ${EndIf}
+  ${Else}
+    ; New Install
+    StrCpy $InstallType ${NewInstall}
+    WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" 'The software will be installed in the default directory "$PROGRAMFILES\Bacula".  The configuration files will be generated using defaults applicable to most installations.'
+  ${EndIf}
+
+  ${If} $InstallType <> ${NewInstall}
+  ${AndIf} $PreviousComponents = 0
+    ${If} ${FileExists} "$R1\bacula-fd.conf"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentFile}
+    ${EndIf}
+    ${If} ${FileExists} "$R1\bconsole.conf"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentTextConsole}
+    ${EndIf}
+    ${If} ${FileExists} "$R1\wx-console.conf"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentGUIConsole}
+    ${EndIf}
+    ${If} ${FileExists} "$R2\bacula.pdf"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentPDFDocs}
+    ${EndIf}
+    ${If} ${FileExists} "$R2\bacula\bacula.html"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
+    ${EndIf}
+    ${If} ${FileExists} "$R2\bacula.html"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
+    ${EndIf}
+  ${EndIf}
+
+  !InsertMacro MUI_HEADER_TEXT "$(TITLE_InstallType)" "$(SUBTITLE_InstallType)"
+  !InsertMacro MUI_INSTALLOPTIONS_INITDIALOG "InstallType.ini"
+  Pop $HDLG ;HWND of dialog
+
+  !insertmacro MUI_INSTALLOPTIONS_SHOW
+
+  ; Process Results
+
+  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "InstallType.ini" "Field 3" "State"
+
+  ${If} $R0 = 1
+    StrCpy $AutomaticInstall 1
+  ${Else}
+    StrCpy $AutomaticInstall 0
+  ${EndIf}
+
+  ${If} $InstallType <> ${NewInstall}
+  ${AndIf} $InitialSelectionDone = 0
+    StrCpy $InitialSelectionDone 1
+
+    IntOp $R1 $PreviousComponents & ${ComponentFile}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecFileDaemon}
+    ${Else}
+      !InsertMacro UnselectSection ${SecFileDaemon}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentStorage}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecStorageDaemon}
+    ${Else}
+      !InsertMacro UnselectSection ${SecStorageDaemon}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentDirector}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecDirectorDaemon}
+    ${Else}
+      !InsertMacro UnselectSection ${SecDirectorDaemon}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentTextConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecConsole}
+    ${Else}
+      !InsertMacro UnselectSection ${SecConsole}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentGUIConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecWxConsole}
+    ${Else}
+      !InsertMacro UnselectSection ${SecWxConsole}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentPDFDocs}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecDocPdf}
+    ${Else}
+      !InsertMacro UnselectSection ${SecDocPdf}
+    ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentHTMLDocs}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecDocHtml}
+    ${Else}
+      !InsertMacro UnselectSection ${SecDocHtml}
+    ${EndIf}
+  ${EndIf}
+
+  Pop $R2
+  Pop $R1
+  Pop $R0
+FunctionEnd
diff --git a/bacula/src/win32/installer/bacula-dir.conf.in b/bacula/src/win32/installer/bacula-dir.conf.in
index 75597e1a87..52a6d64922 100644
--- a/bacula/src/win32/installer/bacula-dir.conf.in
+++ b/bacula/src/win32/installer/bacula-dir.conf.in
@@ -144,7 +144,7 @@ FileSet {
     Options {
       signature = MD5
     }
-    File = @working_dir@/bacula.sql
+    File = "@working_dir@/bacula.sql"
   }
 }
 
diff --git a/bacula/src/win32/installer/bacula-fd.conf.in b/bacula/src/win32/installer/bacula-fd.conf.in
index ae13dad416..52a17df504 100644
--- a/bacula/src/win32/installer/bacula-fd.conf.in
+++ b/bacula/src/win32/installer/bacula-fd.conf.in
@@ -13,8 +13,8 @@
 FileDaemon {                            # this is me
   Name = @client_name@
   FDport = @client_port@                # where we listen for the director
-  WorkingDirectory = @working_dir@
-  Pid Directory = @working_dir@
+  WorkingDirectory = "@working_dir@"
+  Pid Directory = "@working_dir@"
   Maximum Concurrent Jobs = @client_maxjobs@
 }
 
diff --git a/bacula/src/win32/installer/bacula-logo.bmp b/bacula/src/win32/installer/bacula-logo.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..9a9cf9709902a287c4c98a5004e81cc4ed9153b4
GIT binary patch
literal 26046
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
J6M<C({vWumnpFS*

literal 0
HcmV?d00001

diff --git a/bacula/src/win32/installer/installer.vcproj b/bacula/src/win32/installer/installer.vcproj
index 74670164bb..33982113ad 100644
--- a/bacula/src/win32/installer/installer.vcproj
+++ b/bacula/src/win32/installer/installer.vcproj
@@ -112,6 +112,14 @@
 			RelativePath=".\ConfigPage2.nsh"
 			>
 		</File>
+		<File
+			RelativePath=".\InstallType.ini"
+			>
+		</File>
+		<File
+			RelativePath=".\InstallType.nsh"
+			>
+		</File>
 		<File
 			RelativePath=".\winbacula.nsi"
 			>
diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 73fc306734..12fb3ecbcb 100644
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -39,28 +39,33 @@
 ;
 ; Include the Modern UI
 ;
+
 !include "MUI.nsh"
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !include "Sections.nsh"
 !include "StrFunc.nsh"
+!include "WinMessages.nsh"
 
 ;
 ; Basics
 ;
-  Name "Bacula"
-  OutFile "winbacula-${VERSION}.exe"
-  SetCompressor lzma
-  InstallDir "$PROGRAMFILES\Bacula"
-  InstallDirRegKey HKLM Software\Bacula InstallLocation
+Name "Bacula"
+OutFile "winbacula-${VERSION}.exe"
+SetCompressor lzma
+InstallDir "$PROGRAMFILES\Bacula"
+InstallDirRegKey HKLM "Software\Bacula" "InstallLocation"
+
+InstType "Client"
+InstType "Server"
+InstType "Full"
 
-  InstType "Client"
-  InstType "Server"
-  InstType "Full"
+!insertmacro GetParent
 
-  ${StrCase}
-  ${StrRep}
-  ${StrTrimNewLines}
+${StrCase}
+${StrRep}
+${StrTok}
+${StrTrimNewLines}
 
 ;
 ; Pull in pages
@@ -69,10 +74,16 @@
 !define      MUI_COMPONENTSPAGE_SMALLDESC
 !define      MUI_FINISHPAGE_NOAUTOCLOSE
 
+!define      MUI_HEADERIMAGE
+!define      MUI_BGCOLOR                739AB9
+!define      MUI_HEADERIMAGE_BITMAP     "bacula-logo.bmp"
+
 !InsertMacro MUI_PAGE_WELCOME
 ;  !InsertMacro MUI_PAGE_LICENSE "..\..\LICENSE"
-
+Page custom EnterInstallType
+!define      MUI_PAGE_CUSTOMFUNCTION_SHOW PageComponentsShow
 !InsertMacro MUI_PAGE_COMPONENTS
+!define      MUI_PAGE_CUSTOMFUNCTION_PRE PageDirectoryPre
 !InsertMacro MUI_PAGE_DIRECTORY
 Page custom EnterConfigPage1 LeaveConfigPage1
 Page custom EnterConfigPage2 LeaveConfigPage2
@@ -140,6 +151,39 @@ Var ConfigMonitorPassword
 Var LocalDirectorPassword
 Var LocalHostAddress
 
+Var AutomaticInstall
+Var InstallType
+!define NewInstall      0
+!define UpgradeInstall  1
+!define MigrateInstall  2
+
+Var InitialSelectionDone
+Var OldInstallDir
+Var PreviousComponents
+Var NewComponents
+
+; Bit 0 = File Service
+;     1 = Storage Service
+;     2 = Director Service
+;     3 = Command Console
+;     4 = Graphical Console
+;     5 = Documentation (PDF)
+;     6 = Documentation (HTML)
+
+!define ComponentFile                   1
+!define ComponentStorage                2
+!define ComponentDirector               4
+!define ComponentTextConsole            8
+!define ComponentGUIConsole             16
+!define ComponentPDFDocs                32
+!define ComponentHTMLDocs               64
+
+!define ComponentsRequiringUserConfig           31
+!define ComponentsFileAndStorage                3
+!define ComponentsFileAndStorageAndDirector     7
+!define ComponentsDirectorAndTextGuiConsoles    28
+!define ComponentsTextAndGuiConsoles            24
+
 Var HDLG
 Var HCTL
 
@@ -155,6 +199,12 @@ Function .onInit
   StrCpy $DependenciesDone 0
   StrCpy $DatabaseDone 0
   StrCpy $OsIsNT 0
+  StrCpy $AutomaticInstall 0
+  StrCpy $InstallType ${NewInstall}
+  StrCpy $OldInstallDir ""
+  StrCpy $PreviousComponents 0
+  StrCpy $NewComponents 0
+  StrCpy $InitialSelectionDone 0
 
   ${GetParameters} $R0
 
@@ -185,21 +235,17 @@ Function .onInit
     StrCpy $OsIsNT 1
   ${EndIf}
 
-;  ${If} $OsIsNT = 0
-;    Call DisableServerSections
-;  ${EndIf}
-
   Call GetComputerName
   Pop $HostName
 
   Call GetHostName
   Pop $LocalHostAddress
-  
+
   Call GetUserName
   Pop $ConfigDirectorMailAddress
 
   ; Configuration Defaults
-  ;
+
   StrCpy $ConfigClientName              "$HostName-fd"
   StrCpy $ConfigClientPort              "9102"
   StrCpy $ConfigClientMaxJobs           "2"
@@ -230,6 +276,7 @@ Function .onInit
   File "/oname=$PLUGINSDIR\libeay32.dll" "${DEPKGS_BIN}\libeay32.dll"
   File "/oname=$PLUGINSDIR\ssleay32.dll" "${DEPKGS_BIN}\ssleay32.dll"
   File "/oname=$PLUGINSDIR\sed.exe" "${DEPKGS_BIN}\sed.exe"
+  File "/oname=$PLUGINSDIR\InstallType.ini" "InstallType.ini"
 
   SetPluginUnload alwaysoff
 
@@ -279,6 +326,10 @@ Function .onInit
   Pop $R0
 FunctionEnd
 
+Function .onSelChange
+  Call UpdateComponentUI
+FunctionEnd
+
 Function CopyDependencies
   SetOutPath "$INSTDIR\bin"
 
@@ -347,9 +398,11 @@ Function InstallDatabase
 FunctionEnd
 
 Section "-Initialize"
-  ; Create Start Menu Directory
+  WriteRegStr   HKLM Software\Bacula InstallLocation "$INSTDIR"
 
-  WriteRegStr HKLM Software\Bacula InstallLocation "$INSTDIR"
+  Call GetSelectedComponents
+  Pop $R2
+  WriteRegDWORD HKLM Software\Bacula Components $R2
 
   SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\Bacula"
@@ -390,7 +443,6 @@ Section "-Initialize"
 
   Call IsDirectorSelected
   Pop $R2
-
   ${If} $R2 = 1
     FileWrite $R1 "s;@director_address@;$LocalHostAddress;$\r$\n"
   ${Else}
@@ -455,7 +507,7 @@ Section "-Initialize"
 
 SectionEnd
 
-SectionGroup "Client"
+SectionGroup "Client" SecGroupClient
 
 Section "File Service" SecFileDaemon
   SectionIn 1 2 3
@@ -464,16 +516,17 @@ Section "File Service" SecFileDaemon
 
   File "${BACULA_BIN}\bacula-fd.exe"
 
-  StrCpy $R0 0
-  StrCpy $R1 "$APPDATA\Bacula\bacula-fd.conf"
-  IfFileExists $R1 0 +3
-    StrCpy $R0 1
-    StrCpy $R1 "$R1.new"
-
-  File "/oname=$PLUGINSDIR\bacula-fd.conf.in" "bacula-fd.conf.in"
+  ${If} $InstallType = ${MigrateInstall}
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"
+    CopyFiles "$OldInstallDir\bin\bacula-fd.conf" "$APPDATA\Bacula"
+  ${Else}
+    ${Unless} ${FileExists} "$APPDATA\Bacula\bacula-fd.conf"
+      File "/oname=$PLUGINSDIR\bacula-fd.conf.in" "bacula-fd.conf.in"
 
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-fd.conf.in"'
-  CopyFiles "$PLUGINSDIR\bacula-fd.conf.in" "$R1"
+      nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-fd.conf.in"'
+      CopyFiles "$PLUGINSDIR\bacula-fd.conf.in" "$APPDATA\Bacula\bacula-fd.conf"
+    ${EndIf}
+  ${EndIf}
 
   ${If} $OsIsNT = 1
     nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$R1" /G SYSTEM:F Administrators:F'
@@ -483,7 +536,7 @@ Section "File Service" SecFileDaemon
   StrCpy $1 "File Service"
   StrCpy $2 $ConfigClientInstallService
   StrCpy $3 $ConfigClientStartService
-  
+
   Call InstallDaemon
 
   CreateShortCut "$SMPROGRAMS\Bacula\Edit Client Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bacula-fd.conf"'
@@ -491,7 +544,7 @@ SectionEnd
 
 SectionGroupEnd
 
-SectionGroup "Server"
+SectionGroup "Server" SecGroupServer
 
 Section "Storage Service" SecStorageDaemon
   SectionIn 2 3
@@ -512,16 +565,12 @@ Section "Storage Service" SecStorageDaemon
   File "${BACULA_BIN}\scsilist.exe"
   File /oname=mtx-changer.cmd ${SCRIPT_DIR}\mtx-changer.cmd
 
-  StrCpy $R0 0
-  StrCpy $R1 "$APPDATA\Bacula\bacula-sd.conf"
-  IfFileExists $R1 0 +3
-    StrCpy $R0 1
-    StrCpy $R1 "$R1.new"
-
-  File "/oname=$PLUGINSDIR\bacula-sd.conf.in" "bacula-sd.conf.in"
+  ${Unless} ${FileExists} "$APPDATA\Bacula\bacula-sd.conf"
+    File "/oname=$PLUGINSDIR\bacula-sd.conf.in" "bacula-sd.conf.in"
 
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-sd.conf.in"'
-  CopyFiles "$PLUGINSDIR\bacula-sd.conf.in" "$R1"
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-sd.conf.in"'
+    CopyFiles "$PLUGINSDIR\bacula-sd.conf.in" "$APPDATA\Bacula\bacula-sd.conf"
+  ${EndUnless}
 
   ${If} $OsIsNT = 1
     nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$R1" /G SYSTEM:F Administrators:F'
@@ -579,16 +628,11 @@ Section "Director Service" SecDirectorDaemon
   File ${CATS_DIR}\make_catalog_backup.cmd
   File ${CATS_DIR}\delete_catalog_backup.cmd
 
-  StrCpy $R0 0
-  StrCpy $R1 "$APPDATA\Bacula\bacula-dir.conf"
-  IfFileExists $R1 0 +3
-    StrCpy $R0 1
-    StrCpy $R1 "$R1.new"
-
-  File "/oname=$PLUGINSDIR\bacula-dir.conf.in" "bacula-dir.conf.in"
-
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-dir.conf.in"'
-  CopyFiles "$PLUGINSDIR\bacula-dir.conf.in" "$R1"
+  ${Unless} ${FileExists} "$APPDATA\Bacula\bacula-dir.conf"
+    File "/oname=$PLUGINSDIR\bacula-dir.conf.in" "bacula-dir.conf.in"
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bacula-dir.conf.in"'
+    CopyFiles "$PLUGINSDIR\bacula-dir.conf.in" "$APPDATA\Bacula\bacula-dir.conf"
+  ${EndUnless}
 
   ${If} $OsIsNT = 1
     nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$R1" /G SYSTEM:F Administrators:F'
@@ -605,7 +649,7 @@ SectionEnd
 
 SectionGroupEnd
 
-SectionGroup "Consoles"
+SectionGroup "Consoles" SecGroupConsoles
 
 Section "Command Console" SecConsole
   SectionIn 1 2 3
@@ -615,16 +659,16 @@ Section "Command Console" SecConsole
   File "${BACULA_BIN}\bconsole.exe"
   Call CopyDependencies
 
-  StrCpy $R0 0
-  StrCpy $R1 "$APPDATA\Bacula\bconsole.conf"
-  IfFileExists $R1 0 +3
-    StrCpy $R0 1
-    StrCpy $R1 "$R1.new"
-
-  File "/oname=$PLUGINSDIR\bconsole.conf.in" "bconsole.conf.in"
-
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bconsole.conf.in"'
-  CopyFiles "$PLUGINSDIR\bconsole.conf.in" "$R1"
+  ${If} $InstallType = ${MigrateInstall}
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bconsole.conf"
+    CopyFiles "$OldInstallDir\bin\bconsole.conf" "$APPDATA\Bacula"
+  ${Else}
+    ${Unless} ${FileExists} "$APPDATA\Bacula\bconsole.conf"
+      File "/oname=$PLUGINSDIR\bconsole.conf.in" "bconsole.conf.in"
+      nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\bconsole.conf.in"'
+      CopyFiles "$PLUGINSDIR\bconsole.conf.in" "$APPDATA\Bacula\bconsole.conf"
+    ${EndUnless}
+  ${EndIf}
 
   ${If} $OsIsNT = 1
     nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$R1" /G SYSTEM:F Administrators:F'
@@ -655,16 +699,16 @@ Section "Graphical Console" SecWxConsole
 
   File "${BACULA_BIN}\wx-console.exe"
 
-  StrCpy $R0 0
-  StrCpy $R1 "$APPDATA\Bacula\wx-console.conf"
-  IfFileExists $R1 0 +3
-    StrCpy $R0 1
-    StrCpy $R1 "$R1.new"
-
-  File "/oname=$PLUGINSDIR\wx-console.conf.in" "wx-console.conf.in"
-
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\wx-console.conf.in"'
-  CopyFiles "$PLUGINSDIR\wx-console.conf.in" "$R1"
+  ${If} $InstallType = ${MigrateInstall}
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\wx-console.conf"
+    CopyFiles "$OldInstallDir\bin\wx-console.conf" "$APPDATA\Bacula"
+  ${Else}
+    ${Unless} ${FileExists} "$APPDATA\Bacula\wx-console.conf"
+      File "/oname=$PLUGINSDIR\wx-console.conf.in" "wx-console.conf.in"
+      nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\wx-console.conf.in"'
+      CopyFiles "$PLUGINSDIR\wx-console.conf.in" "$APPDATA\Bacula\wx-console.conf"
+    ${EndUnless}
+  ${EndIf}
 
   ${If} $OsIsNT = 1
     nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$R1" /G SYSTEM:F Administrators:F'
@@ -677,7 +721,7 @@ SectionEnd
 
 SectionGroupEnd
 
-SectionGroup "Documentation"
+SectionGroup "Documentation" SecGroupDocumentation
 
 Section "Documentation (Acrobat Format)" SecDocPdf
   SectionIn 1 2 3
@@ -704,40 +748,54 @@ SectionEnd
 SectionGroupEnd
 
 Section "-Write Uninstaller"
+  Push $R0
   ; Write the uninstall keys for Windows & create Start Menu entry
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "InstallLocation" "$INSTDIR"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayVersion" "${VERSION}"
+  ${StrTok} $R0 "${VERSION}" "." 0 0
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMajor" $R0
+  ${StrTok} $R0 "${VERSION}" "." 1 0
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMinor" $R0
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoRepair" 1
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://sourceforge.net/project/showfiles.php?group_id=50727"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.bacula.org"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.bacula.org/?page=support"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   CreateShortCut "$SMPROGRAMS\Bacula\Uninstall Bacula.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+  Pop $R0
 SectionEnd
 
-;
 ; Extra Page descriptions
-;
 
-  LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
-  LangString DESC_SecStorageDaemon ${LANG_ENGLISH} "Install Bacula Storage Daemon on this system."
-  LangString DESC_SecDirectorDaemon ${LANG_ENGLISH} "Install Bacula Director Daemon on this system."
-  LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."
-  LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."
-  LangString DESC_SecDocPdf ${LANG_ENGLISH} "Install documentation in Acrobat format on this system."
-  LangString DESC_SecDocHtml ${LANG_ENGLISH} "Install documentation in HTML format on this system."
-
-  LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
-  LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
-
-  LangString TITLE_ConfigPage2 ${LANG_ENGLISH} "Configuration (continued)"
-  LangString SUBTITLE_ConfigPage2 ${LANG_ENGLISH} "Set installation configuration."
-
-  !InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecStorageDaemon} $(DESC_SecStorageDaemon)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecDirectorDaemon} $(DESC_SecDirectorDaemon)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecWxConsole} $(DESC_SecWxConsole)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocPdf} $(DESC_SecDocPdf)
-    !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocHtml} $(DESC_SecDocHtml)
-  !InsertMacro MUI_FUNCTION_DESCRIPTION_END
+LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
+LangString DESC_SecStorageDaemon ${LANG_ENGLISH} "Install Bacula Storage Daemon on this system."
+LangString DESC_SecDirectorDaemon ${LANG_ENGLISH} "Install Bacula Director Daemon on this system."
+LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."
+LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."
+LangString DESC_SecDocPdf ${LANG_ENGLISH} "Install documentation in Acrobat format on this system."
+LangString DESC_SecDocHtml ${LANG_ENGLISH} "Install documentation in HTML format on this system."
+
+LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
+LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
+
+LangString TITLE_ConfigPage2 ${LANG_ENGLISH} "Configuration (continued)"
+LangString SUBTITLE_ConfigPage2 ${LANG_ENGLISH} "Set installation configuration."
+
+LangString TITLE_InstallType ${LANG_ENGLISH} "Installation Type"
+LangString SUBTITLE_InstallType ${LANG_ENGLISH} "Choose installation type."
+
+!InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecStorageDaemon} $(DESC_SecStorageDaemon)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDirectorDaemon} $(DESC_SecDirectorDaemon)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecWxConsole} $(DESC_SecWxConsole)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocPdf} $(DESC_SecDocPdf)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocHtml} $(DESC_SecDocHtml)
+!InsertMacro MUI_FUNCTION_DESCRIPTION_END
 
 ; Uninstall section
 
@@ -750,7 +808,6 @@ Section "Uninstall"
   nsExec::ExecToLog '"$INSTDIR\bin\bacula-dir.exe" /kill'
   Sleep 3000
 
-
   ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-fd"
   ${If} $R0 = 1
     ; Remove bacula service
@@ -805,8 +862,8 @@ Function InstallDaemon
   Call CopyDependencies
 
   IfFileExists "$APPDATA\Bacula\$0.conf" 0 +4
-    nsExec::ExecToLog '"$INSTDIR\bin\$0.exe" /silent /kill'     ; Shutdown any bacula that could be running
-    nsExec::ExecToLog '"$INSTDIR\bin\$0.exe" /silent /remove'   ; Remove existing service
+    nsExec::ExecToLog '"$OldInstallDir\bin\$0.exe" /silent /kill'     ; Shutdown any bacula that could be running
+    nsExec::ExecToLog '"$OldInstallDir\bin\$0.exe" /silent /remove'   ; Remove existing service
     Sleep 3000
 
   WriteRegDWORD HKLM "Software\Bacula" "Service_$0" $2
@@ -834,124 +891,209 @@ Function InstallDaemon
 FunctionEnd
 
 Function GetComputerName
-  Push $0
-  Push $1
-  Push $2
+  Push $R0
+  Push $R1
+  Push $R2
 
-  System::Call "kernel32::GetComputerNameA(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
+  System::Call "kernel32::GetComputerNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2"
 
-  StrCpy $2 $0
-  ${StrCase} $0 $2 "L"
+  ${StrCase} $R0 $R0 "L"
 
-  Pop $2
-  Pop $1
-  Exch $0
+  Pop $R2
+  Pop $R1
+  Exch $R0
 FunctionEnd
 
 !define ComputerNameDnsFullyQualified   3
 
 Function GetHostName
-  Push $0
-  Push $1
-  Push $2
+  Push $R0
+  Push $R1
+  Push $R2
 
   ${If} $OsIsNT = 1
-    System::Call "kernel32::GetComputerNameExA(i ${ComputerNameDnsFullyQualified}, t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2 ?e"
-    ${If} $2 = 0
-      Pop $2
-      DetailPrint "GetComputerNameExA failed - LastError = $2"
+    System::Call "kernel32::GetComputerNameExA(i ${ComputerNameDnsFullyQualified}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
+    ${If} $R2 = 0
+      Pop $R2
+      DetailPrint "GetComputerNameExA failed - LastError = $R2"
       Call GetComputerName
-      Pop $0
+      Pop $R0
     ${Else}
-      Pop $2
+      Pop $R2
     ${EndIf}
   ${Else}
     Call GetComputerName
-    Pop $0
+    Pop $R0
   ${EndIf}
 
-  Pop $2
-  Pop $1
-  Exch $0
+  Pop $R2
+  Pop $R1
+  Exch $R0
 FunctionEnd
 
 !define NameUserPrincipal 8
 
 Function GetUserName
-  Push $0
-  Push $1
-  Push $2
+  Push $R0
+  Push $R1
+  Push $R2
 
   ${If} $OsIsNT = 1
-    System::Call "secur32::GetUserNameExA(i ${NameUserPrincipal}, t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2 ?e"
-    ${If} $2 = 0
-      Pop $2
-      DetailPrint "GetUserNameExA failed - LastError = $2"
-      Pop $0
-      StrCpy $0 ""
+    System::Call "secur32::GetUserNameExA(i ${NameUserPrincipal}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
+    ${If} $R2 = 0
+      Pop $R2
+      DetailPrint "GetUserNameExA failed - LastError = $R2"
+      Pop $R0
+      StrCpy $R0 ""
     ${Else}
-      Pop $2
+      Pop $R2
     ${EndIf}
   ${Else}
-      StrCpy $0 ""
+      StrCpy $R0 ""
   ${EndIf}
 
-  ${If} $0 == ""
-    System::Call "advapi32::GetUserNameA(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2 ?e"
-    ${If} $2 = 0
-      Pop $2
-      DetailPrint "GetUserNameA failed - LastError = $2"
-      StrCpy $0 ""
+  ${If} $R0 == ""
+    System::Call "advapi32::GetUserNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
+    ${If} $R2 = 0
+      Pop $R2
+      DetailPrint "GetUserNameA failed - LastError = $R2"
+      StrCpy $R0 ""
     ${Else}
-      Pop $2
+      Pop $R2
     ${EndIf}
   ${EndIf}
 
-  Pop $2
-  Pop $1
-  Exch $0
+  Pop $R2
+  Pop $R1
+  Exch $R0
 FunctionEnd
 
-Function IsClientSelected
-  Push $0
-  SectionGetFlags ${SecFileDaemon} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  Exch $0
+Function IsDirectorSelected
+  Push $R0
+  SectionGetFlags ${SecDirectorDaemon} $R0
+  IntOp $R0 $R0 & ${SF_SELECTED}
+  Exch $R0
 FunctionEnd
 
-Function IsDirectorSelected
-  Push $0
-  SectionGetFlags ${SecDirectorDaemon} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  Exch $0
+Function GetSelectedComponents
+  Push $R0
+  StrCpy $R0 0
+  ${If} ${SectionIsSelected} ${SecFileDaemon}
+    IntOp $R0 $R0 | ${ComponentFile}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecStorageDaemon}
+    IntOp $R0 $R0 | ${ComponentStorage}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecDirectorDaemon}
+    IntOp $R0 $R0 | ${ComponentDirector}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecConsole}
+    IntOp $R0 $R0 | ${ComponentTextConsole}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecWxConsole}
+    IntOp $R0 $R0 | ${ComponentGUIConsole}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecDocPdf}
+    IntOp $R0 $R0 | ${ComponentPDFDocs}
+  ${EndIf}
+  ${If} ${SectionIsSelected} ${SecDocHtml}
+    IntOp $R0 $R0 | ${ComponentHTMLDocs}
+  ${EndIf}
+  Exch $R0
 FunctionEnd
 
-Function IsStorageSelected
-  Push $0
-  SectionGetFlags ${SecStorageDaemon} $0
-  IntOp $R0 $R0 & ${SF_SELECTED}
-  Exch $0
+Function PageComponentsShow
+  ${If} $OsIsNT != 1
+    Call DisableServerSections
+  ${EndIf}
+
+  Call UpdateComponentUI
 FunctionEnd
 
-Function IsConsoleSelected
-  Push $0
-  Push $1
-  SectionGetFlags ${SecConsole} $0
-  SectionGetFlags ${SecWxConsole} $1
-  IntOp $0 $0 | $1
-  IntOp $0 $0 & ${SF_SELECTED}
-  Pop $1
-  Exch $0
+Function PageDirectoryPre
+  ${If} $AutomaticInstall = 1
+  ${OrIf} $InstallType = ${UpgradeInstall}
+    Abort
+  ${EndIf}
 FunctionEnd
 
-!If 0 = 1
 Function DisableServerSections
+  !InsertMacro UnselectSection ${SecGroupServer}
+  !InsertMacro SetSectionFlag ${SecGroupServer} ${SF_RO}
   !InsertMacro UnselectSection ${SecStorageDaemon}
-  !InsertMacro SetSectionFlag ${SecStorageDaemon} SF_RO
+  !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_RO}
   !InsertMacro UnselectSection ${SecDirectorDaemon}
-  !InsertMacro SetSectionFlag ${SecDirectorDaemon} SF_RO
+  !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_RO}
+FunctionEnd
+
+Function UpdateComponentUI
+  Push $R0
+  Push $R1
+
+  Call GetSelectedComponents
+  Pop $R0
+
+  IntOp $R1 $R0 ^ $PreviousComponents
+  IntOp $NewComponents $R0 & $R1
+
+  ${If} $InstallType <> ${NewInstall}
+    IntOp $R1 $NewComponents & ${ComponentFile}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentStorage}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecStorageDaemon} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecStorageDaemon} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentDirector}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecDirectorDaemon} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecDirectorDaemon} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentTextConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecConsole} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentGUIConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentPDFDocs}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_BOLD}
+    ${EndIf}
+    IntOp $R1 $NewComponents & ${ComponentHTMLDocs}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_BOLD}
+    ${EndIf}
+  ${EndIf}
+
+  GetDlgItem $R0 $HWNDPARENT 1
+
+  IntOp $R1 $NewComponents & ${ComponentsRequiringUserConfig}
+  ${If} $R1 = 0
+    SendMessage $R0 ${WM_SETTEXT} 0 "STR:Install"
+  ${Else}
+    SendMessage $R0 ${WM_SETTEXT} 0 "STR:&Next >"
+  ${EndIf}
+
+  Pop $R1
+  Pop $R0
 FunctionEnd
-!EndIf
 
+!include "InstallType.nsh"
 !include "ConfigPage1.nsh"
 !include "ConfigPage2.nsh"
diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj
index 8afe01fe58..177630bb42 100644
--- a/bacula/src/win32/libbac/libbac.vcproj
+++ b/bacula/src/win32/libbac/libbac.vcproj
@@ -66,6 +66,7 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="..\..\..\..\depkgs-msvc\lib"
 				ModuleDefinitionFile="msvc\bacula.def"
+				GenerateDebugInformation="true"
 				ImportLibrary="$(TargetDir)libbac.lib"
 			/>
 			<Tool
@@ -1587,11 +1588,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\lib\protos.h"
+				RelativePath="..\..\findlib\protos.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\findlib\protos.h"
+				RelativePath="..\..\lib\protos.h"
 				>
 			</File>
 			<File
diff --git a/bacula/src/win32/stored/baculasd/winservice.cpp b/bacula/src/win32/stored/baculasd/winservice.cpp
index e0d72a7eea..7f3f0cbf57 100644
--- a/bacula/src/win32/stored/baculasd/winservice.cpp
+++ b/bacula/src/win32/stored/baculasd/winservice.cpp
@@ -145,8 +145,9 @@ bacService::RunningAsService()
 BOOL
 bacService::KillRunningCopy()
 {
-  while (PostToBacula(WM_CLOSE, 0, 0))
-      {  }
+  while (PostToBacula(WM_CLOSE, 0, 0)) {
+     Sleep(500);
+  }
   return TRUE;
 }
 
-- 
2.39.5