Updated the installer script, which removes the need for Trackbar.dll.

Setup/zonebuilder_setup.iss

@@ -7,7 +7,7 @@ AppVerName=Zone Builder 0.1
 AppPublisher=MascaraSnake
 AppPublisherURL=http://mb.srb2.org/member.php?u=3131
 ;AppSupportURL=http://forum.zdoom.org/viewtopic.php?f=3&t=32392
-;AppUpdatesURL=http://forum.zdoom.org/viewtopic.php?f=3&t=32392
+;AppUpdatesURL=http://devbuilds.drdteam.org/doombuilder2-gzdb/
 DefaultDirName={pf}\Zone Builder
 DefaultGroupName=Zone Builder
 AllowNoIcons=true
@@ -23,7 +23,7 @@ PrivilegesRequired=admin
 ShowLanguageDialog=no
 LanguageDetectionMethod=none
 MinVersion=0,5.01.2600
-UninstallDisplayIcon={app}\Builder.exe
+UninstallDisplayIcon={app}\Updater.exe
 WizardImageFile=..\Setup\WizModernImage-IS.bmp
 WizardSmallImageFile=..\Setup\WizModernSmallImage-IS.bmp
 
@@ -35,6 +35,8 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
 
 [Files]
 Source: Setup\dotnetfx35setup.exe; DestDir: {tmp}; Flags: dontcopy
+Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
+Source: Setup\vcredist_x86.exe; DestDir: {tmp}; Flags: dontcopy
 Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
 Source: ZoneBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion
 Source: Updater.exe; DestDir: {app}; Flags: ignoreversion
@@ -43,7 +45,6 @@ Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion
 Source: DevIL.dll; DestDir: {app}; Flags: ignoreversion
 Source: SharpCompress.3.5.dll; DestDir: {app}; Flags: ignoreversion
 Source: Scintilla.dll; DestDir: {app}; Flags: ignoreversion
-Source: Trackbar.dll; DestDir: {app}; Flags: ignoreversion
 Source: SlimDX.dll; DestDir: {app}; Flags: ignoreversion
 Source: GPL.txt; DestDir: {app}; Flags: ignoreversion
 Source: Compilers\*; DestDir: {app}\Compilers; Flags: ignoreversion recursesubdirs
@@ -57,11 +58,13 @@ Source: Plugins\ColorPicker.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\CommentsPanel.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\NodesViewer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\SoundPropagationMode.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\StairSectorBuilder.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\TagExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\TagRange.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\VisplaneExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
 Source: Plugins\Loadorder.cfg; DestDir: {app}\Plugins; Flags: ignoreversion onlyifdoesntexist
 Source: Sprites\*; DestDir: {app}\Sprites; Flags: ignoreversion recursesubdirs
+Source: Textures\*; DestDir: {app}\Textures; Flags: ignoreversion
 
 [Icons]
 Name: {group}\Zone Builder; Filename: {app}\Builder.exe
@@ -90,11 +93,16 @@ var
 	page_info_dx: TOutputMsgWizardPage;
 	page_info_dxfailed: TOutputMsgWizardPage;
 	page_setup_dx: TOutputProgressWizardPage;
+	page_info_vc: TOutputMsgWizardPage;
+	page_info_vcfailed: TOutputMsgWizardPage;
+	page_setup_vc: TOutputProgressWizardPage;
 	restartneeded: Boolean;
 	netinstallfailed: Boolean;
 	netisinstalled: Boolean;
 	dxinstallfailed: Boolean;
 	dxisinstalled: Boolean;
+	vcinstallfailed: Boolean;
+	vcisinstalled: Boolean;
 
 // Prerequisites checks
 function CheckNetIsInstalled(): Boolean;
@@ -108,6 +116,7 @@ var
 	MajorVer, MinorVer: Integer;
 	StartPos: Integer;
 	TempStr, VerStr: string;
