From 6f83070ecccab3759065d6253d12283487a23b23 Mon Sep 17 00:00:00 2001
From: short <>
Date: Wed, 3 Sep 2003 16:01:28 +0000
Subject: [PATCH] Include 'No Service Pack' Microsoft Windows XP ids. Cosmetic:
 Id all 'Windows XP' products as 'Microsoft Windows XP'.

---
 src/install/acquire/w32-mod-id.captivemodid.xml | 82 +++++++++++++++++++------
 1 file changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/install/acquire/w32-mod-id.captivemodid.xml b/src/install/acquire/w32-mod-id.captivemodid.xml
index 3901bf2..bb72a72 100644
--- a/src/install/acquire/w32-mod-id.captivemodid.xml
+++ b/src/install/acquire/w32-mod-id.captivemodid.xml
@@ -2,57 +2,103 @@
 <modid>
 	<!-- xpsp1_en_x86_chk.exe -->
 	<module type="cabinet"      length="160852568" priority="100" md5="ed5c40cab78513084f9a11cdd3a25361"
-			id="Windows XP Service Pack 1 Checked Build U.S. Cabinet" />
+			id="Microsoft Windows XP Service Pack 1 Checked Build U.S. Cabinet" />
 	<!-- xpsp1a_en_x86_chk.exe -->
 	<module type="cabinet"      length="151583320" priority="100" md5="257c90b85f20f597caad8a4bd8c481ef"
-			id="Windows XP Service Pack 1a Checked Build U.S. Cabinet" />
+			id="Microsoft Windows XP Service Pack 1a Checked Build U.S. Cabinet" />
 		<!-- ntoskrnl.exe -->
 		<module type="ntoskrnl.exe" length="3427328"   priority="100" md5="f2935c744335d920c27d6fd47e814863"
-				id="Windows XP Service Pack 1/1a Checked Build U.S. Kernel" />
+				id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. Kernel" />
 			<!-- ntoskrnl.ex_ -->
 			<module type="cabinet"      length="1242123"   priority="100" md5="3981722586e1d399e6b97143e7b1e3e7"
-					id="Windows XP Service Pack 1/1a Checked Build U.S. Kernel Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. Kernel Cabinet" />
 		<!-- ntfs.sys -->
 		<module type="ntfs.sys"     length="823936"    priority="100" md5="a63ada389d34a9b52ca66872f1d762f2"
-				id="Windows XP Service Pack 1/1a Checked Build U.S. NTFS Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. NTFS Filesystem" />
 		<!-- fastfat.sys -->
 		<module type="fastfat.sys"  length="225408"    priority="100" md5="38ceddcb1de3895ca12893662fcad343"
-				id="Windows XP Service Pack 1/1a Checked Build U.S. FastFAT/vfat Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. FastFAT/vfat Filesystem" />
 			<!-- fastfat.sy_ -->
 			<module type="cabinet"      length="92420"     priority="100" md5="b81ce7d78d3b7d50f694ac4231c7ca79"
-					id="Windows XP Service Pack 1/1a Checked Build U.S. FastFAT/vfat Filesystem Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. FastFAT/vfat Filesystem Cabinet" />
 		<!-- cdfs.sys -->
 		<module type="cdfs.sys"     length="115840"    priority="100" md5="b4c6711edd5ce258f077f019fc4ecdaf"
-				id="Windows XP Service Pack 1/1a Checked Build U.S. CD-ROM/iso-9660 Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. CD-ROM/iso-9660 Filesystem" />
 			<!-- cdfs.sy_ -->
 			<module type="cabinet"      length="44369"     priority="100" md5="956eae99b16722d86f6bf46b1dd6f299"
-					id="Windows XP Service Pack 1/1a Checked Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Checked Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
 
 	<module type="cabinet"      length="140440152" priority="50"  md5="ecf625f6563dfcaeeecc4b1481899d4b"
-			id="Windows XP Service Pack 1 Free Build U.S." /><!--     xpsp1_en_x86.exe -->
+			id="Microsoft Windows XP Service Pack 1 Free Build U.S." /><!--     xpsp1_en_x86.exe -->
 	<module type="cabinet"      length="131170400" priority="50"  md5="363af75cf99d554f8c4420448f2e0669"
-			id="Windows XP Service Pack 1a Free Build U.S." /><!--    xpsp1a_en_x86.exe -->
+			id="Microsoft Windows XP Service Pack 1a Free Build U.S." /><!--    xpsp1a_en_x86.exe -->
 		<!-- ntoskrnl.exe -->
 		<module type="ntoskrnl.exe" length="2042240"   priority="50"  md5="b9080d97dbd631aadf9128f7316958d2"
-				id="Windows XP Service Pack 1/1a Free Build U.S. Kernel" />
+				id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. Kernel" />
 			<!-- ntoskrnl.ex_ -->
 			<module type="cabinet"      length="990649"    priority="50"  md5="9545a215e18ee48b3cfe03c7a5ad6c63"
-					id="Windows XP Service Pack 1/1a Free Build U.S. Kernel Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. Kernel Cabinet" />
 		<!-- ntfs.sys -->
 		<module type="ntfs.sys"     length="561920"    priority="50"  md5="e3ae9c79498210a5f39fe5a9ad62bc55"
-				id="Windows XP Service Pack 1/1a Free Build U.S. NTFS Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. NTFS Filesystem" />
 		<!-- fastfat.sys -->
 		<module type="fastfat.sys"  length="145152"    priority="50"  md5="e4a3a8f3e60b542a747b10e86faa5dad"
