fix: Improve installer custom actions and add manifest files

Fix null reference errors in VerifyDataPath custom action and add
missing manifest files to installer packaging.

- Add null checks for REGISTRYDATAKEY/REGISTRYDATAVALUENAME properties
- Add null-safe registry value access to prevent NullReferenceException
- Move CloseApplications to InstallUISequence (UI-only, immediate mode)
- Add FieldWorks.exe.manifest, FwKernel.X.manifest, Views.X.manifest
- Set LaunchUnicodeCharEditor Return="check" to catch manifest errors
- Suppress light.exe ICE warnings 1055/1056 for cleaner builds

Author: johnml1135

BaseInstallerBuild/Framework.wxs

@@ -68,6 +68,8 @@
 
 	<CustomAction Id="CloseApplications"
 		Return="check"
+		Execute="immediate"
+		Impersonate="yes"
 		BinaryKey="MyCustomActionsDll"
 		DllEntry="ClosePrompt"  />
 	<!-- The following two properties can be comma separted lists, but they must have the same number of items. -->
@@ -101,6 +103,8 @@
 	<SetProperty Id='APPFOLDERREGSZNAME' Value='Program_Files_Directory_$(var.SafeApplicationName)'  Before="AppSearch">not APPFOLDERREGSZNAME</SetProperty>
 	<SetProperty Id='DATAFOLDERREGSZNAME' Value='Settings_Directory'  Before="AppSearch">not DATAFOLDERREGSZNAME</SetProperty>
 	<SetProperty Id='HARVESTDATAFOLDERREGSZNAME' Value='Data_Directory'  Before="AppSearch">not HARVESTDATAFOLDERREGSZNAME</SetProperty>
+	<SetProperty Id='REGISTRYDATAKEY' Value='[REGISTRYKEY]' Before="AppSearch">not REGISTRYDATAKEY</SetProperty>
+	<SetProperty Id='REGISTRYDATAVALUENAME' Value='[DATAFOLDERREGSZNAME]' Before="AppSearch">not REGISTRYDATAVALUENAME</SetProperty>
 	<CustomAction Id='UseDefDataFolder' Property='DATAFOLDER' Value='[DEFDATAFOLDER]' />
 	<CustomAction Id='UseOvrDataFolder' Property='DATAFOLDER' Value='[OVRDATAFOLDER]' /> <!-- from Overrides.wxi -->
 	<CustomAction Id='UseRegDataFolder' Property='DATAFOLDER' Value='[REGDATAFOLDER]' />
@@ -115,7 +119,6 @@
 	<CustomAction Id='CheckPatchValue' Property='ISPATCH' Value='True' />
 
 	<InstallExecuteSequence>
-		<Custom Action="CloseApplications" Before="AppSearch"></Custom>
 		<!--<Custom Action="SetFontValues" After="AppSearch"></Custom>-->
 		<Custom Action="DeleteRegistryVersionNumber" Before="RemoveRegistryValues">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
 		<RemoveExistingProducts Before="InstallInitialize" />
@@ -127,8 +130,9 @@
 	</InstallExecuteSequence>
 
 	<InstallUISequence>
+		<Custom Action="CloseApplications" Before="AppSearch">UILevel &gt;= 3</Custom>
 		<Custom Action="SetDefDataFolder" After="FindRelatedProducts"></Custom>
-		<Custom Action="VerifyDataPath" After="SetDefDataFolder"></Custom>
+		<Custom Action="VerifyDataPath" After="AppSearch"></Custom>
 		<Custom Action="UseDefAppFolder" After="AppSearch">(NOT REGAPPFOLDER) and (NOT OVRAPPFOLDER)</Custom>
 		<Custom Action="UseOvrAppFolder" After="AppSearch">(NOT REGAPPFOLDER) and (OVRAPPFOLDER)</Custom>
 		<Custom Action="UseRegAppFolder" After="AppSearch">REGAPPFOLDER</Custom>

BaseInstallerBuild/buildMsi.bat

@@ -15,7 +15,7 @@ call setVars.bat %*
 	@REM Compile (candle) and Link (light) the MSI file.
 	candle.exe -arch %Arch% -dBuildArch=%Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dMajorVersion=%Major% -dMinorVersion=%Minor% -dMASTERBUILDDIR=%MASTERBUILDDIR% -dMASTERDATADIR=%MASTERDATADIR% -dUpgradeCode=%UPGRADECODEGUID% -dProductCode=%PRODUCTIDGUID% Framework.wxs AppHarvest.wxs DataHarvest.wxs WixUI_DialogFlow.wxs GIInstallDirDlg.wxs GIProgressDlg.wxs GIWelcomeDlg.wxs GICustomizeDlg.wxs GISetupTypeDlg.wxs -ext WixFirewallExtension -ext WixUtilExtension
 ) && (
-	light.exe Framework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_DialogFlow.wixobj GIInstallDirDlg.wixobj GIProgressDlg.wixobj GIWelcomeDlg.wixobj GICustomizeDlg.wixobj GISetupTypeDlg.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc WixUI_en-us.wxl %SuppressICE% -sw1076 -out %SafeAppName%_%Version%.msi
+	light.exe Framework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_DialogFlow.wixobj GIInstallDirDlg.wixobj GIProgressDlg.wixobj GIWelcomeDlg.wixobj GICustomizeDlg.wixobj GISetupTypeDlg.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc WixUI_en-us.wxl %SuppressICE% -sw1076 -sw1055 -sw1056 -out %SafeAppName%_%Version%.msi
 ) && (
 	call signingProxy %CD%\%SafeAppName%_%Version%.msi
 )

