Download files from http://binary.dmdirc.com/ not http://shanemcc.co.uk/dmdirc-binaries/

Rework Windows installer a bit so that the JRE Downloader has a UAC Manifest (Thus no longer requiring vistas work around for files with "install" in the name)
Add Vista.pas which changes the fonts of the downloader to Vista fonts, and gives Vista native message dialogs
Make the UAC Manifest also have a dependancy on ComCtls v6, Now the buttons and progress bars in the downloader look native (on XP and Vista, previously the looked liek Win9X or so)
Edit some of the messages given in popup boxes.
In theory the Setup.exe will now compile in delphi on windows aswell (altho in practice this is still a PITA)
Add missing license header to launcher.dpr
Windows Launchers also have the ComCtl v6 dependancy, and the vista native dialogs (and the version has been bumped up 1)


git-svn-id: http://svn.dmdirc.com/trunk@4174 00569f92-eb28-0410-84fd-f71c24880f

installer/osx/makeInstallerOSX.sh

@@ -373,7 +373,7 @@ if [ "" = "${HDIUTIL}" ]; then
 
 	# Compres it \o
 	if [ ! -e "${PWD}/compress-dmg" ]; then
-		wget http://shanemcc.co.uk/dmdirc-binaries/dmg -O compress-dmg
+		wget http://binary.dmdirc.com/dmg -O compress-dmg
 		chmod a+x compress-dmg
 	fi;
 	if [ ! -e "${PWD}/compress-dmg" ]; then

installer/windows/Launcher.dpr

@@ -1,3 +1,27 @@
+{*
+ * This application launches the dmdirc java-based installer.
+ * 
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *}
 program Launcher;
 {$MODE Delphi}
 {$APPTYPE GUI}

installer/windows/Setup.dpr

@@ -23,7 +23,12 @@
  * SOFTWARE.
  *}
 program Setup;
-{$MODE Delphi}
+
+{$R most.res}
+
+{$IFDEF FPC}
+	{$MODE Delphi}
+{$ENDIF}
 // Use this instead of {$APPTYPE XXX}
 // APP_XXX is the same as {$APPTYPE XXX}
 // Defaults to console
@@ -56,8 +61,8 @@ program Setup;
 // {$UNDEF LAZARUS}
 
 uses 
-	{$IFDEF LAZARUS}Interfaces, Forms, ComCtrls, Buttons, Messages, Controls, StdCtrls,{$ENDIF}
-	Windows, SysUtils, classes, registry, strutils;
+	{$IFDEF LAZARUS}Interfaces, Forms, ComCtrls, Buttons, Messages, Controls, StdCtrls, {$ENDIF}
+	Vista, Windows, SysUtils, classes, registry, strutils {$IFNDEF FPC},masks{$ENDIF};
 
 {$IFDEF LAZARUS}
 	type
@@ -122,8 +127,10 @@ var
 		CancelButton.Caption := 'Cancel';
 		CancelButton.onClick := self.onButtonClick;
 		
-		self.Caption := pChar('DMDirc Setup - '+CaptionLabel.Caption);;
+		self.Caption := pChar('DMDirc Setup');
 		Application.Title := self.Caption;
+		
+		SetVistaFonts(self);
 	end;
 	
 	procedure TProgressForm.onButtonClick(Sender: TObject);
@@ -135,17 +142,17 @@ var
 	begin
 		ProgressBar.Position := value;
 		CaptionLabel.Caption := pchar('Downloading JRE - '+inttostr(value)+'%');
-		self.Caption := pChar('DMDirc Setup - '+CaptionLabel.Caption);;
+		self.Caption := pChar('DMDirc Setup - '+CaptionLabel.Caption);
 		Application.Title := self.Caption;
 	end;
 {$ENDIF}
 
 function askQuestion(Question: String): boolean;
 begin
-	Result := MessageBox(0, PChar(Question), 'DMDirc Setup', MB_YESNO or MB_ICONQUESTION) = IDYES;
+	Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
 end;
 
-procedure showError(ErrorMessage: String; addFooter: boolean = true);
+procedure showError(ErrorMessage: String; addFooter: boolean = true; includeDescInXP: boolean = true);
 begin
 	if IsConsole then begin
 		writeln('');
