Add stubs for uninstall (also handles upgrade)

Author: Boddlnagg

src/rustup-win-installer/msi/rustup.wxs

@@ -23,6 +23,10 @@
         <Property Id="ARPURLINFOABOUT" Value="http://www.rustup.rs" />
         <!--<Property Id="ARPHELPLINK" Value="http://www.rustup.rs" />-->
         <Property Id="ARPPRODUCTICON" Value="rust.ico" />
+
+        <!-- Disable Modify and Repair options (our custom actions based install model does not support repairing) -->
+        <Property Id="ARPNOMODIFY" Value="1" />
+        <Property Id="ARPNOREPAIR" Value="1" />
 
         <Icon Id="rust.ico" SourceFile="rust-logo.ico"/>
 
@@ -62,14 +66,15 @@
         <!-- Propagate the value of `RustupInstallLocation` (set by custom action) to `INSTALLLOCATION` -->
         <CustomAction Id="AssignInstallLocation" Directory="INSTALLLOCATION" Value="[RustupInstallLocation]"/>
         <CustomAction Id="RustupInstall" BinaryKey="RustupCustomActionDll" DllEntry="RustupInstall" Execute="deferred" Return="check" Impersonate="yes"/>
+        <CustomAction Id="RustupUninstall" BinaryKey="RustupCustomActionDll" DllEntry="RustupUninstall" Execute="deferred" Return="check" Impersonate="yes"/>
 
         <InstallExecuteSequence>
             <DisableRollback Before="InstallInitialize"/>
             <Custom Action="RustupSetInstallLocation" After="CostFinalize"/>
             <Custom Action="AssignInstallLocation" After="RustupSetInstallLocation"/>
-            <!-- The next two will not be run on uninstall (TODO: add RustupUninstall and also handle upgrade) -->
             <Custom Action="SetInstallOptions" Before="InstallInitialize">NOT Installed</Custom>
             <Custom Action="RustupInstall" After="InstallFiles">NOT Installed</Custom>
+            <Custom Action="RustupUninstall" Before="RemoveFiles">Installed</Custom>
         </InstallExecuteSequence>
 
         <!-- Send a WM_SETTINGCHANGE message to tell processes like explorer to update their

src/rustup-win-installer/msi/ui.wxs

@@ -35,8 +35,6 @@
             <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
             <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
             <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
         </UI>
         <UIRef Id="WixUI_Common" />
     </Fragment>

src/rustup-win-installer/src/lib.rs

@@ -39,6 +39,20 @@ pub unsafe extern "system" fn RustupInstall(hInstall: MSIHANDLE) -> UINT {
     WcaFinalize(hr)
 }
 
+#[no_mangle]
+/// This is be run as a `deferred` action before `RemoveFiles` on uninstall
+pub unsafe extern "system" fn RustupUninstall(hInstall: MSIHANDLE) -> UINT {
+    let name = CString::new("RustupUninstall").unwrap();
+    let hr = WcaInitialize(hInstall, name.as_ptr());
+    // For deferred custom actions, all data must be passed through the `CustomActionData` property
+    let custom_action_data = get_property("CustomActionData");
+    // TODO: use rustup_utils::cargo_home() or pass through CustomActionData
+    let path = PathBuf::from(::std::env::var_os("USERPROFILE").unwrap()).join(".rustup-test");
+    let exe_installed = path.join("bin").join("rustup.exe").exists(); 
+    log(&format!("Hello World from RustupUninstall, confirming that rustup.exe has not yet been removed: {}! CustomActionData: {}", exe_installed, custom_action_data));
+    WcaFinalize(hr)
+}
+
 // wrapper for WcaGetProperty (TODO: error handling)
 fn get_property(name: &str) -> String {
     let encoded_name = to_wide_chars(name);