Common/CustomComponents.wxi

@@ -126,6 +126,9 @@
 			<File Id="FieldWorks.exe" Name="FieldWorks.exe" Source="!(wix.RootObjectsDir)\FieldWorks.exe" ReadOnly="yes" Checksum="yes" KeyPath="yes" Assembly=".net" AssemblyApplication="FieldWorks.exe" AssemblyManifest="FieldWorks.exe">
 				<fire:FirewallException Id="FieldWorks.exe" Name="FieldWorks" IgnoreFailure="yes" Scope="any" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"/>
 			</File>
+			<File Id="FieldWorks.exe.manifest" Name="FieldWorks.exe.manifest" Source="!(wix.RootObjectsDir)\FieldWorks.exe.manifest" ReadOnly="yes" Checksum="yes" />
+			<File Id="FwKernel.X.manifest" Name="FwKernel.X.manifest" Source="!(wix.RootObjectsDir)\FwKernel.X.manifest" ReadOnly="yes" Checksum="yes" />
+			<File Id="Views.X.manifest" Name="Views.X.manifest" Source="!(wix.RootObjectsDir)\Views.X.manifest" ReadOnly="yes" Checksum="yes" />
 			<ProgId Id="FwBackupFile" Icon="FieldWorks.exe" Description="FieldWorks Backup">
 				<Extension Id="fwbackup" >
 					<Verb Id="open" Command="&amp;Restore" Argument="&quot;%1&quot;" TargetFile="FieldWorks.exe" />

Common/Overrides.wxi

@@ -14,5 +14,6 @@
 	<SetProperty Id="OVRHARVESTDATAFOLDER" Value="[CommonAppDataFolder]SIL" Before="AppSearch"/>
 	<SetProperty Id="OVRDATAFOLDER" Value="[CommonAppDataFolder]SIL\FieldWorks\Projects" Before="AppSearch"/>
 	<SetProperty Id="QtExecCmdLine" Value="&quot;cmd&quot; /c (set ICU_DATA=[OVRHARVESTDATAFOLDER]\Icu70) &amp; &quot;[APPFOLDER]\UnicodeCharEditor.exe&quot; -i" Before="InstallFinalize" Sequence="execute"/>
+	<!-- Return="check" fails the installation if UnicodeCharEditor fails, ensuring we catch manifest issues before release -->
 	<CustomAction Id="LaunchUnicodeCharEditor" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="immediate" Return="check"/>
 </Include>

CustomActions/CustomActions/CustomAction.cs

@@ -26,7 +26,7 @@ public static ActionResult CheckAppPath(Session session)
             //return failure if the app path is the program files directory
             string progFilesDir = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
             string progFiles86Dir = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
-            
+
             //On 32bit XP machines ProgramFilesX86 will return an empty string.
             if (String.IsNullOrEmpty(progFiles86Dir))
                 progFiles86Dir = progFilesDir;
@@ -86,6 +86,13 @@ public static ActionResult VerifyDataDirPath(Session session)
             session.Log("Begin VerifyDataPath in custom action dll");
             string registryKey = session["REGISTRYDATAKEY"];
             string valueName = session["REGISTRYDATAVALUENAME"];
+            if (string.IsNullOrWhiteSpace(registryKey) || string.IsNullOrWhiteSpace(valueName))
+            {
+                session.Log("VerifyDataPath: REGISTRYDATAKEY or REGISTRYDATAVALUENAME is missing.");
+                session["REGDATAFOLDER"] = null;
+                session["DATAFOLDERFOUND"] = "NotFound";
+                return ActionResult.Success;
+            }
             string regDataPath = GetDataDirFromRegistry(registryKey, valueName, session);
             if (string.IsNullOrEmpty(regDataPath))
             {
@@ -95,7 +102,7 @@ public static ActionResult VerifyDataDirPath(Session session)
             }
 
             session["REGDATAFOLDER"] = regDataPath;
-             
+
             if (Directory.Exists(regDataPath) && Directory.GetFiles(regDataPath).Length > 0)
                 session["DATAFOLDERFOUND"] = "AlreadyExisting";
             else
@@ -213,16 +220,27 @@ public static ActionResult LookForInstalledFonts(Session session)
 
         private static string GetDataDirFromRegistry(string path, string valueName, Session session)
         {
+            if (string.IsNullOrWhiteSpace(path) || string.IsNullOrWhiteSpace(valueName))
+                return null;
+
             string dataPathKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\" + path;
             string dataPathKeyWow = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\" + path;
 
             string projPath = "";
             try
             {
                 if (RegistryU.KeyExists(dataPathKey))
-                    projPath = RegistryU.GetKey("HKLM", "SOFTWARE\\" + path).GetValue(valueName).ToString();
+                {
+                    var value = RegistryU.GetKey("HKLM", "SOFTWARE\\" + path)?.GetValue(valueName);
+                    if (value != null)
+                        projPath = value.ToString();
+                }
                 if (RegistryU.KeyExists(dataPathKeyWow))
-                    projPath = RegistryU.GetKey("HKLM", "SOFTWARE\\Wow6432Node\\" + path).GetValue(valueName).ToString();
+                {
+                    var value = RegistryU.GetKey("HKLM", "SOFTWARE\\Wow6432Node\\" + path)?.GetValue(valueName);
+                    if (value != null)
+                        projPath = value.ToString();
+                }
             }
             catch (Exception ex)
             {