@@ -161,32 +168,33 @@ begin
 			writeln('please feel free to contact us.');
 		end;
 		writeln('-----------------------------------------------------------------------');
-		readln();
+		readln;
 	end
 	else begin
 		if addFooter then begin
 			ErrorMessage := ErrorMessage+#13#10;
 			ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
-			ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
+			if not IsWindowsVista then ErrorMessage := ErrorMessage+#13#10;
+			ErrorMessage := ErrorMessage+'please feel free to contact us.';
 		end;
 		
-		MessageBox(0, PChar(ErrorMessage), 'Sorry, setup is unable to continue', MB_OK + MB_ICONSTOP);
+		TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue.', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, includeDescInXP, false);
 	end;
 end;
 
-procedure showmessage(message: String);
+procedure showmessage(message: String; context:String = 'Information');
 begin
 	if IsConsole then begin
 		writeln('');
 		writeln('-----------------------------------------------------------------------');
-		writeln('Information:!');
+		writeln(context+':');
 		writeln('-----------------------------------------------------------------------');
 		writeln(message);
 		writeln('-----------------------------------------------------------------------');
-		readln();
+		readln;
 	end
 	else begin
-		MessageBox(0, PChar(message), 'DMDirc Setup', MB_OK + MB_ICONINFORMATION);
+		TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
 	end;
 end;
 
@@ -234,6 +242,7 @@ function GetFileSizeByName(name: String): Integer;
 var
 	hand: THandle;
 begin
+	hand := 0;
 	Result := 0;
 	if FileExists(name) then begin
 		try
@@ -241,7 +250,7 @@ begin
 			Result := GetFileSize(hand, nil);
 		finally
 			try
-				CloseHandle(hand);
+				if (hand <> 0) then CloseHandle(hand);
 			except
 				Result := -1;
 			end;
@@ -249,6 +258,23 @@ begin
 	end;
 end;
 
+function DoMatch(Input: String; Wildcard: String): boolean;
+begin
+	{$ifdef FPC}
+		Result := IsWild(Input,Wildcard,True);
+	{$else}
+		Result := MatchesMask(Input,Wildcard);
+	{$endif}
+end;
+
+{$IFNDEF VER150}
+function AnsiMidStr(Source: String; Start: Integer; Count: Integer): String;
+begin
+	// Not perfectly accurate, but does the job
+	Result := Copy(Source, Start, Count);
+end;
+{$ENDIF}
+
 function downloadJRE(message: String = 'Would you like to download the java JRE?'): boolean;
 var
 	ProcessInfo: TProcessInformation;
@@ -275,7 +301,7 @@ begin
 	match := false;
 	while not Eof(f) do begin
 		ReadLn(f, line);
-		match := IsWild(line,'Length:*',True);
+		match := DoMatch(line,'Length:*');
 		if match then break;
 	end;
 	if match then begin
@@ -324,7 +350,18 @@ begin
 					{$ENDIF}
 				end
 				else Result := processResult = 0;
-				if not Result then showError('JRE Download Failed', false);
+				if not Result then begin
+					if not terminateDownload then begin
+						showError('JRE Download Failed', false);
+					end
+					else begin
+						// If the download was cancelled by the form, this error will already
+						// have been given.
+						{$IFNDEF LAZARUS}
+							showError('JRE Download was aborted', false);
+						{$ENDIF}
+					end;
+				end;
 			end;
 		finally
 			bits.free;
@@ -357,7 +394,7 @@ begin
 	if canContinue then begin
 		// Final result of this function is the return value of installing java.
 		if needDownload or askQuestion(question) then begin