-				id="Windows XP Service Pack 1/1a Free Build U.S. FastFAT/vfat Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. FastFAT/vfat Filesystem" />
 			<!-- fastfat.sy_ -->
 			<module type="cabinet"      length="76986"     priority="50"  md5="69732eff28f37b91b020c228987f9e5f"
-					id="Windows XP Service Pack 1/1a Free Build U.S. FastFAT/vfat Filesystem Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. FastFAT/vfat Filesystem Cabinet" />
 		<!-- cdfs.sys -->
 		<module type="cdfs.sys"     length="59648"     priority="50"  md5="049a38451f2611caf2fd528e023a0b5a"
-				id="Windows XP Service Pack 1/1a Free Build U.S. CD-ROM/iso-9660 Filesystem" />
+				id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. CD-ROM/iso-9660 Filesystem" />
 			<!-- cdfs.sy_ -->
 			<module type="cabinet"      length="32711"     priority="50"  md5="19139b835ca2eb12b2695a3c6cdfe598"
-					id="Windows XP Service Pack 1/1a Free Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
+					id="Microsoft Windows XP Service Pack 1/1a Free Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
+
+	<!-- Microsoft Windows XP (No Service Pack) Checked Build U.S. -->
+		<!-- ntoskrnl.exe -->
+		<module type="ntoskrnl.exe" length="3396096"   priority="90"  md5="aafc4863e2aba5287d84a3da05105a92"
+				id="Microsoft Windows XP (No Service Pack) Checked Build U.S. Kernel" />
+			<!-- ntoskrnl.ex_ -->
+			<module type="cabinet"      length="1229871"   priority="90"  md5="ffd9de8245c9a2239c5bdccd25c301bc"
+					id="Microsoft Windows XP (No Service Pack) Checked Build U.S. Kernel Cabinet" />
+		<!-- ntfs.sys -->
+		<module type="ntfs.sys"     length="809344"    priority="90"  md5="962efb6be87a642eb5d0d4b381d3786b"
+				id="Microsoft Windows XP (No Service Pack) Checked Build U.S. NTFS Filesystem" />
+		<!-- fastfat.sys -->
+		<module type="fastfat.sys"  length="227328"    priority="90"  md5="595a1602383e6c18e233aaa97fc3ba2e"
+				id="Microsoft Windows XP (No Service Pack) Checked Build U.S. FastFAT/vfat Filesystem" />
+			<!-- fastfat.sy_ -->
+			<module type="cabinet"      length="92500"     priority="90"  md5="a1afe5e343bc0d922c21328c3d250f41"
+					id="Microsoft Windows XP (No Service Pack) Checked Build U.S. FastFAT/vfat Filesystem Cabinet" />
+		<!-- cdfs.sys -->
+		<module type="cdfs.sys"     length="114688"    priority="90"  md5="5a75583c08d709d5ed926e7dfed5c09c"
+				id="Microsoft Windows XP (No Service Pack) Checked Build U.S. CD-ROM/iso-9660 Filesystem" />
+			<!-- cdfs.sy_ -->
+			<module type="cabinet"      length="43821"     priority="90"  md5="44f9d65d8045a18c14dfde732324f361"
+					id="Microsoft Windows XP (No Service Pack) Checked Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
+
+	<!-- Microsoft Windows XP (No Service Pack) Free Build U.S. -->
+		<!-- ntoskrnl.exe -->
+		<module type="ntoskrnl.exe" length="1982208"   priority="40"  md5="a29222d5281056e497408fcc9062f749"
+				id="Microsoft Windows XP (No Service Pack) Free Build U.S. Kernel" />
+			<!-- ntoskrnl.ex_ -->
+			<module type="cabinet"      length="969331"    priority="40"  md5="d76e823d8b9004ce658accae0235cbd7"
+					id="Microsoft Windows XP (No Service Pack) Free Build U.S. Kernel Cabinet" />
+		<!-- ntfs.sys -->
+		<module type="ntfs.sys"     length="533504"    priority="40"  md5="70fae0dcfdfaa0838d6778fca028ce01"
+				id="Microsoft Windows XP (No Service Pack) Free Build U.S. NTFS Filesystem" />
+		<!-- fastfat.sys -->
+		<module type="fastfat.sys"  length="144768"    priority="40"  md5="998bbf32a142910b5e539df4225df892"
+				id="Microsoft Windows XP (No Service Pack) Free Build U.S. FastFAT/vfat Filesystem" />
+			<!-- fastfat.sy_ -->
+			<module type="cabinet"      length="76742"     priority="40"  md5="2c0b027760858b4b6ff823deb61b1785"
+					id="Microsoft Windows XP (No Service Pack) Free Build U.S. FastFAT/vfat Filesystem Cabinet" />
+		<!-- cdfs.sys -->
+		<module type="cdfs.sys"     length="62208"     priority="40"  md5="bab95bbefd0676eab2dc02cf88c99fc5"
+				id="Microsoft Windows XP (No Service Pack) Free Build U.S. CD-ROM/iso-9660 Filesystem" />
+			<!-- cdfs.sy_ -->
+			<module type="cabinet"      length="34873"     priority="40"  md5="b6d7f84df4431f79173574b873a9edf0"
+					id="Microsoft Windows XP (No Service Pack) Free Build U.S. CD-ROM/iso-9660 Filesystem Cabinet" />
 
 	<module type="ext2fsd.sys"  length="59514"     priority="50"  md5="8803c8f4c535d6a58606bcd0ff3f77e9"
 			id="ext2 Filesystem v0.10a by http://sys.xiloo.com Free Build U.S." />
-- 
1.8.3.1