From 4be334a4069694e53136bf162951cbe842e12cab Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Sun, 1 Apr 2007 22:47:12 +0000
Subject: [PATCH] Include vc redistributables

---
 win32/FireflyShell/FireflyShell.rc |  8 +++-----
 win32/nsi/mt-daapd.nsi.templ       | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/win32/FireflyShell/FireflyShell.rc b/win32/FireflyShell/FireflyShell.rc
index c6b2f986..280a1fda 100644
--- a/win32/FireflyShell/FireflyShell.rc
+++ b/win32/FireflyShell/FireflyShell.rc
@@ -7,8 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "atlres.h"
-
+#include "atlres.h"

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -112,9 +111,9 @@ BEGIN
     LTEXT           "Current state of the server goes here",IDC_SERVERSTATE,12,28,199,25
     PUSHBUTTON      "&Stop Server",IDC_STOPSERVICE,218,28,70,14
     CONTROL         "&Start Firefly when Windows starts",IDC_AUTOSTART,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,62,252,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,59,252,10
     CONTROL         "&Enable Firefly icon in system tray",IDC_AUTOSTART_ICON,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,75,252,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,73,252,10
     GROUPBOX        "Advanced",IDC_STATIC,6,93,288,61
     LTEXT           "Server port number",IDC_STATIC,12,108,99,11
     EDITTEXT        IDC_SERVERPORT,105,105,42,14,ES_AUTOHSCROLL | ES_NUMBER
@@ -124,7 +123,6 @@ BEGIN
     LTEXT           "Firefly Media Server also provides a web administration interface.",IDC_STATIC,12,177,198,20
     PUSHBUTTON      "&Open",IDC_WEBADMIN,218,177,70,14
     PUSHBUTTON      "&Start Server",IDC_STARTSERVICE,218,28,70,14
-    ICON            IDI_SHIELD,IDC_STATIC,12,58,21,20
 END
 
 
diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index 188122db..0633488a 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -183,11 +183,6 @@ NoProgramItems:
   File "${DLL_SOURCE}\avcodec.dll"
   File "${DLL_SOURCE}\avformat.dll"
   File "${DLL_SOURCE}\libFLAC.dll"
-
-  File "${REDIST_SOURCE}\msvcp80.dll"
-  File "${REDIST_SOURCE}\msvcr80.dll"
-  File "${REDIST_SOURCE}\msvcm80.dll"
-  File "${REDIST_SOURCE}\Microsoft.VC80.CRT.manifest"
   
   SetOutPath "$2\plugins"
   File "${MTD_SOURCE}\rsp.dll"
@@ -308,6 +303,21 @@ Section -AdditionalIcons
   
 SectionEnd
 
+!include "LogicLib.nsh"
+!define UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"
+!define APP_KEY "{A49F249F-0C91-497F-86DF-B2585E8E76B7}"
+Section -VCRedistributable
+	ReadRegStr $R0 HKLM "${UNINSTALL_KEY}\${APP_KEY}\" "DisplayName"
+	${If} ${Errors}
+		# reg value doesn't exist (ie, needs installed)
+		SetOutPath "$2\"
+		File "${REDIST_SOURCE}\WindowsInstaller-KB893803-v2-x86.exe"
+		File "${REDIST_SOURCE}\VCRedist_x86.exe"
+		ExecWait '"$2\WindowsInstaller-KB893803-v2-x86.exe"  /quiet /norestart'
+		ExecWait '"$2\VCRedist_x86.exe"  /Q'
+	${EndIf}
+SectionEnd
+
 Section -Post
   WriteUninstaller "$2\uninst.exe"
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$2\mt-daapd.exe"