+	HasRequiredDll : Boolean;
 begin
 	if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\DirectX', 'Version', VerStr)) then begin
 		(* Extract major version *)
@@ -120,13 +129,25 @@ begin
 		(* Extract minor version *)
 		MinorVer := StrToInt(Copy(TempStr, 1, StartPos - 1));
 
-    Result := (MajorVer > 4) or ((MajorVer = 4) and (MinorVer >= 9));
+		//mxd. The DX version alone is not accurate enough...
+		HasRequiredDll := FileExists(ExpandConstant('{syswow64}\d3dx9_43.dll'));
+
+		Result := ((MajorVer > 4) or ((MajorVer = 4) and (MinorVer >= 9))) and HasRequiredDll;
 	end
 	else begin
 		Result := false;
 	end;
 end;
 
+function CheckVCIsInstalled(): Boolean;
+begin
+	//mxd. Any VC++ 2008 package will do, I assume...
+	//mxd. Registry values gartered from http://blogs.msdn.com/b/astebner/archive/2009/01/29/9384143.aspx
+	Result := RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}') or
+			  RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}') or
+			  RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}');
+end;
+
 // When the wizard initializes
 procedure InitializeWizard();
 begin
@@ -135,6 +156,8 @@ begin
 	netisinstalled := CheckNetIsInstalled();
 	dxinstallfailed := false;
 	dxisinstalled := CheckDXVersion();
+	vcinstallfailed := false;
+	vcisinstalled := CheckVCIsInstalled();
 
 	// Create .NET Framework pages
 	page_info_net := CreateOutputMsgPage(wpPreparing,
@@ -150,7 +173,7 @@ begin
 		'Setup could not install the Microsoft .NET Framework  3.5.' + #10 + #10 +
 		'Click Back to try again, or Cancel to exit Setup.');
 
-	page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework 3.5', 'Setup is installing Microsoft .NET Framework 3.5, please wait.....');
+	page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework 3.5', 'Setup is installing Microsoft .NET Framework 3.5, please wait...');
 
 	// Create DirectX pages
 	page_info_dx := CreateOutputMsgPage(wpPreparing,
@@ -166,7 +189,21 @@ begin
 		'Setup could not install DirectX 9.0.' + #10 + #10 +
 		'Click Back to try again, or Cancel to exit Setup.');
 
-	page_setup_dx := CreateOutputProgressPage('Installing DirectX 9.0', 'Setup is installing DirectX 9.0, please wait.....');
+	page_setup_dx := CreateOutputProgressPage('Installing DirectX 9.0', 'Setup is installing DirectX 9.0, please wait...');
+
+	// Create VC++ 2008 pages
+	page_info_vc := CreateOutputMsgPage(wpPreparing,
+		'Installing Visual C++ 2008 SP1 ATL Security Update', '',
+		'Setup has detected that your system is missing the required version of the Visual C++ Runtime. ' +
+		'Setup will now install or update your Visual C++ Runtime. This may take several minutes to complete.' + #10 + #10 +
+		'Click Install to begin.');
+
+	page_info_vcfailed := CreateOutputMsgPage(page_info_net.ID,
+		'Installing Visual C++ 2008 SP1 ATL Security Update', '',
+		'Setup could not install Visual C++ 2008 SP1 ATL Security Update.' + #10 + #10 +
+		'Click Back to try again, or Cancel to exit Setup.');
+
+	page_setup_vc := CreateOutputProgressPage('Installing Visual C++ 2008 SP1 ATL Security Update', 'Setup is installing Visual C++ 2008 SP1 ATL Security Update, please wait...');
 end;
 
 // This is called to check if a page must be skipped
@@ -180,6 +217,10 @@ begin
 		Result := dxisinstalled
 	else if(PageID = page_info_dxfailed.ID) then
 		Result := (not dxinstallfailed) and dxisinstalled