-			showmessage('The Java installer will now run. Please follow the instructions given.'+#13#10+'The DMDirc installation will continue afterwards.');
+			showmessage('The Java installer will now run. Please follow the instructions given. '+#13#10+'The DMDirc installation will continue afterwards.');
 			Result := (ExecAndWait('jre.exe') = 0);
 		end;
 	end
@@ -374,7 +411,7 @@ begin
 		Application.Initialize;
 		Application.CreateForm(TProgressForm, form);
 	{$ENDIF}
-		
+	
 	if IsConsole then begin
 		writeln('-----------------------------------------------------------------------');
 		writeln('Welcome to the DMDirc installer.');
@@ -398,7 +435,7 @@ begin
 		if (ExecAndWait(javaCommand+' -version') <> 0) then begin
 			dowriteln('Failed!');
 			if not installJRE(false) then begin
-				showError('Sorry, DMDirc setup can not continue without java', false);
+				showError('DMDirc setup can not continue without java. Please install java and try again', false, false);
 				exit;
 			end;
 		end
@@ -426,7 +463,7 @@ begin
 		if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params) <> 0) then begin
 			dowriteln('Failed!');
 			if not installJRE(true) then begin
-				showError('Sorry, DMDirc setup can not continue without an updated version of java', false);
+				showError('Sorry, DMDirc setup can not continue without an updated version of java.', false, false);
 				exit;
 			end
 			else begin

installer/windows/UAC.manifest

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="UACAwareApplication" type="win32"/>
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="DMDirc Installer" type="win32"/>
+  <description>DMDirc Installer</description>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>

installer/windows/makeInstallerWindows.sh

@@ -255,118 +255,12 @@ fi
 
 echo "	ReleaseNumber: String = '${isRelease}';" > SetupConsts.inc
 
-FILES="DMDirc.jar Setup.exe";
-if [ "" != "${jre}" ]; then
-	if [ ! -e "../common/${jrename}.exe" ]; then
-		echo "Downloading JRE to include in installer"
-		wget ${jre} -O ../common/${jrename}.exe
-	fi
-	ln -sf ../common/${jrename}.exe jre.exe
-	FILES="${FILES} jre.exe"
-fi;
-DELETEFILES=${FILES}
-FPC=`which fpc`
-lazarusDir="/usr/share/lazarus"
-if [ ! -e "${lazarusDir}/lcl" ]; then
-	lazarusDir="/usr/lib/lazarus/"
-fi;
-compilerFlags="-Sd -Twin32 ${compilerFlags}";
-if [ ! -e "Setup.exe"  -o "${compileSetup}" = "true" ]; then
-	echo "Setup.exe does not exist. Lets try and compile it."
-	if [ "${FPC}" = "" ]; then
-		echo "FPC Compiler not found, Setup.exe can not be built."
-		exit 1;
-	else
-		echo "Building Setup.exe..."
-		extraFlags=""
-		if [ -e "${lazarusDir}/lcl" ]; then
-			echo "Using Lazarus"
-			mkdir -p ${PWD}/lazarus-build
-			extraFlags="-dLAZARUS -FU${PWD}/lazarus-build -Fu${PWD}/lazarus-build -Fu${lazarusDir}/lcl/widgetset/ -Fu${lazarusDir}/lcl/interfaces/win32/ -Fu${lazarusDir}/lcl/ -Fi${lazarusDir}/lcl/include/"
-		else
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
-			echo "@        Building installer *WITHOUT* lazarus.        @";
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
-		fi;
-		${FPC} ${compilerFlags} ${extraFlags} Setup.dpr
-		if [ $? -ne 0 ]; then
-			if [ -e "Setup.exe" -a "${useOldSetup}" = "true" ]; then
-				echo "Unable to compile Setup.exe, using existing version."
-			else
-				echo "Unable to compile Setup.exe, terminating."
-				exit 1;
-			fi
-		fi;
-	fi
-fi
-
-ls
-if [ ! -e "Setup.exe" ]; then
-	echo "Still can't find Setup.exe, terminating."
-	exit 1;
-fi
-
-echo "Compressing files.."
-
-#if [ -e "../common/installer.jar" ]; then
-#	ln -sf ../common/installer.jar ./installer.jar
-#	FILES="${FILES} installer.jar"
-#	DELETEFILES="${DELETEFILES} installer.jar"
-#else
-#	echo "[WARNING] Creating installer-less archive - relying on Setup.exe"
-#fi
-
+FILES=""
+# Icon Res file
 if [ -e ${jarPath}"/src/com/dmdirc/res/icon.ico" ]; then
 	ln -sf ${jarPath}"/src/com/dmdirc/res/icon.ico" ./icon.ico
 	FILES="${FILES} icon.ico"
