Fix dmdirc.exe dialogs not showing on windows XP, tidy source code

installer/windows/Setup.dpr

@@ -1,138 +1,138 @@
-{*
- * This application launches the dmdirc java-based installer.
- *
- * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes,
- * Michael Nixon
- *
- * 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.
- *}
-
-(* Current DMDirc windows setup flow:
- *
- * 1) Outer wrapper EXE that extracts a 7zip SFX to windows temp dir
- * 2) 7zip SFX unpacks
- * 3) Wrapper EXE starts Setup.exe (this program)
- * 4) Setup checks for existence of the JRE and offers to download/install it
- * 5) Setup starts the java portion of the DMDirc installer
- *)
-program Setup;
-
-// Resource file - icon, versioninfo, manifest
-{$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
-// This is a work-around for a bug in FPC Cross Compiling to windows in delphi
-// mode (IsConsole is always true)
-{$DEFINE APP_GUI}
-
-// This block actually does the work for the above work-around
-{$IFDEF APP_GUI}
-  {$APPTYPE GUI}
-{$ELSE}
-  {$IFDEF APP_FS}
-    {$APPTYPE FS}
-  {$ELSE}
-    {$IFDEF APP_TOOL}
-      {$DEFINE APP_CONSOLE}
-      {$APPTYPE TOOL}
-    {$ELSE}
-      {$DEFINE APP_CONSOLE}
-      {$APPTYPE CONSOLE}
-    {$ENDIF}
-  {$ENDIF}
-{$ENDIF}
-
-{ ----------------------------------------------------------------------------
-  Debugging specific compiler directives
-  ---------------------------------------------------------------------------- }
-
-// If defined the JRE will always be downloaded as if it didn't exist. Used for
-// testing the JRE download dialog.
-//{$DEFINE FORCEJREDOWNLOAD}
-
-uses
-  kol, Vista, Windows, SysUtils, classes, registry;
-
-const
-  // SetupConsts holds build information for this release
-  {$I SetupConsts.inc}
-  // This is also part of the above IsConsole workaround.
-  {$IFDEF APP_CONSOLE}
-    IsConsole: boolean = true;
-  {$ELSE}
-    IsConsole: boolean = false;
-  {$ENDIF}
-
-var
-  { --------------------------------------------------------------------------
-    KOL form objects
-    -------------------------------------------------------------------------- }
-  frmmain: pcontrol;
-  progressbar, btncancel: pcontrol;
-  label1, label2, label3, label4, labelurl, labelspeed, labelprogress: pcontrol;
-
-  { --------------------------------------------------------------------------
-    Other globals
-    -------------------------------------------------------------------------- }
-  terminateDownload: boolean = false;
-
-{ ----------------------------------------------------------------------------
-  Main form: Cancel button clicked event
-  ---------------------------------------------------------------------------- }
-procedure btnCancel_Click(Dummy: Pointer; Sender: PControl);
+{*
+ * This application launches the dmdirc java-based installer.
+ *
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes,
+ * Michael Nixon
+ *
+ * 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.
+ *}
+
+(* Current DMDirc windows setup flow:
+ *
+ * 1) Outer wrapper EXE that extracts a 7zip SFX to windows temp dir
+ * 2) 7zip SFX unpacks
+ * 3) Wrapper EXE starts Setup.exe (this program)
+ * 4) Setup checks for existence of the JRE and offers to download/install it
+ * 5) Setup starts the java portion of the DMDirc installer
+ *)
+program Setup;
+
+// Resource file - icon, versioninfo, manifest
+{$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
+// This is a work-around for a bug in FPC Cross Compiling to windows in delphi
+// mode (IsConsole is always true)
+{$DEFINE APP_GUI}
+
+// This block actually does the work for the above work-around
+{$IFDEF APP_GUI}
+  {$APPTYPE GUI}
+{$ELSE}
+  {$IFDEF APP_FS}
+    {$APPTYPE FS}
+  {$ELSE}
+    {$IFDEF APP_TOOL}
+      {$DEFINE APP_CONSOLE}
+      {$APPTYPE TOOL}
+    {$ELSE}
+      {$DEFINE APP_CONSOLE}
+      {$APPTYPE CONSOLE}
+    {$ENDIF}
+  {$ENDIF}
+{$ENDIF}
+
+{ ----------------------------------------------------------------------------
+  Debugging specific compiler directives
+  ---------------------------------------------------------------------------- }
+
+// If defined the JRE will always be downloaded as if it didn't exist. Used for
+// testing the JRE download dialog.
+//{$DEFINE FORCEJREDOWNLOAD}
+
+uses
+  kol, Vista, Windows, SysUtils, classes, registry;
+
+const
+  // SetupConsts holds build information for this release
+  {$I SetupConsts.inc}
+  // This is also part of the above IsConsole workaround.
+  {$IFDEF APP_CONSOLE}
+    IsConsole: boolean = true;
+  {$ELSE}
+    IsConsole: boolean = false;
+  {$ENDIF}
+
+var
+  { --------------------------------------------------------------------------
+    KOL form objects
+    -------------------------------------------------------------------------- }
+  frmmain: pcontrol;
+  progressbar, btncancel: pcontrol;
+  label1, label2, label3, label4, labelurl, labelspeed, labelprogress: pcontrol;
+
+  { --------------------------------------------------------------------------
+    Other globals
+    -------------------------------------------------------------------------- }
+  terminateDownload: boolean = false;
+
+{ ----------------------------------------------------------------------------
+  Main form: Cancel button clicked event
+  ---------------------------------------------------------------------------- }
+procedure btnCancel_Click(Dummy: Pointer; Sender: PControl);
 begin
   terminateDownload := true;
 end;
-
-{ ----------------------------------------------------------------------------
-  Main form: Set progress percentage to <value> and display in label <msg>
-  ---------------------------------------------------------------------------- }
-procedure setProgress(value: integer; msg: string);
-begin
-  ProgressBar.progress := value;
-  labelprogress.Caption := msg;
-  //self.Caption := pChar('DMDirc Setup - '+CaptionLabel.Caption);
-  //Application.Title := self.Caption;
-  applet.processmessages;
-end;
-
-{ ----------------------------------------------------------------------------
-  Initialise KOL and create the main window
-  ---------------------------------------------------------------------------- }
-procedure CreateMainWindow;
-var
+
+{ ----------------------------------------------------------------------------
+  Main form: Set progress percentage to <value> and display in label <msg>
+  ---------------------------------------------------------------------------- }
+procedure setProgress(value: integer; msg: string);
+begin
+  ProgressBar.progress := value;
+  labelprogress.Caption := msg;
+  //self.Caption := pChar('DMDirc Setup - '+CaptionLabel.Caption);
+  //Application.Title := self.Caption;
+  applet.processmessages;
+end;
+
+{ ----------------------------------------------------------------------------
+  Initialise KOL and create the main window
+  ---------------------------------------------------------------------------- }
+procedure CreateMainWindow;
+var
   screenw, screenh: longint;
-begin
-  { This call is required for common control 6 DLL to be correctly imported.
-    Without it strange things happen on windows XP }
-  InitCommonControls;
-
-  { We need the screen size to centre the window later }
-  screenw := GetSystemMetrics(SM_CXSCREEN);
+begin
+  { This call is required for common control 6 DLL to be correctly imported.
+    Without it strange things happen on windows XP }
+  InitCommonControls;
+
+  { We need the screen size to centre the window later }
+  screenw := GetSystemMetrics(SM_CXSCREEN);
   screenh := GetSystemMetrics(SM_CYSCREEN);
 
   { KOL programs ideally need an Applet created }
@@ -195,27 +195,27 @@ begin
   labelprogress := NewLabel(frmmain, '').SetPosition(70, label3.top + 20);
   labelprogress.SetSize(frmmain.ClientWidth - 32, 16);
   labelprogress.BringToFront;
-
-  { Assign UI methods }
-  btncancel.OnClick := TOnEvent(MakeMethod(nil, @btnCancel_Click ));
-
-  { The window will not appear until the messageloop is started with Run() but
-    this means we must yield this thread to the UI. This is unacceptable for
-    such a simple program. Calling CreateWindow here will cause the window to
-    appear but the message loop does not run; consequently the app must service
-    messages by hand at a timely interval to avoid windows from marking the
-    program as unresponsive. This is a hack but acceptable here. }
-
-  { /!\ WARNING /!\ Run() can no longer be used to enter the message loop after
-    this call or a nasty crash will occur. }
-  applet.createwindow;
-end;
-
-{ ----------------------------------------------------------------------------
-  Takes a size, <dsize> in bytes, and converts it a human readable string with
+
+  { Assign UI methods }
+  btncancel.OnClick := TOnEvent(MakeMethod(nil, @btnCancel_Click ));
+
+  { The window will not appear until the messageloop is started with Run() but
+    this means we must yield this thread to the UI. This is unacceptable for
+    such a simple program. Calling CreateWindow here will cause the window to
+    appear but the message loop does not run; consequently the app must service
+    messages by hand at a timely interval to avoid windows from marking the
+    program as unresponsive. This is a hack but acceptable here. }
+
+  { /!\ WARNING /!\ Run() can no longer be used to enter the message loop after
+    this call or a nasty crash will occur. }
+  applet.createwindow;
+end;
+
+{ ----------------------------------------------------------------------------
+  Takes a size, <dsize> in bytes, and converts it a human readable string with
   a suffix (MB or GB).
-  ---------------------------------------------------------------------------- }
-function nicesize(dsize: extended): string;
+  ---------------------------------------------------------------------------- }
+function nicesize(dsize: extended): string;
 var
   kbytes: single;
   mbytes: single;
@@ -238,322 +238,326 @@ begin
   result := FloatToStrF(gbytes, ffFixed, 10, 2) + ' GB';
   exit;
 end;
-
-{ ----------------------------------------------------------------------------
-  Ask a question and return True for YES and False for NO
-  Uses nifty vista task dialog if available
-  ---------------------------------------------------------------------------- }
-function askQuestion(Question: String): boolean;
-begin
-  Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
-end;
-
-{ ----------------------------------------------------------------------------
-  Show an error message
-  Uses nifty vista task dialog if available
-  ---------------------------------------------------------------------------- }
-procedure showError(ErrorMessage: String; addFooter: boolean = true; includeDescInXP: 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,';
-    if not IsWindowsVista then ErrorMessage := ErrorMessage+#13#10;
-    ErrorMessage := ErrorMessage+'please feel free to contact us.';
-  end;
-  TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue.', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, includeDescInXP, false);
-end;
-
-{ ----------------------------------------------------------------------------
-  Show a message box (information)
-  Uses nifty vista task dialog if available
-  ---------------------------------------------------------------------------- }
-procedure showmessage(message: String; context:String = 'Information');
-begin
-  TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
-end;
-
-{ ----------------------------------------------------------------------------
-  Launch a process (hidden if requested) and immediately return control to
-  the current thread
-  ---------------------------------------------------------------------------- }
-function Launch(sProgramToRun: String; hide: boolean = false): TProcessInformation;
-var
-  StartupInfo: TStartupInfo;
-begin
-  FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
-  with StartupInfo do begin
-    cb := SizeOf(TStartupInfo);
-    dwFlags := STARTF_USESHOWWINDOW;
-    if hide then wShowWindow := SW_HIDE
-    else wShowWindow := SW_SHOWNORMAL;
-  end;
-
-  CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, Result);
-end;
-
-{ ----------------------------------------------------------------------------
-  Launch a process (hidden if requested) and wait for it to finish
-  ---------------------------------------------------------------------------- }
-function ExecAndWait(sProgramToRun: String; hide: boolean = false): Longword;
-var
-  ProcessInfo: TProcessInformation;
-begin
-  ProcessInfo := Launch(sProgramToRun, hide);
-  getExitCodeProcess(ProcessInfo.hProcess, Result);
-
-  while Result = STILL_ACTIVE do begin
-    sleep(1000);
-    GetExitCodeProcess(ProcessInfo.hProcess, Result);
-  end;
-end;
-
-{ ----------------------------------------------------------------------------
-  Return the size in bytes of the file specified by <name>
-  Returns -1 on error
-  ---------------------------------------------------------------------------- }
-function GetFileSizeByName(name: String): Integer;
-var
-  hand: THandle;
-begin
-  hand := 0;
-  Result := 0;
-  if FileExists(name) then begin
-    try
-      hand := CreateFile(PChar(name), GENERIC_READ, FILE_SHARE_WRITE or FILE_SHARE_READ, nil, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-      Result := GetFileSize(hand, nil);
-    finally
-      try
-        if (hand <> 0) then CloseHandle(hand);
-      except
-        Result := -1;
-      end;
-    end;
-  end;
-end;
-
-{$IFNDEF VER150}
-{ ----------------------------------------------------------------------------
-  Return part of a string
-  ---------------------------------------------------------------------------- }
-function AnsiMidStr(Source: String; Start: Integer; Count: Integer): String;
-begin
-  // Not perfectly accurate, but does the job
-  { ^ What does that mean? // Zipplet }
-  Result := Copy(Source, Start, Count);
-end;
-{$ENDIF}
-
-{ ----------------------------------------------------------------------------
-  Downloads the JRE. Returns TRUE if the user installed it. False otherwise
-  ---------------------------------------------------------------------------- }
-function downloadJRE(message: String = 'Would you like to download the java JRE?'): boolean;
-var
-  ProcessInfo: TProcessInformation;
-  processResult: Longword;
-  url: String;
-  dir: String;
-  line: String;
-  f: TextFile;
-  bits: TStringList;
-  match: boolean;
-  wantedsize: double;
-  currentsize: double;
-   lastsize: double;
-   i: double;
-   c: longint;
-begin
-  dir := IncludeTrailingPathDelimiter(ExtractFileDir(paramstr(0)));
-  url := 'http://www.dmdirc.com/getjava/windows/all';
-  Result := false;
-
-  { First we will determine the approximate size of the download.
-    In my opinion we should not do this until we have asked the user if they
-    would like to download the JRE. Might change this later.
-    We obtain the size by asking wget to find out. }
-  ExecAndWait('wget.exe -o "'+dir+'wgetoutput" --spider '+url, true);
-
-  { Just incase wget fails ... }
-  if not fileexists(dir+'wgetoutput') then begin
+
+{ ----------------------------------------------------------------------------
+  Ask a question and return True for YES and False for NO
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
+function askQuestion(Question: String): boolean;
+begin
+  Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+end;
+
+{ ----------------------------------------------------------------------------
+  Show an error message
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
+procedure showError(ErrorMessage: String; addFooter: boolean = true; includeDescInXP: 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,';
+    if not IsWindowsVista then ErrorMessage := ErrorMessage+#13#10;
+    ErrorMessage := ErrorMessage+'please feel free to contact us.';
+  end;
+  TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue.', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, includeDescInXP, false);
+end;
+
+{ ----------------------------------------------------------------------------
+  Show a message box (information)
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
+procedure showmessage(message: String; context:String = 'Information');
+begin
+  TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+end;
+
+{ ----------------------------------------------------------------------------
+  Launch a process (hidden if requested) and immediately return control to
+  the current thread
+  ---------------------------------------------------------------------------- }
+function Launch(sProgramToRun: String; hide: boolean = false): TProcessInformation;
+var
+  StartupInfo: TStartupInfo;
+begin
+  FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+  with StartupInfo do begin
+    cb := SizeOf(TStartupInfo);
+    dwFlags := STARTF_USESHOWWINDOW;
+    if hide then wShowWindow := SW_HIDE
+    else wShowWindow := SW_SHOWNORMAL;
+  end;
+
+  CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, Result);
+end;
+
+{ ----------------------------------------------------------------------------
+  Launch a process (hidden if requested) and wait for it to finish
+  ---------------------------------------------------------------------------- }
+function ExecAndWait(sProgramToRun: String; hide: boolean = false): Longword;
+var
+  ProcessInfo: TProcessInformation;
+begin
+  ProcessInfo := Launch(sProgramToRun, hide);
+  getExitCodeProcess(ProcessInfo.hProcess, Result);
+
+  while Result = STILL_ACTIVE do begin
+    sleep(1000);
+    GetExitCodeProcess(ProcessInfo.hProcess, Result);
+  end;
+end;
+
+{ ----------------------------------------------------------------------------
+  Return the size in bytes of the file specified by <name>
+  Returns -1 on error
+  ---------------------------------------------------------------------------- }
+function GetFileSizeByName(name: String): Integer;
+var
+  hand: THandle;
+begin
+  hand := 0;
+  Result := 0;
+  if FileExists(name) then begin
+    try
+      hand := CreateFile(PChar(name), GENERIC_READ, FILE_SHARE_WRITE or FILE_SHARE_READ, nil, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+      Result := GetFileSize(hand, nil);
+    finally
+      try
+        if (hand <> 0) then CloseHandle(hand);
+      except
+        Result := -1;
+      end;
+    end;
+  end;
+end;
+
+{$IFNDEF VER150}
+{ ----------------------------------------------------------------------------
+  Return part of a string
+  ---------------------------------------------------------------------------- }
+function AnsiMidStr(Source: String; Start: Integer; Count: Integer): String;
+begin
+  // Not perfectly accurate, but does the job
+  { ^ What does that mean? // Zipplet }
+  Result := Copy(Source, Start, Count);
+end;
+{$ENDIF}
+
+{ ----------------------------------------------------------------------------
+  Downloads the JRE. Returns TRUE if the user installed it. False otherwise
+  ---------------------------------------------------------------------------- }
+function downloadJRE(message: String = 'Would you like to download the java JRE?'): boolean;
+var
+  ProcessInfo: TProcessInformation;
+  processResult: Longword;
+  url: String;
+  dir: String;
+  line: String;
+  f: TextFile;
+  bits: TStringList;
+  match: boolean;
+  wantedsize: double;
+  currentsize: double;
+   lastsize: double;
+   i: double;
+   c: longint;
+begin
+  dir := IncludeTrailingPathDelimiter(ExtractFileDir(paramstr(0)));
+  url := 'http://www.dmdirc.com/getjava/windows/all';
+  Result := false;
+
+  { First we will determine the approximate size of the download.
+    In my opinion we should not do this until we have asked the user if they
+    would like to download the JRE. Might change this later.
+    We obtain the size by asking wget to find out. }
+  ExecAndWait('wget.exe -o "'+dir+'wgetoutput" --spider '+url, true);
+
+  { Just incase wget fails ... }
+  if not fileexists(dir+'wgetoutput') then begin
     showerror('Internal error: wget returned no output.');
     result := false;
     exit;
-  end;
-
-  { Parse the output and grab the approximate size }
-  AssignFile(f, dir+'wgetoutput');
-  Reset(f);
-  line := '';
-  match := false;
-  while not Eof(f) do begin
-    ReadLn(f, line);
-    if length(line) > 8 then begin
+  end;
+
+  { Parse the output and grab the approximate size }
+  AssignFile(f, dir+'wgetoutput');
+  Reset(f);
+  line := '';
+  match := false;
+  while not Eof(f) do begin
+    ReadLn(f, line);
+    if length(line) > 8 then begin
       if copy(line, 1, 7) = 'Length:' then begin
         match := true;
         break;
       end;
-    end;
-  end;
-  if match then begin
-    bits := TStringList.create;
-    try
-      bits.Clear;
-      bits.Delimiter := ' ';
-      bits.DelimitedText := line;
-      try
-        wantedsize := strtoint(StringReplace(bits[1], ',', '', [rfReplaceAll]))
-      except
-        wantedsize := 0;
-      end;
-
-      { We ask the user if they wish to download the JRE }
-      if askQuestion(message+' (Download Size: '+AnsiMidStr(bits[2], 2, length(bits[2])-2)+')') then begin
-        { Create progress window and show it }
-        CreateMainWindow;
-        { Get wget to start the download }
-        ProcessInfo := Launch('wget.exe '+url+' -O jre.exe', true);
-        labelurl.caption := url;
-        labelspeed.caption := 'Connecting to site...';
-
-        { Why is this case needed ?! }
-        if wantedsize <= 0 then begin
-          progressbar.progress := 50;
-        end;
-        getExitCodeProcess(ProcessInfo.hProcess, processResult);
-
-        lastsize := 0;
-        c := 0;
-        i := 0;
-        while (processResult = STILL_ACTIVE) and (not terminateDownload) do begin
-          if wantedsize > 0 then begin
-            currentsize := GetFileSizeByName(dir + 'jre.exe');
-            inc(c);
-            if (c >= 5) then begin
-              i := (i + currentsize - lastsize) / 2;
-              labelspeed.caption := nicesize(round(i * 2)) + '/sec';
-              lastsize := currentsize;
-              c := 0;
-            end;
-            if (currentsize > 0) then setProgress(Round((currentsize/wantedsize)*100),
-              nicesize(currentsize) + ' of ' + nicesize(wantedsize) +
-              ' (' + inttostr(Round((currentsize/wantedsize)*100)) + '%)');
-          end;
-          { We must process the message loop or the window wont respond to the user }
-          applet.ProcessMessages;
-          { Sleep to prevent 100% CPU usage }
-          sleep(100);
-          GetExitCodeProcess(ProcessInfo.hProcess, processResult);
-        end;
-        frmmain.visible := false;
-        applet.visible := false;
-        if (terminateDownload) then begin
-          Result := false;
-          TerminateProcess(ProcessInfo.hProcess, 0);
-          showError('JRE Download was aborted', false);
-        end
-        else Result := processResult = 0;
-        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.
-            { No action needed here anymore }
-          end;
-        end;
-      end;
-    finally
-      bits.free;
-    end;
-  end;
-end;
-
+    end;
+  end;
+  if match then begin
+    bits := TStringList.create;
+    try
+      bits.Clear;
+      bits.Delimiter := ' ';
+      bits.DelimitedText := line;
+      try
+        wantedsize := strtoint(StringReplace(bits[1], ',', '', [rfReplaceAll]))
+      except
+        wantedsize := 0;
+      end;
+
+      { We ask the user if they wish to download the JRE }
+      if askQuestion(message+' (Download Size: '+AnsiMidStr(bits[2], 2, length(bits[2])-2)+')') then begin
+        { Create progress window and show it }
+        CreateMainWindow;
+        { Get wget to start the download }
+        ProcessInfo := Launch('wget.exe '+url+' -O jre.exe', true);
+        labelurl.caption := url;
+        labelspeed.caption := 'Connecting to site...';
+
+        { Why is this case needed ?! }
+        if wantedsize <= 0 then begin
+          progressbar.progress := 50;
+        end;
+        getExitCodeProcess(ProcessInfo.hProcess, processResult);
+
+        lastsize := 0;
+        c := 0;
+        i := 0;
+        while (processResult = STILL_ACTIVE) and (not terminateDownload) do begin
+          if wantedsize > 0 then begin
+            currentsize := GetFileSizeByName(dir + 'jre.exe');
+            inc(c);
+            if (c >= 5) then begin
+              i := (i + currentsize - lastsize) / 2;
+              labelspeed.caption := nicesize(round(i * 2)) + '/sec';
+              lastsize := currentsize;
+              c := 0;
+            end;
+            if (currentsize > 0) then setProgress(Round((currentsize/wantedsize)*100),
+              nicesize(currentsize) + ' of ' + nicesize(wantedsize) +
+              ' (' + inttostr(Round((currentsize/wantedsize)*100)) + '%)');
+          end;
+          { We must process the message loop or the window wont respond to the user }
+          applet.ProcessMessages;
+          { Sleep to prevent 100% CPU usage }
+          sleep(100);
+          GetExitCodeProcess(ProcessInfo.hProcess, processResult);
+        end;
+        frmmain.visible := false;
+        applet.visible := false;
+        if (terminateDownload) then begin
+          Result := false;
+          TerminateProcess(ProcessInfo.hProcess, 0);
+          showError('JRE Download was aborted', false);
+        end
+        else Result := processResult = 0;
+        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.
+            { No action needed here anymore }
+          end;
+        end;
+      end;
+    finally
+      bits.free;
+    end;
+  end;
+end;
+
+{ ----------------------------------------------------------------------------
+  Begin the JRE download/install.
+  ---------------------------------------------------------------------------- }
+function installJRE(isUpgrade: boolean): boolean;
+var
+  question: String;
+  needDownload: boolean;
+  canContinue: boolean;
+begin
+  Result := false;
+  needDownload := not FileExists(IncludeTrailingPathDelimiter(ExtractFileDir(paramstr(0)))+'jre.exe');
+  if needDownload then begin
+    if not isUpgrade then question := 'Java was not detected on your machine. Would you like to download and install it now?'
+    else question := 'The version of java detected on your machine is not compatible with DMDirc. Would you like to download and install a compatible version now?';
+  end
+  else begin
+    if not isUpgrade then question := 'Java was not detected on your machine. Would you like to install it now?'
+    else question := 'The version of java detected on your machine is not compatible with DMDirc. Would you like to install a compatible version now?';
+  end;
+
+  canContinue := true;
+  if (needDownload) then begin
+    canContinue := downloadJRE(question);
+  end;
+
+  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.');
+      Result := (ExecAndWait('jre.exe') = 0);
+    end;
+  end
+end;
+
 { ----------------------------------------------------------------------------
-  Begin the JRE download/install.
-  ---------------------------------------------------------------------------- }
-function installJRE(isUpgrade: boolean): boolean;
-var
-  question: String;
-  needDownload: boolean;
-  canContinue: boolean;
-begin
-  Result := false;
-  needDownload := not FileExists(IncludeTrailingPathDelimiter(ExtractFileDir(paramstr(0)))+'jre.exe');
-  if needDownload then begin
-    if not isUpgrade then question := 'Java was not detected on your machine. Would you like to download and install it now?'
-    else question := 'The version of java detected on your machine is not compatible with DMDirc. Would you like to download and install a compatible version now?';
-  end
-  else begin
-    if not isUpgrade then question := 'Java was not detected on your machine. Would you like to install it now?'
-    else question := 'The version of java detected on your machine is not compatible with DMDirc. Would you like to install a compatible version now?';
-  end;
-
-  canContinue := true;
-  if (needDownload) then begin
-    canContinue := downloadJRE(question);
-  end;
-
-  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.');
-      Result := (ExecAndWait('jre.exe') = 0);
-    end;
-  end
-end;
-
-var
-  errorMessage: String;
-  javaCommand: String = 'javaw.exe';
-  params: String = '';
-  dir: String = '';
-  Reg: TRegistry;
-  result: Integer;
-begin
-
-  errorMessage := '';
-  if FileExists('DMDirc.jar') then begin
-    {$IFDEF FORCEJREDOWNLOAD}if (1 <> 0) then begin{$ELSE}if (ExecAndWait(javaCommand+' -version') <> 0) then begin{$ENDIF}
-      if not installJRE(false) then begin
-        showError('DMDirc setup can not continue without Java. Please install Java and try again.', false, false);
-        exit;
-      end;
-    end;
-
-    Reg := TRegistry.Create;
-    Reg.RootKey := HKEY_LOCAL_MACHINE;
-    if Reg.OpenKey('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DMDirc', false) then begin
-      dir := Reg.ReadString('InstallDir');
-      if (dir <> '') then begin
-        params := params+' --directory "'+dir+'"';
-      end;
-    end;
-    Reg.CloseKey;
-    Reg.Free;
-    if (ReleaseNumber <> '') then begin
-      params := params+' --release '+ReleaseNumber;
-    end;
-    // Check if the installer runs
-    if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main --help') <> 0) then begin
-      if not installJRE(true) then begin
-        showError('Sorry, DMDirc setup can not continue without an updated version of java.', false, false);
-        exit;
-      end
-      else begin
-        // Try again now that java is installed.
-        result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
-      end;
-    end
-    else begin
-      // Java is the right version, run the installer
-      result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
-    end;
-  end
-  else begin
-    errorMessage := errorMessage+'DMDirc.jar was not found.';
-    errorMessage := errorMessage+#13#10;
-    errorMessage := errorMessage+#13#10+'This is likely because of a corrupt installer build.';
-    errorMessage := errorMessage+#13#10+'Please check http://www.dmdirc.com/ for an updated build.';
-    showError(errorMessage);
-  end;
-end.
+ 
+  MAIN PROGRAM
+  ---------------------------------------------------------------------------- }
+var
+  errorMessage: String;
+  javaCommand: String = 'javaw.exe';
+  params: String = '';
+  dir: String = '';
+  Reg: TRegistry;
+  result: Integer;
+begin
+
+  errorMessage := '';
+  if FileExists('DMDirc.jar') then begin
+    {$IFDEF FORCEJREDOWNLOAD}if (1 <> 0) then begin{$ELSE}if (ExecAndWait(javaCommand+' -version') <> 0) then begin{$ENDIF}
+      if not installJRE(false) then begin
+        showError('DMDirc setup can not continue without Java. Please install Java and try again.', false, false);
+        exit;
+      end;
+    end;
+
+    Reg := TRegistry.Create;
+    Reg.RootKey := HKEY_LOCAL_MACHINE;
+    if Reg.OpenKey('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DMDirc', false) then begin
+      dir := Reg.ReadString('InstallDir');
+      if (dir <> '') then begin
+        params := params+' --directory "'+dir+'"';
+      end;
+    end;
+    Reg.CloseKey;
+    Reg.Free;
+    if (ReleaseNumber <> '') then begin
+      params := params+' --release '+ReleaseNumber;
+    end;
+    // Check if the installer runs
+    if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main --help') <> 0) then begin
+      if not installJRE(true) then begin
+        showError('Sorry, DMDirc setup can not continue without an updated version of java.', false, false);
+        exit;
+      end
+      else begin
+        // Try again now that java is installed.
+        result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
+      end;
+    end
+    else begin
+      // Java is the right version, run the installer
+      result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
+    end;
+  end
+  else begin
+    errorMessage := errorMessage+'DMDirc.jar was not found.';
+    errorMessage := errorMessage+#13#10;
+    errorMessage := errorMessage+#13#10+'This is likely because of a corrupt installer build.';
+    errorMessage := errorMessage+#13#10+'Please check http://www.dmdirc.com/ for an updated build.';
+    showError(errorMessage);
+  end;
+end.

installer/windows/Vista.pas

@@ -1,83 +1,101 @@
 {*
  * Vista image improvements from http://www.installationexcellence.com/articles/VistaWithDelphi/Original/Index.html
  * and http://www.installationexcellence.com/articles/VistaWithDelphi/Index.html
+ *
+ * This application launches DMDirc on windows and passes control to the
+ * update engine as necessary.
+ *
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes,
+ * Michael Nixon
+ *
+ * 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.
  *}
+{* NOTE: The version in the installer/ directory is the one to edit! *}
 unit Vista;
 
-//{$IFDEF LAZARUS}
-//	{$DEFINE MESSAGEDLG}
-// {$ENDIF}
-
 interface
 
-uses {$IFDEF LAZARUS}Forms, Graphics, Controls,{$IFDEF MESSAGEDLG} Dialogs,{$ENDIF}{$ENDIF} Windows, SysUtils;
+uses Windows, SysUtils;
 
 function IsWindowsVista: Boolean;
 function TaskDialog(const AHandle: THandle; const ATitle, ADescription, AContent: WideString; const Icon, Buttons: integer; includeDescInXP: boolean = false; stripLineFeed: boolean = true): Integer;
-{$IFDEF LAZARUS}
-procedure SetVistaFonts(const AForm: TCustomForm);
-{$ENDIF}
+//procedure SetVistaFonts(const AForm: TCustomForm);
 
 const
-	VistaFont = 'Segoe UI'; 
-	VistaContentFont = 'Calibri';
-	XPContentFont = 'Verdana';
-	XPFont = 'Tahoma';
-
-	TD_ICON_BLANK = 0;
-	TD_ICON_WARNING = 84;
-	TD_ICON_QUESTION = 99;
-	TD_ICON_ERROR = 98;
-	TD_ICON_INFORMATION = 81;
-	TD_ICON_SHIELD_QUESTION = 104;
-	TD_ICON_SHIELD_ERROR = 105;
-	TD_ICON_SHIELD_OK = 106;
-	TD_ICON_SHIELD_WARNING = 107;
-
-	TD_BUTTON_OK = 1;
-	TD_BUTTON_YES = 2;
-	TD_BUTTON_NO = 4;
-	TD_BUTTON_CANCEL = 8;
-	TD_BUTTON_RETRY = 16;
-	TD_BUTTON_CLOSE = 32;
-
-	TD_RESULT_OK = 1;
-	TD_RESULT_CANCEL = 2;
-	TD_RESULT_RETRY = 4;
-	TD_RESULT_YES = 6;
-	TD_RESULT_NO = 7;
-	TD_RESULT_CLOSE = 8;
-	
-	{$IFNDEF LAZARUS}
-		mrNone = 0;
-		mrOK = mrNone + 1;
-		mrCancel = mrNone + 2;
-		mrAbort = mrNone + 3;
-		mrRetry = mrNone + 4;
-		mrYes = mrNone + 6;
-		mrNo = mrNone + 7;
-	{$ENDIF}
+  VistaFont = 'Segoe UI'; 
+  VistaContentFont = 'Calibri';
+  XPContentFont = 'Verdana';
+  XPFont = 'Tahoma';
+
+  TD_ICON_BLANK = 0;
+  TD_ICON_WARNING = 84;
+  TD_ICON_QUESTION = 99;
+  TD_ICON_ERROR = 98;
+  TD_ICON_INFORMATION = 81;
+  TD_ICON_SHIELD_QUESTION = 104;
+  TD_ICON_SHIELD_ERROR = 105;
+  TD_ICON_SHIELD_OK = 106;
+  TD_ICON_SHIELD_WARNING = 107;
+
+  TD_BUTTON_OK = 1;
+  TD_BUTTON_YES = 2;
+  TD_BUTTON_NO = 4;
+  TD_BUTTON_CANCEL = 8;
+  TD_BUTTON_RETRY = 16;
+  TD_BUTTON_CLOSE = 32;
+
+  TD_RESULT_OK = 1;
+  TD_RESULT_CANCEL = 2;
+  TD_RESULT_RETRY = 4;
+  TD_RESULT_YES = 6;
+  TD_RESULT_NO = 7;
+  TD_RESULT_CLOSE = 8;
+  
+  mrNone = 0;
+  mrOK = mrNone + 1;
+  mrCancel = mrNone + 2;
+  mrAbort = mrNone + 3;
+  mrRetry = mrNone + 4;
+  mrYes = mrNone + 6;
+  mrNo = mrNone + 7;
 
 implementation
 
-{$IFDEF LAZARUS}
+{*
 procedure SetVistaFonts(const AForm: TCustomForm);
 begin
-	if IsWindowsVista and not SameText(AForm.Font.Name, VistaFont) and (Screen.Fonts.IndexOf(VistaFont) >= 0) then
-	begin
-		AForm.Font.Size := AForm.Font.Size + 1;
-		AForm.Font.Name := VistaFont;
-	end;
+  if IsWindowsVista and not SameText(AForm.Font.Name, VistaFont) and (Screen.Fonts.IndexOf(VistaFont) >= 0) then
+  begin
+    AForm.Font.Size := AForm.Font.Size + 1;
+    AForm.Font.Name := VistaFont;
+  end;
 end;
-{$ENDIF}
+*}
 
 function IsWindowsVista: Boolean;
 var
-	VerInfo: TOSVersioninfo;
+  VerInfo: TOSVersioninfo;
 begin
-	VerInfo.dwOSVersionInfoSize := SizeOf(TOSVersionInfo);
-	GetVersionEx(VerInfo);
-	Result := VerInfo.dwMajorVersion >= 6;
+  VerInfo.dwOSVersionInfoSize := SizeOf(TOSVersionInfo);
+  GetVersionEx(VerInfo);
+  Result := VerInfo.dwMajorVersion >= 6;
 end;
 
 // http://www.swissdelphicenter.ch/en/showcode.php?id=1692
@@ -90,16 +108,16 @@ function WideStringToString(const ws: WideString; codePage: Word): AnsiString;
 var
   l: integer;
 begin
-	if ws = '' then begin
-		Result := ''
-	end
-	else begin
-		l := WideCharToMultiByte(codePage, WC_COMPOSITECHECK or WC_DISCARDNS or WC_SEPCHARS or WC_DEFAULTCHAR, @ws[1], - 1, nil, 0, nil, nil);
-		SetLength(Result, l - 1);
-		if l > 1 then begin
-			WideCharToMultiByte(codePage, WC_COMPOSITECHECK or WC_DISCARDNS or WC_SEPCHARS or WC_DEFAULTCHAR, @ws[1], - 1, @Result[1], l - 1, nil, nil);
-		end;
-	end;
+  if ws = '' then begin
+    Result := ''
+  end
+  else begin
+    l := WideCharToMultiByte(codePage, WC_COMPOSITECHECK or WC_DISCARDNS or WC_SEPCHARS or WC_DEFAULTCHAR, @ws[1], - 1, nil, 0, nil, nil);
+    SetLength(Result, l - 1);
+    if l > 1 then begin
+      WideCharToMultiByte(codePage, WC_COMPOSITECHECK or WC_DISCARDNS or WC_SEPCHARS or WC_DEFAULTCHAR, @ws[1], - 1, @Result[1], l - 1, nil, nil);
+    end;
+  end;
 end;
 
 
@@ -108,94 +126,94 @@ function TaskDialog(const AHandle: THandle; const ATitle, ADescription, AContent
 type
         tTaskDialogProc = function(HWND: THandle; hInstance: THandle; cTitle, cDescription, cContent: pwidechar; Buttons: Integer; Icon: integer; ResButton: pinteger): integer; stdcall;
 var
-	DLLHandle: THandle;
-	res: integer;
-	wS: WideString;
-	S: String;
-	{$IFDEF MESSAGEDLG}
-	Btns: TMsgDlgButtons;
-	DlgType: TMsgDlgType;
-	{$ELSE}
-	Btns: Integer;
-	myIcon: Integer;
-	{$ENDIF}
-	TaskDialogFound: boolean;
-	TaskDialogProc: tTaskDialogProc;
+  DLLHandle: THandle;
+  res: integer;
+  wS: WideString;
+  S: String;
+  {$IFDEF MESSAGEDLG}
+  Btns: TMsgDlgButtons;
+  DlgType: TMsgDlgType;
+  {$ELSE}
+  Btns: Integer;
+  myIcon: Integer;
+  {$ENDIF}
+  TaskDialogFound: boolean;
+  TaskDialogProc: tTaskDialogProc;
 begin
-	TaskDialogFound := false;
-	Result := 0;
-	if IsWindowsVista then begin
-		DLLHandle := LoadLibrary('comctl32.dll');
-		if DLLHandle >= 32 then begin
-			TaskDialogProc := tTaskDialogProc(GetProcAddress(DLLHandle,'TaskDialog'));
-			
-			if Assigned(TaskDialogProc) then begin
-				
-				if stripLineFeed then begin
-					wS := StringReplace(AContent, #10, '', [rfReplaceAll]);
-					wS := StringReplace(wS, #13, '', [rfReplaceAll]);
-				end
-				else begin
-					wS := AContent;
-				end;
-
-				TaskDialogProc(AHandle, 0, PWideChar(ATitle), PWideChar(ADescription), PWideChar(wS), Buttons, Icon, @res);
-				TaskDialogFound := true;
-				Result := mrOK;
-				case res of
-					TD_RESULT_CANCEL : Result := mrCancel;
-					TD_RESULT_RETRY : Result := mrRetry;
-					TD_RESULT_YES : Result := mrYes;
-					TD_RESULT_NO : Result := mrNo;
-					TD_RESULT_CLOSE : Result := mrAbort;
-				end;
-			end;
-			FreeLibrary(DLLHandle);
-		end;
-	end;
-	
-	if not TaskDialogFound then begin
-		S := '';
-		if includeDescInXP then S := ADescription + #10#13 + #10#13 + AContent else S := AContent;
-		
-		{$IFDEF MESSAGEDLG}
-			Btns := [];
-			if Buttons and TD_BUTTON_OK = TD_BUTTON_OK then Btns := Btns + [MBOK];
-			if Buttons and TD_BUTTON_YES = TD_BUTTON_YES then Btns := Btns + [MBYES];
-			if Buttons and TD_BUTTON_NO = TD_BUTTON_NO then Btns := Btns + [MBNO];
-			if Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL then Btns := Btns + [MBCANCEL];
-			if Buttons and TD_BUTTON_RETRY = TD_BUTTON_RETRY then Btns := Btns + [MBRETRY];
-	
-			if Buttons and TD_BUTTON_CLOSE = TD_BUTTON_CLOSE then Btns := Btns + [MBABORT];
-	
-			DlgType := mtCustom;
-	
-			case Icon of
-				TD_ICON_WARNING : DlgType := mtWarning;
-				TD_ICON_QUESTION : DlgType := mtConfirmation;
-				TD_ICON_ERROR : DlgType := mtError;
-				TD_ICON_INFORMATION: DlgType := mtInformation;
-			end;
-	
-			Result := MessageDlg(S, DlgType, Btns, 0);
-		{$ELSE}
-			Btns := 0;
-			if Buttons and TD_BUTTON_OK = TD_BUTTON_OK then Btns := MB_OK;
-			if (Buttons and TD_BUTTON_YES = TD_BUTTON_YES) and (Buttons and TD_BUTTON_NO = TD_BUTTON_NO) then Btns := MB_YESNO;
-			if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_YES = TD_BUTTON_YES) and (Buttons and TD_BUTTON_NO = TD_BUTTON_NO) then Btns := MB_YESNOCANCEL;
-			if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_OK = TD_BUTTON_OK) then Btns := MB_OKCANCEL;
-			if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_RETRY = TD_BUTTON_RETRY) then Btns := MB_RETRYCANCEL;
-			
-			myIcon := 0;
-			case Icon of
-				TD_ICON_QUESTION : myIcon := MB_ICONQUESTION;
-				TD_ICON_ERROR : myIcon := MB_ICONSTOP;
-				TD_ICON_INFORMATION: myIcon := MB_ICONINFORMATION;
-			end;
+  TaskDialogFound := false;
+  Result := 0;
+  if IsWindowsVista then begin
+    DLLHandle := LoadLibrary('comctl32.dll');
+    if DLLHandle >= 32 then begin
+      TaskDialogProc := tTaskDialogProc(GetProcAddress(DLLHandle,'TaskDialog'));
+      
+      if Assigned(TaskDialogProc) then begin
+        
+        if stripLineFeed then begin
+          wS := StringReplace(AContent, #10, '', [rfReplaceAll]);
+          wS := StringReplace(wS, #13, '', [rfReplaceAll]);
+        end
+        else begin
+          wS := AContent;
+        end;
+
+        TaskDialogProc(AHandle, 0, PWideChar(ATitle), PWideChar(ADescription), PWideChar(wS), Buttons, Icon, @res);
+        TaskDialogFound := true;
+        Result := mrOK;
+        case res of
+          TD_RESULT_CANCEL : Result := mrCancel;
+          TD_RESULT_RETRY : Result := mrRetry;
+          TD_RESULT_YES : Result := mrYes;
+          TD_RESULT_NO : Result := mrNo;
+          TD_RESULT_CLOSE : Result := mrAbort;
+        end;
+      end;
+      FreeLibrary(DLLHandle);
+    end;
+  end;
+  
+  if not TaskDialogFound then begin
+    S := '';
+    if includeDescInXP then S := ADescription + #10#13 + #10#13 + AContent else S := AContent;
+    
+    {$IFDEF MESSAGEDLG}
+      Btns := [];
+      if Buttons and TD_BUTTON_OK = TD_BUTTON_OK then Btns := Btns + [MBOK];
+      if Buttons and TD_BUTTON_YES = TD_BUTTON_YES then Btns := Btns + [MBYES];
+      if Buttons and TD_BUTTON_NO = TD_BUTTON_NO then Btns := Btns + [MBNO];
+      if Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL then Btns := Btns + [MBCANCEL];
+      if Buttons and TD_BUTTON_RETRY = TD_BUTTON_RETRY then Btns := Btns + [MBRETRY];
+  
+      if Buttons and TD_BUTTON_CLOSE = TD_BUTTON_CLOSE then Btns := Btns + [MBABORT];
+  
+      DlgType := mtCustom;
+  
+      case Icon of
+        TD_ICON_WARNING : DlgType := mtWarning;
+        TD_ICON_QUESTION : DlgType := mtConfirmation;
+        TD_ICON_ERROR : DlgType := mtError;
+        TD_ICON_INFORMATION: DlgType := mtInformation;
+      end;
+  
+      Result := MessageDlg(S, DlgType, Btns, 0);
+    {$ELSE}
+      Btns := 0;
+      if Buttons and TD_BUTTON_OK = TD_BUTTON_OK then Btns := MB_OK;
+      if (Buttons and TD_BUTTON_YES = TD_BUTTON_YES) and (Buttons and TD_BUTTON_NO = TD_BUTTON_NO) then Btns := MB_YESNO;
+      if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_YES = TD_BUTTON_YES) and (Buttons and TD_BUTTON_NO = TD_BUTTON_NO) then Btns := MB_YESNOCANCEL;
+      if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_OK = TD_BUTTON_OK) then Btns := MB_OKCANCEL;
+      if (Buttons and TD_BUTTON_CANCEL = TD_BUTTON_CANCEL) and (Buttons and TD_BUTTON_RETRY = TD_BUTTON_RETRY) then Btns := MB_RETRYCANCEL;
+      
+      myIcon := 0;
+      case Icon of
+        TD_ICON_QUESTION : myIcon := MB_ICONQUESTION;
+        TD_ICON_ERROR : myIcon := MB_ICONSTOP;
+        TD_ICON_INFORMATION: myIcon := MB_ICONINFORMATION;
+      end;
 
                         Result := MessageBox(0, pchar(S), pchar(String(ATitle)), Btns + myIcon);
-		{$ENDIF}
-	end;
+    {$ENDIF}
+  end;
 end;
 
 end.

launcher/windows/DMDirc.dpr

@@ -1,3 +1,29 @@
+{*
+ * This application launches DMDirc on windows and passes control to the
+ * update engine as necessary.
+ *
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes,
+ * Michael Nixon
+ *
+ * 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 DMDirc;
 {$MODE Delphi}
 {$APPTYPE GUI}
@@ -7,160 +33,181 @@ program DMDirc;
 {$R version.rc}
 
 uses Windows, SysUtils, classes, StrUtils, Vista;
+procedure InitCommonControls; stdcall; External 'comctl32.dll' name 'InitCommonControls';
+{ ---------------------------------------------------------------------------- }
 
+{ ----------------------------------------------------------------------------
+  Ask a question and return True for YES and False for NO
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
 function askQuestion(Question: String): boolean;
 begin
-	Result := TaskDialog(0, 'DMDirc', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+  Result := TaskDialog(0, 'DMDirc', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
 end;
 
+{ ----------------------------------------------------------------------------
+  Show an error message
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
 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', 'There was an error starting DMDirc', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, false, false);
+  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', 'There was an error starting DMDirc', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, false, false);
 end;
 
+{ ----------------------------------------------------------------------------
+  Show a message box (information)
+  Uses nifty vista task dialog if available
+  ---------------------------------------------------------------------------- }
 procedure showmessage(message: String; context:String = 'Information');
 begin
-	TaskDialog(0, 'DMDirc', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+  TaskDialog(0, 'DMDirc', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
 end;
 
 
-// Run an application and wait for it to finish.
+{ ----------------------------------------------------------------------------
+  Launch a process (hidden if requested) and wait for it to finish
+  ---------------------------------------------------------------------------- }
 function ExecAndWait(sProgramToRun: String): Longword;
 var
-	StartupInfo: TStartupInfo;
-	ProcessInfo: TProcessInformation;
+  StartupInfo: TStartupInfo;
+  ProcessInfo: TProcessInformation;
 begin
-	FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
-	with StartupInfo do begin
-		cb := SizeOf(TStartupInfo);
-		dwFlags := STARTF_USESHOWWINDOW;
-		wShowWindow := SW_SHOWNORMAL;
-	end;
-
-	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
-	getExitCodeProcess(ProcessInfo.hProcess, Result);
-
-	while Result=STILL_ACTIVE do begin
-		sleep(1000);
-		GetExitCodeProcess(ProcessInfo.hProcess, Result);
-	end;
+  FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+  with StartupInfo do begin
+    cb := SizeOf(TStartupInfo);
+    dwFlags := STARTF_USESHOWWINDOW;
+    wShowWindow := SW_SHOWNORMAL;
+  end;
+
+  CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
+  getExitCodeProcess(ProcessInfo.hProcess, Result);
+
+  while Result=STILL_ACTIVE do begin
+    sleep(1000);
+    GetExitCodeProcess(ProcessInfo.hProcess, Result);
+  end;
 end;
 
-// Run an application and don't wait for it to finish.
+{ ----------------------------------------------------------------------------
+  Launch a process (hidden if requested) and immediately return control to
+  the current thread
+  ---------------------------------------------------------------------------- }
 procedure Launch(sProgramToRun: String);
 var
-	StartupInfo: TStartupInfo;
-	ProcessInfo: TProcessInformation;
+  StartupInfo: TStartupInfo;
+  ProcessInfo: TProcessInformation;
 begin
-	FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
-	with StartupInfo do begin
-		cb := SizeOf(TStartupInfo);
-		dwFlags := STARTF_USESHOWWINDOW;
-		wShowWindow := SW_SHOWNORMAL;
-	end;
-	
-	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
+  FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+  with StartupInfo do begin
+    cb := SizeOf(TStartupInfo);
+    dwFlags := STARTF_USESHOWWINDOW;
+    wShowWindow := SW_SHOWNORMAL;
+  end;
+
+  CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
 end;
 
+{ ----------------------------------------------------------------------------
+  Launch a process and either waits for it or returns control immediately
+  ---------------------------------------------------------------------------- }
 procedure RunProgram(sProgramToRun: String; wait: boolean);
 begin
-	if wait then ExecAndWait(sProgramToRun)
-	else Launch(sProgramToRun);
+  if wait then ExecAndWait(sProgramToRun)
+  else Launch(sProgramToRun);
 end;
 
+{ ----------------------------------------------------------------------------
+  MAIN PROGRAM
+  ---------------------------------------------------------------------------- }
 const
-	launcherVersion: String = '2';
+  launcherVersion: String = '2';
 var
-	errorMessage: String;
-	javaCommand: String = 'javaw.exe';
-	cliParams: String = '';
-	directory: String = '';
-	i: integer;
-	jarName: String;
-	launcherUpdate: boolean = false;
+  errorMessage: String;
+  javaCommand: String = 'javaw.exe';
+  cliParams: String = '';
+  directory: String = '';
+  i: integer;
+  jarName: String;
+  launcherUpdate: boolean = false;
 begin
-	jarName := ExtractFileDir(paramstr(0))+'\DMDirc.jar';
-	
-	directory := GetEnvironmentVariable('APPDATA')+'\DMDirc';
-	if ParamCount > 0 then begin
-		for i := 1 to ParamCount do begin
-			if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
-			else cliParams := cliParams+' '+paramstr(i);
-			if (paramstr(i) = '-d') or (paramstr(i) = '--directory') then begin
-				if ParamCount > i then begin
-					directory := paramstr(i+1);
-				end;
-			end
-		end;
-	end;
-
-	// Update if needed.
-	launcherUpdate := FileExists(directory+'\.DMDirc.exe') and FileExists(directory+'\.DMDircUpdater.exe');
-	if FileExists(directory+'\.DMDirc.jar') or launcherUpdate then begin
-		// Vista Sucks.
-		if IsWindowsVista then begin
-			// Vista >.<
-			// Try and delete the old file, if it fails then the user needs to give
-			// us permission to delete the file (UAC), otherwise we can just go ahead
-			// and run the updater.
-			if not DeleteFile(pchar(jarName)) then begin
-				errorMessage := 'An update to DMDirc has been previously downloaded. ';
-				errorMessage := errorMessage+#13#10;
-				errorMessage := errorMessage+#13#10+'As you are running Windows Vista, DMDirc requires administrator access to ';
-				errorMessage := errorMessage+#13#10+'complete the update. ';
-				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 askQuestion(errorMessage) then begin
-					RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-				end;
-			end
-			else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-		end
-		else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-	end;
-	
-	if not launcherUpdate then begin
-		// Check JVM
-		if (ExecAndWait(javaCommand+' -version') <> 0) then begin
-			errorMessage := 'No JVM is currently installed.';
-			errorMessage := errorMessage+#13#10;
-			errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from: ';
-			errorMessage := errorMessage+#13#10+'http://java.com/ ';
-			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.';
-			
-			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
-		// appear
-		else if FileExists(jarName) then begin
-			if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
-				errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
-				errorMessage := errorMessage+#13#10;
-				errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from: ';
-				errorMessage := errorMessage+#13#10+'http://java.com/ ';
-				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. ';
-				
-				showError(errorMessage);
-			end
-			else begin
-				Launch(javaCommand+' -ea -jar "'+jarName+'"'+' -l windows-'+launcherVersion+' '+cliParams)
-			end;
-		end
-		else begin
-			errorMessage := 'Your DMDirc installation has been broken. DMDirc.jar no longer exists.';
-			showError(errorMessage);
-		end;
-	end;
+  InitCommonControls;
+
+  jarName := ExtractFileDir(paramstr(0))+'\DMDirc.jar';
+
+  directory := GetEnvironmentVariable('APPDATA')+'\DMDirc';
+  if ParamCount > 0 then begin
+    for i := 1 to ParamCount do begin
+      if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
+      else cliParams := cliParams+' '+paramstr(i);
+      if (paramstr(i) = '-d') or (paramstr(i) = '--directory') then begin
+        if ParamCount > i then begin
+          directory := paramstr(i+1);
+        end;
+      end
+    end;
+  end;
+
+  // Update if needed.
+  launcherUpdate := FileExists(directory+'\.DMDirc.exe') and FileExists(directory+'\.DMDircUpdater.exe');
+  if FileExists(directory+'\.DMDirc.jar') or launcherUpdate then begin
+    // Vista Sucks.
+    if IsWindowsVista then begin
+      // Vista >.<
+      // Try and delete the old file, if it fails then the user needs to give
+      // us permission to delete the file (UAC), otherwise we can just go ahead
+      // and run the updater.
+      if not DeleteFile(pchar(jarName)) then begin
+        errorMessage := 'An update to DMDirc has been previously downloaded. ';
+        errorMessage := errorMessage+#13#10;
+        errorMessage := errorMessage+#13#10+'As you are running Windows Vista, DMDirc requires administrator access to ';
+        errorMessage := errorMessage+#13#10+'complete the update. ';
+        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 askQuestion(errorMessage) then begin
+          RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
+        end;
+      end
+      else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
+    end
+    else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
+  end;
+  
+  if not launcherUpdate then begin
+    // Check JVM
+    if (ExecAndWait(javaCommand+' -version') <> 0) then begin
+      errorMessage := 'No JVM is currently installed.';
+      errorMessage := errorMessage+#13#10;
+      errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
+      errorMessage := errorMessage+#13#10+'http://java.com/';
+      showError(errorMessage, true);
+    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
+    // appear
+    else if FileExists(jarName) then begin
+      if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
+        errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
+        errorMessage := errorMessage+#13#10;
+        errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
+        errorMessage := errorMessage+#13#10+'http://java.com/';
+        showError(errorMessage, True);
+      end
+      else begin
+        Launch(javaCommand+' -ea -jar "'+jarName+'"'+' -l windows-'+launcherVersion+' '+cliParams)
+      end;
+    end
+    else begin
+      errorMessage := 'A file required to start DMDirc is missing. Please re-install DMDirc to rectify the problem.';
+      errorMessage := errorMessage+#13#10;
+      errorMessage := errorMessage+#13#10 + 'File: DMDirc.jar';
+      showError(errorMessage);
+    end;
+  end;
 end.