+	else if(PageID = page_info_vc.ID) then // Skip VC++ pages?
+		Result := vcisinstalled
+	else if(PageID = page_info_vcfailed.ID) then
+		Result := (not vcinstallfailed) and vcisinstalled
 	else
 		Result := false;
 end;
@@ -194,13 +235,13 @@ end;
 procedure CurPageChanged(CurPageID: Integer);
 begin
 	if(CurPageID = wpReady) then begin
-		if(netisinstalled = false) or (dxisinstalled = false) then
+		if(netisinstalled = false) or (dxisinstalled = false) or (vcisinstalled = false) then
 			WizardForm.NextButton.Caption := 'Next';
 	end
-	else if(CurPageID = page_info_net.ID) or (CurPageID = page_info_dx.ID) then begin
+	else if(CurPageID = page_info_net.ID) or (CurPageID = page_info_dx.ID) or (CurPageID = page_info_vc.ID) then begin
 		WizardForm.NextButton.Caption := 'Install';
 	end
-	else if(CurPageID = page_info_netfailed.ID) or (CurPageID = page_info_dxfailed.ID) then begin
+	else if(CurPageID = page_info_netfailed.ID) or (CurPageID = page_info_dxfailed.ID) or (CurPageID = page_info_vcfailed.ID) then begin
 		WizardForm.NextButton.Visible := true;
 		WizardForm.NextButton.Enabled := false;
 		WizardForm.BackButton.Visible := true;
@@ -259,7 +300,7 @@ begin
 			// See the return codes here: http://support.microsoft.com/kb/177430
 			tempfile := RemoveBackslash(GetTempDir()) + '\dxwebsetup.exe';
 			FileCopy(ExpandConstant('{tmp}\dxwebsetup.exe'), tempfile, false);
-			Exec(tempfile, '/silent', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
+			Exec(tempfile, '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
 
 			if(errorcode = 1) then begin
 				// Success, but restart needed!
@@ -274,6 +315,35 @@ begin
 		finally
 			page_setup_dx.Hide;
 		end;
+	end
+	// Next pressed on VC info page?
+	else if(CurPage = page_info_vc.ID) then begin
+		// Show progress page and run setup
+		page_setup_vc.Show;
+		try
+		begin
+			vcinstallfailed := false;
+			ExtractTemporaryFile('vcredist_x86.exe');
+			// We copy the file to the real temp directory so that it isn't removed when Setup is closed.
+			// Judging from the return codes, this installer may want to run again after a reboot.
+			// See the return codes here: http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx
+			tempfile := RemoveBackslash(GetTempDir()) + '\vcredist_x86.exe';
+			FileCopy(ExpandConstant('{tmp}\vcredist_x86.exe'), tempfile, false);
+			Exec(tempfile, '/q /norestart', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
+
+			if(errorcode = 3010) then begin
+				// Success, but restart needed!
+				restartneeded := true;
+			end
+			else if(errorcode <> 0) then begin
+				vcinstallfailed := true;
+			end;
+
+			vcisinstalled := CheckVCIsInstalled();
+		end
+		finally
+			page_setup_vc.Hide;
+		end;
 	end;
 
 	Result := True;
@@ -282,8 +352,12 @@ end;
 //Remove configs?
 procedure DeinitializeUninstall();
 begin
-  if MsgBox('Delete program configuration files?', mbConfirmation, MB_YESNO) = IDYES then
+	if MsgBox('Delete map restore data and program configuration files?', mbConfirmation, MB_YESNO) = IDYES then
 	begin
+		// Remove restore data
+		DelTree(ExpandConstant('{localappdata}\Zone Builder\Restore'), True, True, True);
+
+		// Remove configs
 		DeleteFile(ExpandConstant('{localappdata}\Zone Builder\ZoneBuilder.cfg'));
 		DeleteFile(ExpandConstant('{localappdata}\Zone Builder\ZoneBuilder.log'));
 		DeleteFile(ExpandConstant('{localappdata}\Zone Builder\GZCrash.txt'));