Merge branch 'next' of https://github.com/retailcoder/Rubberduck

Author: retailcoder

Installer Build Script.iss

@@ -47,8 +47,10 @@ Source: "{#BuildDir}\NativeBinaries\x86\*"; DestDir: "{app}"; Flags: ignoreversi
 Source: "{#BuildDir}\{#AddinDLL}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is32BitOfficeInstalled; AfterInstall: RegisterAddin
 
 [UninstallDelete]
-; TODO we may not want to delete everything?...
-Name: {app}; Type: filesandordirs
+; Removing all application files (except for configuration).
+Name: "{app}\*.dll"; Type: filesandordirs
+Name: "{app}\*.xml"; Type: filesandordirs  
+Name: "{app}\*.pdb"; Type: filesandordirs
 
 [Run]
 ; http://stackoverflow.com/questions/5618337/how-to-register-a-net-dll-using-inno-setup
@@ -72,46 +74,60 @@ Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 const
   SCS_32BIT_BINARY = 0;
   SCS_64BIT_BINARY = 6;
-  // There are other values that GetBinaryType can return, but we're
-  // not interested in them.
+  // There are other values that GetBinaryType can return, but we're not interested in them.
+  OfficeNotFound = -1;
+  
 var
   HasCheckedOfficeBitness: Boolean;
   OfficeIs64Bit: Boolean;
 
 function GetBinaryType(lpApplicationName: AnsiString; var lpBinaryType: Integer): Boolean;
 external 'GetBinaryTypeA@kernel32.dll stdcall';
 
-// TODO this only checks for Excel's bitness, but what if they don't have it installed?
-function Is64BitExcelFromRegisteredExe(): Boolean;
+function GetOfficeAppBitness(exeName: string): Integer;
 var
-  excelPath: String;
+  appPath: String;
   binaryType: Integer;
 begin
-  Result := False; // Default value - assume 32-bit unless proven otherwise.
-  // RegQueryStringValue second param is '' to get the (default) value for the key
-  // with no sub-key name, as described at
-  // http://stackoverflow.com/questions/913938/
-  if IsWin64() and RegQueryStringValue(HKEY_LOCAL_MACHINE,
-      'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\excel.exe',
-      '', excelPath) then begin
-    // We've got the path to Excel.
+  Result := OfficeNotFound;  // Default value.
+
+  if RegQueryStringValue(HKEY_LOCAL_MACHINE,
+    'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\' + exeName,
+    '', appPath) then begin
     try
-      if GetBinaryType(excelPath, binaryType) then begin
-        Result := (binaryType = SCS_64BIT_BINARY);
-      end;
+      if GetBinaryType(appPath, binaryType) then Result := binaryType;
     except
-      // Ignore - better just to assume it's 32-bit than to let the installation
-      // fail.  This could fail because the GetBinaryType function is not
-      // available.  I understand it's only available in Windows 2000
-      // Professional onwards.
     end;
   end;
 end;
 
+function GetOfficeBitness(): Integer;
+var
+  appBitness: Integer;
+  officeExeNames: array[0..4] of String;
+  i: Integer;
+begin
+  officeExeNames[0] := 'excel.exe';
+  officeExeNames[1] := 'msaccess.exe';
+  officeExeNames[2] := 'winword.exe';
+  officeExeNames[3] := 'outlook.exe';
+  officeExeNames[4] := 'powerpnt.exe';
+
+  for i := 0 to 4 do begin
+    appBitness := GetOfficeAppBitness(officeExeNames[i]);
+    if appBitness <> OfficeNotFound then begin
+      Result := appBitness;
+      exit;
+    end;
+  end;
+  // Note if we get to here then we haven't found any Office versions.  Should
+  // we fail the installation?
+end;
+
 function Is64BitOfficeInstalled(): Boolean;
 begin
   if (not HasCheckedOfficeBitness) then 
-    OfficeIs64Bit := Is64BitExcelFromRegisteredExe();
+    OfficeIs64Bit := (GetOfficeBitness() = SCS_64BIT_BINARY);
   Result := OfficeIs64Bit;
 end;
 
@@ -120,12 +136,66 @@ begin
   Result := (not Is64BitOfficeInstalled());
 end;
 
+// http://kynosarges.org/DotNetVersion.html
+function IsDotNetDetected(version: string; service: cardinal): boolean;
+// Indicates whether the specified version and service pack of the .NET Framework is installed.
+//
+// version -- Specify one of these strings for the required .NET Framework version:
+//    'v1.1.4322'     .NET Framework 1.1
+//    'v2.0.50727'    .NET Framework 2.0
+//    'v3.0'          .NET Framework 3.0
+//    'v3.5'          .NET Framework 3.5
+//    'v4\Client'     .NET Framework 4.0 Client Profile
+//    'v4\Full'       .NET Framework 4.0 Full Installation
+//    'v4.5'          .NET Framework 4.5
+//
+// service -- Specify any non-negative integer for the required service pack level:
+//    0               No service packs required
+//    1, 2, etc.      Service pack 1, 2, etc. required
+var
+    key: string;
+    install, release, serviceCount: cardinal;
+    check45, success: boolean;
+begin
+    // .NET 4.5 installs as update to .NET 4.0 Full
+    if version = 'v4.5' then begin
+        version := 'v4\Full';
+        check45 := true;
+    end else
+        check45 := false;
+
+    // installation key group for all .NET versions
+    key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + version;
+
+    // .NET 3.0 uses value InstallSuccess in subkey Setup
+    if Pos('v3.0', version) = 1 then begin
+        success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install);
+    end else begin
+        success := RegQueryDWordValue(HKLM, key, 'Install', install);
+    end;
+
+    // .NET 4.0/4.5 uses value Servicing instead of SP
+    if Pos('v4', version) = 1 then begin
+        success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount);
+    end else begin
+        success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount);
+    end;
+
+    // .NET 4.5 uses additional value Release
+    if check45 then begin
+        success := success and RegQueryDWordValue(HKLM, key, 'Release', release);
+        success := success and (release >= 378389);
+    end;
+
+    result := success and (install = 1) and (serviceCount >= service);
+end;
+
 function InitializeSetup(): Boolean;
 var
    iErrorCode: Integer;
 begin
-  // MS .NET Framework 4.0 must be installed for this application to work.
-  if Not RegKeyExists(HKLM, 'SOFTWARE\Microsoft\.NETFramework\v4.0.30319') then
+  // MS .NET Framework 4.5 must be installed for this application to work.
+  if not IsDotNetDetected('v4.5', 0) then
   begin
     MsgBox(ExpandConstant('{cm:NETFramework40NotInstalled}'), mbCriticalError, mb_Ok);
     ShellExec('open', 'http://msdn.microsoft.com/en-us/netframework/aa731542', '', '', SW_SHOW, ewNoWait, iErrorCode)