-	DELETEFILES="${DELETEFILES} icon.ico"
-fi
-
-# Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
-if [ ! -e Shortcut.exe ]; then
-	wget http://shanemcc.co.uk/dmdirc-binaries/Shortcut.zip
-	unzip -q Shortcut.zip Shortcut.exe
-	rm Shortcut.zip
-fi
-FILES="${FILES} Shortcut.exe"
-DELETEFILES="${DELETEFILES} Shortcut.exe"
-
-if [ "${isRelease}" != "" ]; then
-	DOCSDIR=${jarPath}
-else
-	DOCSDIR="../common"
 fi
-
-if [ -e "${DOCSDIR}/README.TXT" ]; then
-	ln -sf "${DOCSDIR}/README.TXT" .
-	FILES="${FILES} README.TXT"
-	DELETEFILES="${DELETEFILES} README.TXT"
-fi
-
-if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
-	ln -sf "${DOCSDIR}/CHANGES.TXT" .
-	FILES="${FILES} CHANGES.TXT"
-	DELETEFILES="${DELETEFILES} CHANGES.TXT"
-elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
-	ln -sf "${DOCSDIR}/CHANGELOG.TXT" .
-	FILES="${FILES} CHANGELOG.TXT"
-	DELETEFILES="${DELETEFILES} CHANGELOG.TXT"
-fi
-
-if [ -e "${jarPath}/launcher/windows" ]; then
-	# Try to compile all
-	olddir=${PWD}
-	cd "${jarPath}/launcher/windows/"
-	sh compile.sh
-	cd ${olddir}
-	# Now add to file list.
-	for thisfile in `ls -1 ${jarPath}/launcher/windows/*.exe`; do
-		ln -sf ${thisfile} .
-		FILES="${FILES} ${thisfile}"
-	done
-fi
-
-# Icon Res file
 echo "icon.ico ICON icon.ico" > icon.rc
 
 # Other resources
@@ -468,6 +362,116 @@ cat uninstallversion.rc >> all.rc
 cat icon.rc >> uninstall.rc
 windres -F pe-i386 -i uninstall.rc -o uninstall.res
 
