From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
...ise_with_service_pack_2_beta_x86_288250.iso.txt | 29 ++++++++++++
...sta_enterprise_with_sp2_beta_x64_288254.iso.txt | 29 ++++++++++++
test/isodata/windows/win2k/Win2000S-disk.iso.txt | 29 ++++++++++++
...03_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt | 29 ++++++++++++
...03_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt | 16 ++++++
...2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt | 29 ++++++++++++
...2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt | 16 ++++++
..._enterprise_standard_sp2_x64_dvd_342336.iso.txt | 29 ++++++++++++
..._enterprise_standard_sp2_x86_dvd_342333.iso.txt | 29 ++++++++++++
...se_datacenter_and_web_x64_dvd_x15-59754.iso.txt | 29 ++++++++++++
...en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt | 29 ++++++++++++
...en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt | 29 ++++++++++++
...al_with_service_pack_3_x86_cd_x14-80428.iso.txt | 29 ++++++++++++
.../winxp/en_windows_xp_professional_x64.iso.txt | 29 ++++++++++++
.../windows/winxp/en_winxp_mce_2005_cd1.iso.txt | 29 ++++++++++++
.../windows/winxp/en_winxp_mce_2005_cd2.iso.txt | 16 ++++++
.../windows/winxp/en_winxp_pro_with_sp2.iso.txt | 29 ++++++++++++
test/test-isodetect.c | 49 +++++++++++++++++++-
18 files changed, 502 insertions(+), 1 deletions(-)
create mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
create mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
create mode 100644 test/isodata/windows/win2k/Win2000S-disk.iso.txt
create mode 100644 test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
create mode 100644 test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
create mode 100644 test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
create mode 100644 test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
create mode 100644 test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
create mode 100644 test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
create mode 100644 test/isodata/windows/win2k8/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
create mode 100644 test/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
create mode 100644 test/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
create mode 100644 test/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
create mode 100644 test/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
create mode 100644 test/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
new file mode 100644
index 0000000..bf84241
--- /dev/null
+++ b/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FB1EVOL_EN_DVD
+Volume set id: FB1EVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1185707
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 25F 607
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
new file mode 100644
index 0000000..e2d8ddd
--- /dev/null
+++ b/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FB1EXVOL_EN_DVD
+Volume set id: FB1EXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1572259
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 25D 605
diff --git a/test/isodata/windows/win2k/Win2000S-disk.iso.txt b/test/isodata/windows/win2k/Win2000S-disk.iso.txt
new file mode 100644
index 0000000..19851f3
--- /dev/null
+++ b/test/isodata/windows/win2k/Win2000S-disk.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: WIN2000_EN
+Volume set id: WIN2000_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.46 (10/12/2000 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 249152
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 34C 844
diff --git a/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
new file mode 100644
index 0000000..ea76f9d
--- /dev/null
+++ b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd1_X13-05460.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: CRMEFPP_EN
+Volume set id: CRMEFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 304942
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff FB 251
diff --git a/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
new file mode 100644
index 0000000..bc542e4
--- /dev/null
+++ b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_with_sp2_cd2_X13-68584.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: CR0ECD2_EN
+Volume set id: CR0ECD2_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 62163
+NO Joliet present
+NO Rock Ridge present
diff --git a/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
new file mode 100644
index 0000000..99fe605
--- /dev/null
+++ b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_X13-06188.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: CRMEXFPP_EN
+Volume set id: CRMEXFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 319428
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 108 264
diff --git a/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
new file mode 100644
index 0000000..c5802b7
--- /dev/null
+++ b/test/isodata/windows/win2k3/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd2_X13-68588.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: CR0ECD2X_EN
+Volume set id: CR0ECD2X_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 85522
+NO Joliet present
+NO Rock Ridge present
diff --git a/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt b/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
new file mode 100644
index 0000000..ddf2156
--- /dev/null
+++ b/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: KRTMSXVOL_EN_DVD
+Volume set id: KRTMSXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1345648
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 33F 831
diff --git a/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt b/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
new file mode 100644
index 0000000..1c520b4
--- /dev/null
+++ b/test/isodata/windows/win2k8/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: KRTMSVOL_EN_DVD
+Volume set id: KRTMSVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 992309
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 33F 831
diff --git a/test/isodata/windows/win2k8/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt b/test/isodata/windows/win2k8/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
new file mode 100644
index 0000000..56c9790
--- /dev/null
+++ b/test/isodata/windows/win2k8/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRMSXVOL_EN_DVD
+Volume set id: GRMSXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1463281
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 3E4 996
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
new file mode 100644
index 0000000..1513e18
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_x15-65922.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRMCULXFRER_EN_DVD
+Volume set id: GRMCULXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1574554
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
new file mode 100644
index 0000000..1f7de44
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_x15-65921.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRMCULFRER_EN_DVD
+Volume set id: GRMCULFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1221628
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 2DF 735
diff --git a/test/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt b/test/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
new file mode 100644
index 0000000..4348b3e
--- /dev/null
+++ b/test/isodata/windows/winxp/en_windows_xp_professional_with_service_pack_3_x86_cd_x14-80428.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRTMPFPP_EN
+Volume set id: GRTMPFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 301639
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 159 345
diff --git a/test/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt b/test/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
new file mode 100644
index 0000000..f9d6e61
--- /dev/null
+++ b/test/isodata/windows/winxp/en_windows_xp_professional_x64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: AX2PXFPP_EN
+Volume set id: AX2PXFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 299887
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff E9 233
diff --git a/test/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt b/test/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
new file mode 100644
index 0000000..728a80c
--- /dev/null
+++ b/test/isodata/windows/winxp/en_winxp_mce_2005_cd1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: MX2PFPP_EN
+Volume set id: MX2PFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 300932
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 156 342
diff --git a/test/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt b/test/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
new file mode 100644
index 0000000..2c81497
--- /dev/null
+++ b/test/isodata/windows/winxp/en_winxp_mce_2005_cd2.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: MRMSD2_EN
+Volume set id: MRMSD2_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 132247
+NO Joliet present
+NO Rock Ridge present
diff --git a/test/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt b/test/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
new file mode 100644
index 0000000..f870ed2
--- /dev/null
+++ b/test/isodata/windows/winxp/en_winxp_pro_with_sp2.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: VX2PFPP_EN
+Volume set id: VX2PFPP_EN
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 TM)
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 300348
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 156 342
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 77d6752..2f88083 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -162,7 +162,7 @@ static GList *load_distros(GFile *dir, GError **error)
g_object_unref(child);
- if (!isos)
+ if (!isos && *error)
goto error;
ret = g_list_concat(ret, isos);
}
@@ -246,6 +246,52 @@ END_TEST
+START_TEST(test_windows)
+{
+ OsinfoLoader *loader = osinfo_loader_new();
+ OsinfoDb *db = osinfo_loader_get_db(loader);
+ GList *isos = NULL;
+ GList *tmp;
+ GError *error = NULL;
+
+ fail_unless(OSINFO_IS_LOADER(loader), "Loader is not a LOADER");
+ fail_unless(OSINFO_IS_DB(db), "Db is not a DB");
+
+ osinfo_loader_process_path(loader, SRCDIR "/data", &error);
+ fail_unless(error == NULL, error ? error->message : "none");
+
+ isos = load_isos("windows", &error);
+
+ fail_unless(isos != NULL, "ISOs must not be NULL %s", error ? error->message : "unknown");
+
+ tmp = isos;
+ while (tmp) {
+ struct ISOInfo *info = tmp->data;
+ OsinfoMedia *media = NULL;
+ OsinfoOs *os = osinfo_db_guess_os_from_media(db,
+ info->media,
+ &media);
+
+ fail_unless(os != NULL, "ISO %s matched OS %s",
+ info->filename, info->shortid);
+
+ const gchar *shortid = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
+ fail_unless(g_str_equal(shortid, info->shortid),
+ "ISO %s matched OS %s, not %s",
+ info->filename, info->shortid, shortid);
+
+ tmp = tmp->next;
+ }
+
+ g_list_foreach(isos, (GFunc)free_iso, NULL);
+ g_list_free(isos);
+
+ g_object_unref(db);
+}
+END_TEST
+
+
+
static Suite *
list_suite(void)
{
@@ -254,6 +300,7 @@ list_suite(void)
tcase_set_timeout(tc, 20);
tcase_add_test(tc, test_fedora);
+ tcase_add_test(tc, test_windows);
suite_add_tcase(s, tc);
return s;
}
--
1.7.7.6
