Improvements to TxtSetup support

Author: gus33000

Windows Build Identifier/Identification/InstalledImage/DetectionHandler.cs

@@ -51,6 +51,7 @@ public static WindowsImage IdentifyWindowsNT(WindowsInstallProviderInterface ins
             string kernelPath = "";
             string softwareHivePath = "";
             string systemHivePath = "";
+            string userPath = "";
 
             var kernelEntry = fileentries.FirstOrDefault(x =>
             x.EndsWith(
@@ -76,9 +77,16 @@ public static WindowsImage IdentifyWindowsNT(WindowsInstallProviderInterface ins
                 systemHivePath = installProvider.ExpandFile(systemHiveEntry);
             }
 
+            var userEntry = fileentries.FirstOrDefault(x => x.EndsWith(@"\system32\user.exe", StringComparison.InvariantCultureIgnoreCase));
+            if (userEntry != null)
+            {
+                userPath = installProvider.ExpandFile(userEntry);
+            }
+
             #region Version Gathering
             VersionInfo1 info = new VersionInfo1();
             VersionInfo2 info2 = new VersionInfo2();
+            VersionInfo1 info3 = new VersionInfo1();
 
             if (!string.IsNullOrEmpty(kernelPath))
             {
@@ -97,11 +105,18 @@ public static WindowsImage IdentifyWindowsNT(WindowsInstallProviderInterface ins
                 info2 = ExtractVersionInfo2(softwareHivePath, systemHivePath);
             }
 
+            if (!string.IsNullOrEmpty(userPath))
+            {
+                Console.WriteLine("Extracting version information from the image 3");
+                info3 = ExtractVersionInfo(userPath);
+            }
+
             report.Tag = info2.Tag;
             report.Licensing = info2.Licensing;
             report.LanguageCodes = info2.LanguageCodes;
 
             WindowsVersion correctVersion = Common.GetGreaterVersion(info.version, info2.version);
+            correctVersion = Common.GetGreaterVersion(correctVersion, info3.version);
 
             if (correctVersion != null)
             {
@@ -163,6 +178,13 @@ public static WindowsImage IdentifyWindowsNT(WindowsInstallProviderInterface ins
             if (!string.IsNullOrEmpty(systemHivePath))
                 File.Delete(systemHivePath);
 
+            report = FixSkuNames(report, IsUnstaged);
+
+            return report;
+        }
+
+        public static WindowsImage FixSkuNames(WindowsImage report, bool IsUnstaged)
+        {
             if (!string.IsNullOrEmpty(report.Sku))
             {
                 if (report.BuildNumber > 2195)
@@ -255,7 +277,14 @@ private static VersionInfo1 ExtractVersionInfo(string kernelPath)
 
             FileVersionInfo info = FileVersionInfo.GetVersionInfo(kernelPath);
 
-            result.Architecture = Common.GetMachineTypeFromFile(new FileStream(kernelPath, FileMode.Open));
+            try
+            {
+                result.Architecture = Common.GetMachineTypeFromFile(new FileStream(kernelPath, FileMode.Open));
+            }
+            catch
+            {
+                
+            }
 
             var ver = info.FileVersion;
 

Windows Build Identifier/Identification/MediaHandler.cs

@@ -218,11 +218,14 @@ private static void IdentifyWindowsNTFromVHD(Stream vhdstream)
             Common.DisplayReport(report);
         }
 
-        private static WindowsImageIndex[] IdentifyWindowsNTFromRootFs(IFileSystem fileSystem)
+        private static WindowsImageIndex[] IdentifyWindowsNTFromRootFs(TxtSetupBridge fileSystem)
         {
             RootFsInstallProviderInterface provider = new RootFsInstallProviderInterface(fileSystem);
 
             var report = InstalledImage.DetectionHandler.IdentifyWindowsNT(provider);
+            report.Sku = fileSystem.GetSkuFromTxtSetupMedia(report.BuildNumber);
+            report = InstalledImage.DetectionHandler.FixSkuNames(report, false);
+
             Common.DisplayReport(report);
 
             var index = new WindowsImageIndex() { WindowsImage = report };
@@ -365,13 +368,19 @@ private static FileItem[] HandleFacade(IFileSystem facade, bool Recursivity = fa
                             }
                         case "sif":
                             {
-                                if (fileItem.Location.Contains("txtsetup.sif", StringComparison.InvariantCultureIgnoreCase))
+                                try
                                 {
-                                    var bridge = new TxtSetupBridge(facade, string.Join("\\", fileItem.Location.Split('\\')[0..^1]));
-                                    var tempIndexes = IdentifyWindowsNTFromRootFs(bridge); 
-                                    fileItem.Metadata = new MetaData();
-                                    fileItem.Metadata.WindowsImageIndexes = tempIndexes;
+                                    if (fileItem.Location.Contains("txtsetup.sif", StringComparison.InvariantCultureIgnoreCase))
+                                    {
+                                        var bridge = new TxtSetupBridge(facade, string.Join("\\", fileItem.Location.Split('\\')[0..^1]));
+                                        var tempIndexes = IdentifyWindowsNTFromRootFs(bridge);
+
+                                        fileItem.Metadata = new MetaData();
+                                        fileItem.Metadata.WindowsImageIndexes = tempIndexes;
+
+                                    }
                                 }
+                                catch { };
                                 break;
                             }
                         case "mui":

Windows Build Identifier/Identification/Structures.cs

@@ -252,6 +252,7 @@ public class WindowsImage
     public enum MachineType : ushort
     {
         unknown = 0x0,
+        axp = 0x184,
         am33 = 0x1d3,
         amd64 = 0x8664,
         arm = 0x1c0,