+cat UAC.rc > all.rc
+cat version.rc >> all.rc
+cat files.rc >> all.rc
+cat icon.rc >> all.rc
+# Build later after extractor.exe exists
+
+cat UAC.rc > most.rc
+cat version.rc >> most.rc
+cat icon.rc >> most.rc
+
+windres -F pe-i386 -i most.rc -o most.res
+
+FILES="${FILES} DMDirc.jar Setup.exe";
+if [ "" != "${jre}" ]; then
+	if [ ! -e "../common/${jrename}.exe" ]; then
+		echo "Downloading JRE to include in installer"
+		wget ${jre} -O ../common/${jrename}.exe
+	fi
+	ln -sf ../common/${jrename}.exe jre.exe
+	FILES="${FILES} jre.exe"
+fi;
+DELETEFILES=${FILES}
+FPC=`which fpc`
+lazarusDir="/usr/share/lazarus"
+if [ ! -e "${lazarusDir}/lcl" ]; then
+	lazarusDir="/usr/lib/lazarus/"
+fi;
+
+compilerFlags="-Sd -Twin32 ${compilerFlags}";
+if [ ! -e "Setup.exe"  -o "${compileSetup}" = "true" ]; then
+	echo "Setup.exe does not exist. Lets try and compile it."
+	if [ "${FPC}" = "" ]; then
+		echo "FPC Compiler not found, Setup.exe can not be built."
+		exit 1;
+	else
+		echo "Building Setup.exe..."
+		extraFlags=""
+		if [ -e "${lazarusDir}/lcl" ]; then
+			echo "Using Lazarus"
+			mkdir -p ${PWD}/lazarus-build
+			extraFlags="-dLAZARUS -FU${PWD}/lazarus-build -Fu${PWD}/lazarus-build -Fu${lazarusDir}/lcl/widgetset/ -Fu${lazarusDir}/lcl/interfaces/win32/ -Fu${lazarusDir}/lcl/ -Fi${lazarusDir}/lcl/include/"
+		else
+			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
+			echo "@        Building installer *WITHOUT* lazarus.        @";
+			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
+		fi;
+		${FPC} ${compilerFlags} ${extraFlags} Setup.dpr
+		if [ $? -ne 0 ]; then
+			if [ -e "Setup.exe" -a "${useOldSetup}" = "true" ]; then
+				echo "Unable to compile Setup.exe, using existing version."
+			else
+				echo "Unable to compile Setup.exe, terminating."
+				exit 1;
+			fi
+		fi;
+	fi
+fi
+
+ls
+if [ ! -e "Setup.exe" ]; then
+	echo "Still can't find Setup.exe, terminating."
+	exit 1;
+fi
+
+echo "Compressing files.."
+
+# Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
+if [ ! -e Shortcut.exe ]; then
+	wget http://binary.dmdirc.com/Shortcut.zip
+	unzip -q Shortcut.zip Shortcut.exe
+	rm Shortcut.zip
+fi
+FILES="${FILES} Shortcut.exe"
+DELETEFILES="${DELETEFILES} Shortcut.exe"
+
+if [ "${isRelease}" != "" ]; then
+	DOCSDIR=${jarPath}
+else
+	DOCSDIR="../common"
+fi
+
+if [ -e "${DOCSDIR}/README.TXT" ]; then
+	ln -sf "${DOCSDIR}/README.TXT" .
+	FILES="${FILES} README.TXT"
+	DELETEFILES="${DELETEFILES} README.TXT"
+fi
+
+if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
+	ln -sf "${DOCSDIR}/CHANGES.TXT" .
+	FILES="${FILES} CHANGES.TXT"
+	DELETEFILES="${DELETEFILES} CHANGES.TXT"
+elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
+	ln -sf "${DOCSDIR}/CHANGELOG.TXT" .
+	FILES="${FILES} CHANGELOG.TXT"
+	DELETEFILES="${DELETEFILES} CHANGELOG.TXT"
+fi
+
+if [ -e "${jarPath}/launcher/windows" ]; then
+	# Try to compile all
+	olddir=${PWD}
+	cd "${jarPath}/launcher/windows/"
+	sh compile.sh
+	cd ${olddir}
+	# Now add to file list.
+	for thisfile in `ls -1 ${jarPath}/launcher/windows/*.exe`; do
+		ln -sf ${thisfile} .
+		FILES="${FILES} ${thisfile}"
+	done
+fi
+
 ${FPC} ${compilerFlags} ${3}Uninstaller.dpr
 if [ -e "Uninstaller.exe" ]; then
 	FILES="${FILES} Uninstaller.exe"
@@ -476,7 +480,7 @@ fi
 
 # Add wget to allow downloading jre
 if [ ! -e "wget.exe" ]; then
-	wget http://shanemcc.co.uk/dmdirc-binaries/wget.exe
+	wget http://binary.dmdirc.com/wget.exe
 fi;
 
 if [ ! -e "wget.exe" ]; then
@@ -502,7 +506,7 @@ echo ";!@InstallEnd@!" >> 7zip.conf
 
 if [ ! -e "7zS.sfx" ]; then
 	echo "Obtaining sfx stub.."
-	wget http://shanemcc.co.uk/dmdirc-binaries/7zS.sfx
+	wget http://binary.dmdirc.com/7zS.sfx
 fi
 
 if [ ! -e "7zS.sfx" ]; then
@@ -556,10 +560,6 @@ if [ "${MD5SUM}" != "" ]; then
 	echo "end;" >> ExtractCode.inc
 fi
 
-cat UAC.rc > all.rc
-cat version.rc >> all.rc
-cat files.rc >> all.rc
-cat icon.rc >> all.rc
 windres -F pe-i386 -i all.rc -o all.res
 
 ${FPC} ${compilerFlags} ${3}Launcher.dpr

launcher/windows/DMDirc.dpr

@@ -2,10 +2,33 @@ program DMDirc;
 {$MODE Delphi}
 {$APPTYPE GUI}
 
+{$R comctl.rc}
 {$R icon.rc}
 {$R version.rc}
 
