Skip to content

Misc bugfixes; Support for reading EditionMappings.xml; Support for PID in setupp.ini #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hounsell wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Misc bugfixes; Support for reading EditionMappings.xml; Support for PID in setupp.ini #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Windows Build Identifier/Comparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static void CompareBuilds(string xml1, string xml2)

private static string Sanitize(string path1)
{
if (path1.Contains(@"installedrepository\", StringComparison.InvariantCultureIgnoreCase))
if (path1.Contains(@"installedrepository\", StringComparison.OrdinalIgnoreCase))
{
string fold1T = path1.ToLower().Split(@"installedrepository\")[0];
string fold1 = path1.ToLower().Split(@"installedrepository\")[1];
Expand All @@ -111,7 +111,7 @@ private static string Sanitize(string path1)
return f1;
}

if (path1.Contains(@"build\filerepository\", StringComparison.InvariantCultureIgnoreCase))
if (path1.Contains(@"build\filerepository\", StringComparison.OrdinalIgnoreCase))
{
string fold1T = path1.ToLower().Split(@"build\filerepository\")[0];
string fold1 = path1.ToLower().Split(@"build\filerepository\")[1];
Expand All @@ -135,7 +135,7 @@ private static string Sanitize(string path1)
return f1;
}

if (path1.Contains(@"Windows\winsxs\", StringComparison.InvariantCultureIgnoreCase))
if (path1.Contains(@"Windows\winsxs\", StringComparison.OrdinalIgnoreCase))
{
string fold1T = path1.ToLower().Split(@"windows\winsxs\")[0];
string fold1 = path1.ToLower().Split(@"windows\winsxs\")[1];
Expand Down Expand Up @@ -171,7 +171,7 @@ private static bool ExcludedFromChecks(string path)
{
string index = @"install.wim\3\";

if (!path.Contains(index, StringComparison.InvariantCultureIgnoreCase))
if (!path.Contains(index, StringComparison.OrdinalIgnoreCase))
{
return true;
}
Expand Down
123 changes: 82 additions & 41 deletions Windows Build Identifier/Identification/InstalledImage/DetectionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using WindowsBuildIdentifier.Interfaces;

namespace WindowsBuildIdentifier.Identification.InstalledImage
Expand Down Expand Up @@ -56,54 +57,64 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
string softwareHivePath = "";
string systemHivePath = "";
string userPath = "";

string kernelEntry = fileentries.FirstOrDefault(x =>
(x.EndsWith(@"\ntkrnlmp.exe", StringComparison.InvariantCultureIgnoreCase) ||
x.EndsWith(@"\ntoskrnl.exe", StringComparison.InvariantCultureIgnoreCase))
&& x.Contains("System32", StringComparison.InvariantCultureIgnoreCase));
string virtualEditionsPath = "";

string kernelEntry = fileentries
.Where(x =>
(x.EndsWith(@"\ntkrnlmp.exe", StringComparison.OrdinalIgnoreCase) ||
x.EndsWith(@"\ntoskrnl.exe", StringComparison.OrdinalIgnoreCase)))
.OrderBy(x => x.Contains("System32", StringComparison.OrdinalIgnoreCase))
.FirstOrDefault();
if (kernelEntry != null)
{
kernelPath = installProvider.ExpandFile(kernelEntry);
}

string hvEntry = fileentries.FirstOrDefault(x =>
(x.EndsWith(@"\hvax64.exe", StringComparison.InvariantCultureIgnoreCase) // AMD64
|| x.EndsWith(@"\hvix64.exe", StringComparison.InvariantCultureIgnoreCase) // Intel64
|| x.EndsWith(@"\hvaa64.exe", StringComparison.InvariantCultureIgnoreCase)) // ARM64
&& x.Contains("System32", StringComparison.InvariantCultureIgnoreCase));
(x.EndsWith(@"\hvax64.exe", StringComparison.OrdinalIgnoreCase) // AMD64
|| x.EndsWith(@"\hvix64.exe", StringComparison.OrdinalIgnoreCase) // Intel64
|| x.EndsWith(@"\hvaa64.exe", StringComparison.OrdinalIgnoreCase)) // ARM64
&& x.Contains("System32", StringComparison.OrdinalIgnoreCase));
if (hvEntry != null)
{
hvPath = installProvider.ExpandFile(hvEntry);
}

string shell32Entry = fileentries.FirstOrDefault(x =>
x.EndsWith(@"system32\shell32.dll", StringComparison.InvariantCultureIgnoreCase));
x.EndsWith(@"system32\shell32.dll", StringComparison.OrdinalIgnoreCase));
if (shell32Entry != null)
{
shell32Path = installProvider.ExpandFile(shell32Entry);
}

string softwareHiveEntry = fileentries.FirstOrDefault(x =>
x.EndsWith(@"system32\config\software", StringComparison.InvariantCultureIgnoreCase));
x.EndsWith(@"system32\config\software", StringComparison.OrdinalIgnoreCase));
if (softwareHiveEntry != null)
{
softwareHivePath = installProvider.ExpandFile(softwareHiveEntry);
}

string systemHiveEntry = fileentries.FirstOrDefault(x =>
x.EndsWith(@"system32\config\system", StringComparison.InvariantCultureIgnoreCase));
x.EndsWith(@"system32\config\system", StringComparison.OrdinalIgnoreCase));
if (systemHiveEntry != null)
{
systemHivePath = installProvider.ExpandFile(systemHiveEntry);
}

string userEntry = fileentries.FirstOrDefault(x =>
x.EndsWith(@"\system32\user.exe", StringComparison.InvariantCultureIgnoreCase));
x.EndsWith(@"\system32\user.exe", StringComparison.OrdinalIgnoreCase));
if (userEntry != null)
{
userPath = installProvider.ExpandFile(userEntry);
}

string virtualEditionsEntry = fileentries.FirstOrDefault(x =>
x.EndsWith(@"\Editions\EditionMappings.xml", StringComparison.OrdinalIgnoreCase));
if (virtualEditionsEntry != null)
{
virtualEditionsPath = installProvider.ExpandFile(virtualEditionsEntry);
}

#region Version Gathering

VersionInfo1 info = new();
Expand All @@ -121,7 +132,7 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
if (report.Architecture == MachineType.x86)
{
string possibleNec98 = fileentries.FirstOrDefault(x =>
x.Contains(@"system32\hal98", StringComparison.InvariantCultureIgnoreCase));
x.Contains(@"system32\hal98", StringComparison.OrdinalIgnoreCase));
if (possibleNec98 != null)
{
report.Architecture = MachineType.nec98;
Expand All @@ -145,7 +156,7 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
report.Licensing = info2.Licensing;
report.LanguageCodes = info2.LanguageCodes;

if (report.LanguageCodes == null || report.LanguageCodes.Length == 0)
if (!string.IsNullOrEmpty(kernelPath) && (report.LanguageCodes == null || report.LanguageCodes.Length == 0))
{
FileVersionInfo infover = FileVersionInfo.GetVersionInfo(kernelPath);

Expand Down Expand Up @@ -188,6 +199,14 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
report.CompileDate = correctVersion.CompileDate;
}

if (report.BuildNumber == 0)
{
Console.WriteLine(
"Couldn't find Windows version data within this image.");
// couldn't find a good install within this image
return null;
}

// we have to scan all binaries because early versions of NT
// do not report the same versions in all binaries
if (report.BuildNumber < 1130)
Expand All @@ -197,9 +216,9 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
ulong buildwindow = report.BuildNumber + 50;
foreach (string binary in installProvider.GetFileSystemEntries())
{
if (binary.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase) ||
binary.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase) ||
binary.EndsWith(".sys", StringComparison.InvariantCultureIgnoreCase))
if (binary.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) ||
binary.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) ||
binary.EndsWith(".sys", StringComparison.OrdinalIgnoreCase))
{
string file = "";
try
Expand Down Expand Up @@ -244,7 +263,7 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
#region Edition Gathering

bool isUnstaged =
fileentries.Any(x => x.StartsWith(@"packages\", StringComparison.InvariantCultureIgnoreCase));
fileentries.Any(x => x.StartsWith(@"packages\", StringComparison.OrdinalIgnoreCase));

if (isUnstaged)
{
Expand Down Expand Up @@ -283,7 +302,7 @@ public static WindowsImage IdentifyWindowsNT(IWindowsInstallProviderInterface in
else if (!string.IsNullOrEmpty(systemHivePath))
{
Console.WriteLine("Extracting additional edition information");
(string baseSku, string sku) = ExtractEditionFromRegistry(systemHivePath, softwareHivePath);
(string baseSku, string sku) = ExtractEditionFromRegistry(systemHivePath, softwareHivePath, virtualEditionsPath);
report.BaseSku = baseSku;
report.Sku = sku;
}
Expand Down Expand Up @@ -311,27 +330,27 @@ public static WindowsImage FixSkuNames(WindowsImage report, bool isUnstaged)
{
if (report.BuildNumber > 2195)
{
if (report.Sku.Equals("personal", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("personal", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "Home";
}

if (report.Sku.Equals("advancedserver", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("advancedserver", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "EnterpriseServer";
}
}
else
{
if (report.Sku.Equals("EnterpriseServer", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("EnterpriseServer", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "AdvancedServer";
}
}

if (report.BuildNumber >= 1911)
{
if (report.Sku.Equals("workstation", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("workstation", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "Professional";
}
Expand All @@ -342,17 +361,17 @@ public static WindowsImage FixSkuNames(WindowsImage report, bool isUnstaged)
{
foreach (string skuunstaged in report.Editions)
{
if (skuunstaged.Contains("server", StringComparison.InvariantCultureIgnoreCase) &&
skuunstaged.EndsWith("hyperv", StringComparison.InvariantCultureIgnoreCase) ||
skuunstaged.Contains("server", StringComparison.InvariantCultureIgnoreCase) &&
skuunstaged.EndsWith("v", StringComparison.InvariantCultureIgnoreCase))
if (skuunstaged.Contains("server", StringComparison.OrdinalIgnoreCase) &&
skuunstaged.EndsWith("hyperv", StringComparison.OrdinalIgnoreCase) ||
skuunstaged.Contains("server", StringComparison.OrdinalIgnoreCase) &&
skuunstaged.EndsWith("v", StringComparison.OrdinalIgnoreCase))
{
if (!report.Types.Contains(Type.ServerV))
{
report.Types.Add(Type.ServerV);
}
}
else if (skuunstaged.Contains("server", StringComparison.InvariantCultureIgnoreCase))
else if (skuunstaged.Contains("server", StringComparison.OrdinalIgnoreCase))
{
if (!report.Types.Contains(Type.Server))
{
Expand All @@ -370,27 +389,27 @@ public static WindowsImage FixSkuNames(WindowsImage report, bool isUnstaged)
}
else if (!string.IsNullOrEmpty(report.Sku))
{
if (report.Sku.Equals("ads", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("ads", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "AdvancedServer";
}

if (report.Sku.Equals("pro", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Equals("pro", StringComparison.OrdinalIgnoreCase))
{
report.Sku = "Professional";
}

if (report.Sku.Contains("server", StringComparison.InvariantCultureIgnoreCase) &&
report.Sku.EndsWith("hyperv", StringComparison.InvariantCultureIgnoreCase) ||
report.Sku.Contains("server", StringComparison.InvariantCultureIgnoreCase) &&
report.Sku.EndsWith("v", StringComparison.InvariantCultureIgnoreCase))
if (report.Sku.Contains("server", StringComparison.OrdinalIgnoreCase) &&
report.Sku.EndsWith("hyperv", StringComparison.OrdinalIgnoreCase) ||
report.Sku.Contains("server", StringComparison.OrdinalIgnoreCase) &&
report.Sku.EndsWith("v", StringComparison.OrdinalIgnoreCase))
{
if (!report.Types.Contains(Type.ServerV))
{
report.Types.Add(Type.ServerV);
}
}
else if (report.Sku.Contains("server", StringComparison.InvariantCultureIgnoreCase))
else if (report.Sku.Contains("server", StringComparison.OrdinalIgnoreCase))
{
if (!report.Types.Contains(Type.Server))
{
Expand Down Expand Up @@ -442,9 +461,21 @@ private static VersionInfo1 ExtractVersionInfo(string kernelPath)
}

private static (string baseSku, string sku) ExtractEditionFromRegistry(string systemHivePath,
string softwareHivePath)
string softwareHivePath, string virtualEditionsPath)
{
(string baseSku, string sku) ret = ("", "");
Dictionary<string, string> virtualEditionsMapping = new Dictionary<string, string>();

if (!string.IsNullOrEmpty(virtualEditionsPath))
{
using (FileStream virtualEditionsStream = new(virtualEditionsPath, FileMode.Open, FileAccess.Read))
{
var veDoc = XDocument.Load(virtualEditionsStream);
virtualEditionsMapping = veDoc.Descendants("Edition")
.Where(e => e.Attribute("virtual")?.Value == "true" && e.Element("Name") != null && e.Element("ParentEdition") != null)
.ToDictionary(e => e.Element("Name").Value, e => e.Element("ParentEdition").Value);
}
}

using (FileStream softHiveStream = new(softwareHivePath, FileMode.Open, FileAccess.Read))
using (RegistryHive softHive = new(softHiveStream))
Expand All @@ -457,6 +488,16 @@ private static (string baseSku, string sku) ExtractEditionFromRegistry(string sy
string edition = subkey.GetValue("EditionID") as string;
string compositionEdition = subkey.GetValue("CompositionEditionID") as string;

if (virtualEditionsMapping.ContainsKey(edition))
{
return (virtualEditionsMapping[edition], edition);
}

if (!string.IsNullOrEmpty(virtualEditionsPath))
{
return (edition, edition);
}

if (!string.IsNullOrEmpty(edition) && !string.IsNullOrEmpty(compositionEdition))
{
return (compositionEdition, edition);
Expand Down Expand Up @@ -783,7 +824,7 @@ private static VersionInfo2 ExtractVersionInfo2(string softwareHivePath, string
x.LCID == int.Parse(langid, NumberStyles.HexNumber, CultureInfo.CurrentCulture)).Name;
if (result.LanguageCodes == null ||
result.LanguageCodes != null && !result.LanguageCodes.Any(x =>
x.Equals(name, StringComparison.InvariantCultureIgnoreCase)))
x.Equals(name, StringComparison.OrdinalIgnoreCase)))
{
if (result.LanguageCodes == null)
{
Expand All @@ -805,7 +846,7 @@ private static string[] GatherUnstagedEditions(IWindowsInstallProviderInterface
SortedSet<string> report = new();

IEnumerable<string> packages = installProvider.GetFileSystemEntries().Where(x =>
x.StartsWith(@"packages\", StringComparison.InvariantCultureIgnoreCase));
x.StartsWith(@"packages\", StringComparison.OrdinalIgnoreCase));

IEnumerable<string> files = packages.Where(x => x.Count(y => y == '\\') == 1 && x.Contains('.'));

Expand All @@ -824,7 +865,7 @@ private static string[] GatherUnstagedEditions(IWindowsInstallProviderInterface
fileArray.Contains(name + ".xml"))
{
// This should be a target edition package
report.Add(name.Replace(@"packages\", "", StringComparison.InvariantCultureIgnoreCase));
report.Add(name.Replace(@"packages\", "", StringComparison.OrdinalIgnoreCase));
}
}
}
Expand All @@ -834,7 +875,7 @@ private static string[] GatherUnstagedEditions(IWindowsInstallProviderInterface

IEnumerable<string> editionFolders = packages.Where(x => x.Count(y => y == '\\') == 1);
IEnumerable<string> editions = editionFolders.Select(x =>
x.Replace(@"packages\", "", StringComparison.InvariantCultureIgnoreCase));
x.Replace(@"packages\", "", StringComparison.OrdinalIgnoreCase));

report.UnionWith(editions);
}
Expand Down
Loading