-uses Windows, SysUtils, classes, StrUtils;
+uses Windows, SysUtils, classes, StrUtils, Vista;
+
+function askQuestion(Question: String): boolean;
+begin
+	Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+end;
+
+procedure showError(ErrorMessage: String; addFooter: boolean = true);
+begin
+	if addFooter then begin
+		ErrorMessage := ErrorMessage+#13#10;
+		ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
+		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
+	end;
+	
+	TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, true);
+end;
+
+procedure showmessage(message: String; context:String = 'Information');
+begin
+	TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+end;
+
 
 // Run an application and wait for it to finish.
 function ExecAndWait(sProgramToRun: String): Longword;
@@ -52,7 +75,7 @@ begin
 end;
 
 const
-	launcherVersion: String = '1';
+	launcherVersion: String = '2';
 var
 	errorMessage: String;
 	javaCommand: String = 'javaw.exe';
@@ -96,7 +119,7 @@ begin
 				errorMessage := errorMessage+#13#10;
 				errorMessage := errorMessage+#13#10+'Please click ''Allow'' on the UAC prompt to complete the update, or click no';
 				errorMessage := errorMessage+#13#10+'here to continue without updating.';
-				if MessageBox(0, PChar(errorMessage), 'Windows Vista', MB_YESNO) = IDYES then begin
+				if askQuestion(errorMessage) then begin
 					RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
 				end;
 			end
@@ -116,7 +139,7 @@ begin
 			errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
 			errorMessage := errorMessage+#13#10+'please feel free to contact us.';
 			
-			MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
+			showError(errorMessage);
 		end
 		// Else try and run client. (This only asks for help output to check that client
 		// runs on this OS, otherwise later segfaults or so would cause the error to
@@ -131,7 +154,7 @@ begin
 				errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
 				errorMessage := errorMessage+#13#10+'please feel free to contact us.';
 				
-				MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
+				showError(errorMessage);
 			end
 			else begin
 				Launch(javaCommand+' -ea -jar "'+jarName+'"'+' -l windows-'+launcherVersion+' '+cliParams)
@@ -139,7 +162,7 @@ begin
 		end
 		else begin
 			errorMessage := 'Your DMDirc installation has been broken. DMDirc.jar no longer exists.';
-			MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
+			showError(errorMessage);
 		end;
 	end;
 end.

launcher/windows/DMDircUpdater.dpr

@@ -4,7 +4,28 @@ program DMDircUpdater;
 
 {$R UAC.rc}
 
-uses Windows, SysUtils, classes, StrUtils;
+uses Windows, SysUtils, classes, StrUtils, Vista;
+
+function askQuestion(Question: String): boolean;
+begin
+	Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+end;
+
+procedure showError(ErrorMessage: String; addFooter: boolean = true);
+begin
+	if addFooter then begin
+		ErrorMessage := ErrorMessage+#13#10;
+		ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
+		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
+	end;
+	
+	TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, true);
+end;
+
+procedure showmessage(message: String; context:String = 'Information');
+begin
+	TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+end;
 
 // Run an application and don't wait for it to finish.
 procedure Launch(sProgramToRun: String);
@@ -57,32 +78,32 @@ begin
 					Launch('"'+thisDir+'\DMDircLauncherUpdater.exe" '+cliParams);
 				end
 				else begin
-					MessageBox(0, 'Unable to overwrite launcher', 'Launcher Update Failed', MB_ICONSTOP);
+					showmessage('Unable to overwrite launcher', 'Update Failed');
 				end;
 			end
 			else begin
 				launcherUpdate := true;
 				if FileExists(pchar(thisDir+'\DMDirc.exe')) then begin
 					if not DeleteFile(pchar(thisDir+'\DMDirc.exe')) then begin
-						MessageBox(0, 'Unable to delete DMDirc.exe', 'Update Failed', MB_ICONSTOP);
+						showmessage('Unable to delete DMDirc.exe', 'Launcher Update Failed');
 					end;
 				end;
 				
 				if not FileExists(pchar(thisDir+'\DMDirc.exe')) and MoveFile(pchar(sourceDir+'\.DMDirc.exe'), pchar(thisDir+'\DMDirc.exe')) then begin
 					if FileExists(pchar(thisDir+'\DMDircUpdater.exe')) then begin
 						if not DeleteFile(pchar(thisDir+'\DMDircUpdater.exe')) then begin
-							MessageBox(0, 'Unable to delete DMDircUpdater.exe', 'Update Failed', MB_ICONSTOP);
+							showmessage('Unable to delete DMDircUpdater.exe', 'Launcher Update Failed');
 						end;
 					end;
 					if not FileExists(pchar(thisDir+'\DMDircUpdater.exe')) and MoveFile(pchar(sourceDir+'\.DMDircUpdater.exe'), pchar(thisDir+'\DMDircUpdater.exe')) then begin
-						MessageBox(0, 'Launcher update was successful.', 'Launcher Update Completed', MB_OK);
+						showmessage('Launcher update was successful');
 					end
 					else begin
-						MessageBox(0, pchar('Unable to update DMDircUpdater.exe'), 'Launcher Update Failed', MB_ICONSTOP);
+						showmessage('Unable to update DMDircUpdater.exe', 'Launcher Update Failed');
 					end;
 				end
 				else begin
-					MessageBox(0, pchar('Unable to update DMDirc.exe'), 'Launcher Update Failed', MB_ICONSTOP);
+					showmessage('Unable to update DMDirc.exe', 'Launcher Update Failed');
 				end;
 			end;
 		end;
@@ -92,24 +113,24 @@ begin
 			if FileExists(pchar(sourceDir+'\.DMDirc.jar')) then begin
 				if FileExists(pchar(jarName)) then begin
 					if not DeleteFile(pchar(jarName)) then begin
-						MessageBox(0, 'Unable to delete DMDirc.jar', 'Update Failed', MB_ICONSTOP);
+						showmessage('Unable to update DMDirc.jar', 'Launcher Update Failed');
 					end;
 				end;
 				
 				if MoveFile(pchar(sourceDir+'\.DMDirc.jar'), pchar(jarName)) then begin
-					MessageBox(0, 'Client update was successful.', 'Update Completed', MB_OK);
+					showmessage('Client update was successful');
 				end
 				else begin
-					MessageBox(0, pchar('Unable to move '''+sourceDir+'\.DMDirc.jar'' to '+jarName), 'Update Failed', MB_ICONSTOP);
+					showmessage('Unable to move '''+sourceDir+'\.DMDirc.jar'' to '+jarName, 'Update Failed');
 				end;
 			end;
 			
 			if launcherUpdate then begin
-				MessageBox(0, 'The DMDirc launcher has been updated, to complete the update please relaunch DMDirc.', 'Restart Required', MB_OK);
+				showmessage('The DMDirc launcher has been updated, to complete the update please relaunch DMDirc.', 'Restart Required');
 			end;
 		end;
 	end
 	else begin
-		MessageBox(0, 'This program can not be run on its own.', 'Error', MB_ICONSTOP);
+		showError('This program can not be run on its own.');
 	end;
 end.

launcher/windows/UAC.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="UACAwareApplication" type="win32"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="requireAdministrator"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

launcher/windows/UAC.rc

@@ -1 +0,0 @@
-1 24 "UAC.manifest"

launcher/windows/comctl.manifest

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="DMDirc Updater" type="win32"/>
+  <description>DMDirc Updater</description>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+</assembly>

launcher/windows/comctl.rc

@@ -0,0 +1 @@
+1 24 "comctl.manifest"

launcher/windows/compile.sh

@@ -1,8 +1,11 @@
 #!/bin/sh
+rm Vista.pas UAC.manifest UAC.rc
+cp ../../installer/windows/Vista.pas ../../installer/windows/UAC.manifest  ../../installer/windows/UAC.rc .
+
 rm -Rf ./*.exe
 fpc -Sd -Twin32 DMDirc.dpr
 fpc -Sd -Twin32 DMDircUpdater.dpr
-rm -Rf ./*.o ./*.or
+rm -Rf ./*.o ./*.or ./*.ppu
 if [ -e DMDircUpdater.exe -a -e DMDirc.exe ]; then
 	exit 0;
 else