STORM-1950 MAINT-2981 Update regex to fix unmatched entries from Oz stats pull

1 files changed, 127 insertions, 98 deletions

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index eef760b9c2..990693d79e 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -34,7 +34,11 @@
 
 3Dfx									.*3Dfx.*											0	0	0	0
 3Dlabs									.*3Dlabs.*											0	0	0	0
+Hijacker								.*Mohr.*Hijacker.*									0	0	0	0
+ATI GeForce Lulz						.*ATI.*GeForce.*									0	0	0	0
 ATI 3D-Analyze							.*ATI.*3D-Analyze.*									0	0	0	0
+ATI Protoype							.*ATI.*Prototype.*									0	0	0	0
+ATI ARES								.*ATI.*ARES.*									0	0	0	0
 ATI All-in-Wonder 7500					.*ATI.*All-in-Wonder 75.*							0	1	0	0
 ATI All-in-Wonder 8500					.*ATI.*All-in-Wonder 85.*							0	1	0	0
 ATI All-in-Wonder 9200					.*ATI.*All-in-Wonder 92.*							0	1	0	0
@@ -46,14 +50,14 @@ ATI All-in-Wonder X1800					.*ATI.*All-in-Wonder X18.*							3	1	0	0
 ATI All-in-Wonder X1900					.*ATI.*All-in-Wonder X19.*							3	1	0	0
 ATI All-in-Wonder PCI-E					.*ATI.*All-in-Wonder.*PCI-E.*						1	1	0	0
 ATI All-in-Wonder Radeon				.*ATI.*All-in-Wonder Radeon.*						0	1	0	0
-ATI Radeon X1300						.*ATI.*(Radeon|Diamond|ASUS) X13.* ?.*							2	1	1	2.1
-ATI Radeon X1400						.*ATI.*(Radeon|Diamond|ASUS) X14.* ?.*							2	1	1	2.1
-ATI Radeon X1500						.*ATI.*(Radeon|Diamond|ASUS) X15.* ?.*							2	1	1	2.1
-ATI Radeon X1600						.*ATI.*(Radeon|Diamond|ASUS) X16.* ?.*							2	1	1	2.1
-ATI Radeon X1700						.*ATI.*(Radeon|Diamond|ASUS) X17.* ?.*							2	1	1	2.1
-ATI Radeon X1800						.*ATI.*(Radeon|Diamond|ASUS) X18.* ?.*						3	1	1	2.1
-ATI Radeon X1900						.*ATI.*(Radeon|Diamond|ASUS) X19.* ?.*				2	1	1	2.1
-ATI Radeon X2800						.*ATI.*(Radeon|Diamond|ASUS) X28.* ?.*							2	1	1	2.1
+ATI Radeon X1300						.*ATI.*(Radeon|Diamond|ASUS) *X13.* ?.*							2	1	1	2.1
+ATI Radeon X1400						.*ATI.*(Radeon|Diamond|ASUS) *X14.* ?.*							2	1	1	2.1
+ATI Radeon X1500						.*ATI.*(Radeon|Diamond|ASUS) *X15.* ?.*							2	1	1	2.1
+ATI Radeon X1600						.*ATI.*(Radeon|Diamond|ASUS) *X16.* ?.*							2	1	1	2.1
+ATI Radeon X1700						.*ATI.*(Radeon|Diamond|ASUS) *X17.* ?.*							2	1	1	2.1
+ATI Radeon X1800						.*ATI.*(Radeon|Diamond|ASUS) *X18.* ?.*						3	1	1	2.1
+ATI Radeon X1900						.*ATI.*(Radeon|Diamond|ASUS) *X19.* ?.*				2	1	1	2.1
+ATI Radeon X2800						.*ATI.*(Radeon|Diamond|ASUS) *X28.* ?.*							2	1	1	2.1
 ATI Display Adapter						.*ATI.*display adapter.*							1	1	1	4.1
 ATI FireGL 5200							.*ATI.*FireGL V52.*									1	1	1	2.1
 ATI FireGL 5xxx							.*ATI.*FireGL V5.*									2	1	1	3.3
@@ -106,6 +110,10 @@ ATI Mobility Radeon HD 5400				.*ATI.*Mobility.*HD 54.*							2	1	1	4.2
 ATI Mobility Radeon HD 5500				.*ATI.*Mobility.*HD 55.*							3	1	0	4.2
 ATI Mobility Radeon HD 5600				.*ATI.*Mobility.*HD 56.*							3	1	1	4.2
 ATI Mobility Radeon HD 5700				.*ATI.*Mobility.*HD 57.*							3	1	1	4.1
+ATI Mobility Radeon X1000				.*ATI.*Mobility.*Radeon ?X1.*								2	1	0	2.1
+ATI Mobility Radeon X1200				.*ATI.*Mobility.*Radeon ?X12.*								2	1	0	2.1
+ATI Mobility Radeon X2000				.*ATI.*Mobility.*Radeon ?X2.*								2	1	0	2.1
+ATI Mobility Radeon XX000				.*ATI.*Mobility.*Radeon ?Xx.*								2	1	0	2.1
 ATI Radeon HD 6200D/G/M				.*ATI.*AMD Radeon.* (HD|HD )62..[DGM].*				3	1	0	4.2
 ATI Radeon HD 6300D/G/M				.*ATI.*AMD Radeon.* (HD|HD )63..[DGM].*				3	1	1	4.2
 ATI Radeon HD 6400D/G/M				.*ATI.*AMD Radeon.* (HD|HD )64..[DGM].*				3	1	0	4.2
@@ -130,33 +138,36 @@ ATI Radeon HD 8600D/G/M				.*ATI.*AMD Radeon.* (HD|HD )86..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8700D/G/M				.*ATI.*AMD Radeon.* (HD|HD )87..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8800D/G/M				.*ATI.*AMD Radeon.* (HD|HD )88..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8900D/G/M				.*ATI.*AMD Radeon.* (HD|HD )89..[DGM].*				4	1	0	4.2
+ATI Radeon HD 5xx						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)5x.		1	1	1	4
 ATI Radeon HD 2300						.*ATI.*Radeon.* (HD|HD )23..						0	1	1	3.3
-ATI Radeon HD 2400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)24..				1	1	1	4
-ATI Radeon HD 2600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)26..				2	1	1	4
+ATI Radeon HD 2400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)24..		1	1	1	4
+ATI Radeon HD 2600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)26..		2	1	1	4
 ATI Radeon HD 2900						.*ATI.*Radeon.* (HD|HD )29..						3	1	1	3.3
 ATI Radeon HD 3000						.*ATI.*Radeon.* (HD|HD )30..						0	1	0	0
 ATI Radeon HD 3100						.*ATI.*Radeon.* (HD|HD )31..						1	1	0	0
 ATI Radeon HD 3200						.*ATI.*Radeon.* (HD|HD )32..						1	1	1	4
 ATI Radeon HD 3300						.*ATI.*Radeon.* (HD|HD )33..						1	1	1	3.3
-ATI Radeon HD 3400						.*ATI.*(Radeon|ASUS).* (HD|HD |AH|EAH)34..			1	1	1	4
+ATI Radeon HD 3400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |AH||AX|EAH)34..		1	1	1	4
 ATI Radeon HD 3500						.*ATI.*Radeon.* (HD|HD )35..						2	1	0	0
-ATI Radeon HD 3600						.*ATI.*(Radeon|ASUS).* (HD|HD |AH|EAH)36..			3	1	1	4
+ATI Radeon HD 3600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |AH||AX|EAH)36..		3	1	1	4
 ATI Radeon HD 3700						.*ATI.*Radeon.* (HD|HD )37..						3	1	0	3.3
 ATI HD3700								.*ATI.* HD37..										3	1	0	3.3
-ATI Radeon HD 3800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)38..				3	1	1	4
+ATI Radeon HD 3800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH|AX|)38..			3	1	1	4
 ATI Radeon HD 4100						.*ATI.*Radeon.* (HD|HD )41..						1	1	0	0
 ATI Radeon HD 4200						.*ATI.*Radeon.* (HD|HD )42..						1	1	1	4
-ATI Radeon HD 4300						.*ATI.*(Radeon|ASUS).* (HD4|HD 4|EAH4|4)3..			2	1	1	4
+ATI Radeon HD 4300						.*ATI.*(Radeon|ASUS).* (AH|AX|HD4|HD 4|EAH4|4)3..			2	1	1	4
 ATI Radeon HD 4400						.*ATI.*Radeon.* (HD|HD )44..						2	1	0	0
-ATI Radeon HD 4500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)45..				2	1	1	3.3
-ATI Radeon HD 4600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)46..				3	1	1	4
-ATI Radeon HD 4700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)47..				3	1	1	3.3
-ATI Radeon HD 4800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)48..				3	1	1	4
-ATI Radeon HD 5400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)54..				3	1	1	4.2
-ATI Radeon HD 5500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)55..				3	1	1	4.2
-ATI Radeon HD 5600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)56..				3	1	1	4.2
-ATI Radeon HD 5700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)57..				3	1	1	4.2
-ATI Radeon HD 5800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)58..				4	1	1	4.2
+ATI Radeon HD 4500						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)45..		2	1	1	3.3
+ATI RADEON E4690						.*ATI.*RADEON.* E46..								3	1	1	4
+ATI Radeon HD 4600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)46..		3	1	1	4
+ATI Radeon HD 4700						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)47..		3	1	1	3.3
+ATI Radeon HD 4800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)48..		3	1	1	4
+ATI Radeon HD 5000						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)50..		3	1	1	4.2
+ATI Radeon HD 5400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)54..		3	1	1	4.2
+ATI Radeon HD 5500						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)55..		3	1	1	4.2
+ATI Radeon HD 5600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)56..		3	1	1	4.2
+ATI Radeon HD 5700						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)57..		3	1	1	4.2
+ATI Radeon HD 5800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)58..		4	1	1	4.2
 ATI Radeon HD 5900						.*ATI.*Radeon.* (HD|HD )59..						4	1	1	4.2
 ATI Radeon HD 6200						.*ATI.*Radeon.* (HD|HD )62..						0	1	1	4.2
 ATI Radeon HD 6300						.*ATI.*Radeon.* (HD|HD )63..						1	1	1	4.2
@@ -166,23 +177,25 @@ ATI Radeon HD 6600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)66..				3	1	1	4.2
 ATI Radeon HD 6700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)67..				3	1	1	4.2
 ATI Radeon HD 6800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)68..				4	1	1	4.2
 ATI Radeon HD 6900						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)69..				5	1	1	4.2
-ATI Radeon HD 7100						.*ATI.*(Radeon|ASUS).* (HD|HD )71.*					2	1	0	0
-ATI Radeon HD 7200						.*ATI.*(Radeon|ASUS).* (HD|HD )72.*					2	1	0	4.2
-ATI Radeon HD 7300						.*ATI.*(Radeon|ASUS).* (HD|HD )73.*					2	1	0	4.2
-ATI Radeon HD 7400						.*ATI.*(Radeon|ASUS).* (HD|HD )74.*					2	1	0	4.2
-ATI Radeon HD 7500						.*ATI.*(Radeon|ASUS).* (HD|HD )75.*					3	1	1	4.2
-ATI Radeon HD 7600						.*ATI.*(Radeon|ASUS).* (HD|HD )76.*					3	1	0	4.2
-ATI Radeon HD 7700						.*ATI.*(Radeon|ASUS).* (HD|HD )77.*					4	1	1	4.2
-ATI Radeon HD 7800						.*ATI.*(Radeon|ASUS).* (HD|HD )78.*					5	1	1	4.2
-ATI Radeon HD 7900						.*ATI.*(Radeon|ASUS).* (HD|HD )79.*					5	1	1	4.2
-ATI Radeon HD 7000 Series				.*ATI.*(Radeon|ASUS).* (HD|HD )7000 Series.*		3	1	1	4.2
-ATI Radeon HD 8300 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )83.*					2	1	0	4.2
-ATI Radeon HD 8400 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )84.*					2	1	0	4.2
-ATI Radeon HD 8500 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )85.*					3	1	1	4.2
-ATI Radeon HD 8600 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )86.*					3	1	0	4.2
-ATI Radeon HD 8700 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )87.*					4	1	1	4.2
-ATI Radeon HD 8800 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )88.*					5	1	1	4.2
-ATI Radeon HD 8900 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD )89.*					5	1	1	4.2
+ATI Radeon HD 6x00						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)6x..				5	1	1	4.2
+ATI Radeon HD 7100						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)71.*					2	1	0	0
+ATI Radeon HD 7200						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)72.*					2	1	0	4.2
+ATI Radeon HD 7300						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)73.*					2	1	0	4.2
+ATI Radeon HD 7400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)74.*					2	1	0	4.2
+ATI Radeon HD 7500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)75.*					3	1	1	4.2
+ATI Radeon HD 7600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)76.*					3	1	0	4.2
+ATI Radeon HD 7700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)77.*					4	1	1	4.2
+ATI Radeon HD 7800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)78.*					5	1	1	4.2
+ATI Radeon HD 7900						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)79.*					5	1	1	4.2
+ATI Radeon HD 7000 Series				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)7000 Series.*		3	1	1	4.2
+ATI Radeon HD 8200						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)82.*					2	1	0	4.2
+ATI Radeon HD 8300 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)83.*					2	1	0	4.2
+ATI Radeon HD 8400 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)84.*					2	1	0	4.2
+ATI Radeon HD 8500 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)85.*					3	1	1	4.2
+ATI Radeon HD 8600 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)86.*					3	1	0	4.2
+ATI Radeon HD 8700 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)87.*					4	1	1	4.2
+ATI Radeon HD 8800 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)88.*					5	1	1	4.2
+ATI Radeon HD 8900 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)89.*					5	1	1	4.2
 ATI Radeon OpenGL						.*ATI.*Radeon OpenGL.*								0	0	0	0
 ATI Radeon 2100							.*ATI.*Radeon 21..									0	1	1	2.1
 ATI Radeon 3000							.*ATI.*Radeon 30..									1	1	1	4
@@ -206,14 +219,17 @@ ATI RS880M								.*ATI.*RS880M										1	1	0	0
 ATI Radeon RX9550						.*ATI.*RX9550.*										1	1	0	0
 ATI Radeon VE							.*ATI.*Radeon.*VE.*									0	0	0	0
 ATI Radeon X300							.*ATI.*Radeon X3.*									1	1	1	2.1
+ATI RADEON X300SE						.*ATI.*RADEON[ ]*X300SE*								1	1	1	2.1
 ATI Radeon X400							.*ATI.*Radeon ?X4.*									0	1	0	0
 ATI Radeon X500							.*ATI.*Radeon ?X5.*									1	1	1	2.1
 ATI Radeon X600							.*ATI.*(Radeon |ASUS Extreme A)X6.*					1	1	1	2.1
 ATI Radeon X700							.*ATI.*Radeon ?X7.*									2	1	1	2.1
 ATI Radeon X800							.*ATI.*Radeon ?X8.*									1	1	1	2.1
 ATI Radeon X900							.*ATI.*Radeon ?X9.*									2	1	0	0
-ATI Radeon X1000						.*ATI.*Radeon ?X10.*								2	1	0	2.1
+ATI Radeon X1000						.*ATI.*Radeon ?X1.*								2	1	0	2.1
+ATI Radeon X1100						.*ATI.*Radeon ?X11.*								2	1	0	2.1
 ATI Radeon X1200						.*ATI.*Radeon ?X12.*								2	1	0	2.1
+ATI Radeon X2xxx						.*ATI.*Radeon ?X2x.*								2	1	0	2.1
 ATI Radeon X2300						.*ATI.*Radeon ?X23.*								2	1	0	2.1
 ATI Radeon Xpress						.*ATI.*Radeon Xpress.*								0	1	1	2.1
 ATI Radeon								.*ATI.*Radeon$										3	1	0	0
@@ -264,14 +280,15 @@ AMD RV790 (HD 4800)						.*RV790.*											3	1	0	0
 ATI 760G/Radeon 3000					.*ATI.*AMD 760G.*									1	1	1	3.3
 ATI 780L/Radeon 3000					.*ATI.*AMD 780L.*									1	1	0	0
 ATI Radeon DDR							.*ATI.*Radeon ?DDR.*								0	1	0	0
-ATI FirePro 2000						.*ATI.*FirePro 2.*									2	1	1	4.2
-ATI FirePro 3000						.*ATI.*FirePro V3.*									2	1	0	0
-ATI FirePro 4000						.*ATI.*FirePro V4.*									2	1	0	4.1
-ATI FirePro 5000						.*ATI.*FirePro V5.*									3	1	0	0
-ATI FirePro 7000						.*ATI.*FirePro V7.*									3	1	0	0
+ATI FirePro 2000						.*ATI.*FirePro [V]*2.*									2	1	1	4.2
+ATI FirePro 3000						.*ATI.*FirePro [V]*3.*									2	1	0	0
+ATI FirePro 4000						.*ATI.*FirePro [V]*4.*									2	1	0	4.1
+ATI FirePro 5000						.*ATI.*FirePro [V]*5.*									3	1	0	0
+ATI FirePro 7000						.*ATI.*FirePro [V]*7.*									3	1	0	0
 ATI FirePro M							.*ATI.*FirePro M.*									3	1	1	4.2
 Intel X3100								.*Intel.*X3100.*									1	1	1	2.1
 Intel GMA 3600							.*Intel.* 3600.*									0	1	1	3
+Intel Royal BNA							.*Intel.*Royal[ ]*BNA.*								0	0	0	0
 Intel 830M								.*Intel.*830M										0	0	0	0
 Intel 845G								.*Intel.*845G										0	0	1	1.4
 Intel 855GM								.*Intel.*855GM										0	0	1	1.4
@@ -304,6 +321,7 @@ Intel Intel Iris Graphics 5100			.*Intel.*Iris Graphics 51.*							4	1	0	4
 Intel HD Graphics 5000					.*Intel.*HD Graphics 5.*							4	1	0	4
 Intel HD Graphics						.*Intel.*HD Graphics.*								2	1	1	4
 Intel Mobile 4 Series					.*Intel.*Mobile.* 4 Series.*						0	1	1	2.1
+Intel Mobile 45 Express					.*Intel.*Mobile.* 45 Express Chipset.*				0	1	0	2.1
 Intel 4 Series Internal					.*Intel.* 4 Series Internal.*						1	1	1	2.1
 Intel Media Graphics HD					.*Intel.*Media Graphics HD.*						0	1	0	0
 Intel Montara							.*Intel.*Montara.*									0	0	1	1.3
@@ -316,56 +334,57 @@ Intel 3D-Analyze						.*Intel.*3D-Analyze.*								2	1	0	0
 Matrox									.*Matrox.*											0	0	0	0
 Mesa									.*Mesa.*											1	0	1	3
 Gallium									.*Gallium.*											1	1	1	2.1
-NVIDIA G 100M							.*NVIDIA .*G 10[0-9]M.*								1	1	1	3.3
-NVIDIA G 110M							.*NVIDIA .*G 11[0-9]M.*								1	1	1	3.3
-NVIDIA G 120M							.*NVIDIA .*G 12[0-9]M.*								1	1	1	3.3
-NVIDIA G 200M							.*NVIDIA .*G 20[0-9]M.*								1	1	0	0
-NVIDIA G 410M							.*NVIDIA .*G 41[0-9]M.*								3	1	1	4.2
-NVIDIA GT 130M							.*NVIDIA .*GT 13[0-9]M.*							3	1	1	3.3
-NVIDIA GT 140M							.*NVIDIA .*GT 14[0-9]M.*							3	1	1	3.3
-NVIDIA GT 150M							.*NVIDIA .*GTS 15[0-9]M.*							2	1	0	0
-NVIDIA GTS 160M							.*NVIDIA .*GTS 16[0-9]M.*							2	1	0	0
-NVIDIA G210M							.*NVIDIA .*G21[0-9]M.*								3	1	0	3.3
+NVIDIA G 100M							.*NVIDIA .*G *10[0-9]M.*								1	1	1	3.3
+NVIDIA G 110M							.*NVIDIA .*G *11[0-9]M.*								1	1	1	3.3
+NVIDIA G 120M							.*NVIDIA .*G *12[0-9]M.*								1	1	1	3.3
+NVIDIA G 200M							.*NVIDIA .*G *20[0-9]M.*								1	1	0	0
+NVIDIA G 410M							.*NVIDIA .*G *41[0-9]M.*								3	1	1	4.2
+NVIDIA GT 130M							.*NVIDIA .*GT *13[0-9]M.*							3	1	1	3.3
+NVIDIA GT 140M							.*NVIDIA .*GT *14[0-9]M.*							3	1	1	3.3
+NVIDIA GT 150M							.*NVIDIA .*GTS *15[0-9]M.*							2	1	0	0
+NVIDIA GTS 160M							.*NVIDIA .*GTS *16[0-9]M.*							2	1	0	0
+NVIDIA G210M							.*NVIDIA .*G *21[0-9]M.*							3	1	0	3.3
 NVIDIA GT 220M							.*NVIDIA .*GT 22[0-9]M.*							3	1	1	3.3
 NVIDIA GT 230M							.*NVIDIA .*GT 23[0-9]M.*							3	1	1	3.3
 NVIDIA GT 240M							.*NVIDIA .*GT 24[0-9]M.*							3	1	1	3.3
+NVIDIA GT 260M							.*NVIDIA .*GT 26[0-9]M.*							3	1	1	3.3
 NVIDIA GTS 250M							.*NVIDIA .*GTS 25[0-9]M.*							3	1	0	3.3
 NVIDIA GTS 260M							.*NVIDIA .*GTS 26[0-9]M.*							3	1	0	0
 NVIDIA GTX 260M							.*NVIDIA .*GTX 26[0-9]M.*							3	1	0	3.3
 NVIDIA GTX 270M							.*NVIDIA .*GTX 27[0-9]M.*							3	1	0	0
 NVIDIA GTX 280M							.*NVIDIA .*GTX 28[0-9]M.*							3	1	0	3.3
 NVIDIA 300M								.*NVIDIA .*GT 30[0-9]M.*							3	1	1	4.2
-NVIDIA G 310M							.*NVIDIA .* 31[0-9]M.*								2	1	0	3.3
-NVIDIA GT 320M							.*NVIDIA .* 32[0-9]M.*								3	1	0	3.3
+NVIDIA G 310M							.*NVIDIA .*31[0-9]M.*								2	1	0	3.3
+NVIDIA GT 320M							.*NVIDIA .*32[0-9]M.*								3	1	0	3.3
 NVIDIA GT 330M							.*NVIDIA .*GT 33[0-9]M.*							3	1	1	3.3
 NVIDIA GT 340M							.*NVIDIA .*GT 34[0-9]M.*							4	1	1	3.3
 NVIDIA GTS 350M							.*NVIDIA .*GTS 35[0-9]M.*							4	1	1	3.3
 NVIDIA GTS 360M							.*NVIDIA .*GTS 36[0-9]M.*							5	1	1	3.3
-NVIDIA 400M								.*NVIDIA .* 40[0-9]M.*								2	1	0	0
-NVIDIA 410M								.*NVIDIA .* 41[0-9]M.*								3	1	0	0
-NVIDIA GT 420M							.*NVIDIA .*GT 42[0-9]M.*							3	1	1	4.2
-NVIDIA GT 430M							.*NVIDIA .*GT 43[0-9]M.*							3	1	1	4.2
-NVIDIA GT 440M							.*NVIDIA .*GT 44[0-9]M.*							3	1	1	4.2
-NVIDIA GT 450M							.*NVIDIA .*GT 45[0-9]M.*							3	1	0	0
-NVIDIA GTX 460M							.*NVIDIA .*GTX 46[0-9]M.*							4	1	1	4.2
-NVIDIA GTX 470M							.*NVIDIA .*GTX 47[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 480M							.*NVIDIA .*GTX 48[0-9]M.*							3	1	1	4.2
-NVIDIA GT 520M							.*NVIDIA .*GT 52[0-9]M.*							3	1	1	4.2
-NVIDIA GT 530M							.*NVIDIA .*GT 53[0-9]M.*							3	1	1	4.2
-NVIDIA GT 540M							.*NVIDIA .*GT 54[0-9]M.*							3	1	1	4.2
-NVIDIA GT 550M							.*GeForce GT 55[0-9]M.*								3	1	1	4.2
-NVIDIA GTX 560M							.*NVIDIA .*GTX 56[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 570M							.*NVIDIA .*GTX 57[0-9]M.*							5	1	0	4.2
-NVIDIA GTX 580M							.*NVIDIA .*GTX 58[0-9]M.*							5	1	1	4.2
-NVIDIA 610M								.*NVIDIA.* 61[0-9]M.*								3	1	1	4.2
-NVIDIA GT 620M							.*NVIDIA .*GT 62[0-9]M.*							3	1	0	4.2
-NVIDIA GT 630M							.*NVIDIA .*GT 63[0-9]M.*							3	1	0	4.2
-NVIDIA GT 640M							.*NVIDIA .*GT 64[0-9]M.*							3	1	0	4.2
-NVIDIA GT 650M							.*NVIDIA .*GT 65[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 660M							.*NVIDIA .*GTX 66[0-9]M.*							5	1	0	4.2
-NVIDIA GTX 670M							.*NVIDIA .*GTX 67[0-9]M.*							5	1	1	4.2
-NVIDIA GTX 680M							.*NVIDIA .*GTX 68[0-9]M.*							5	1	0	4.2
-NVIDIA GTX 690M							.*NVIDIA .*GTX 69[0-9]M.*							5	1	0	4.2
+NVIDIA 400M								.*NVIDIA .*40[0-9]M.*								2	1	0	0
+NVIDIA 410M								.*NVIDIA .*41[0-9]M.*								3	1	0	0
+NVIDIA GT 420M							.*NVIDIA .*GT *42[0-9]M.*							3	1	1	4.2
+NVIDIA GT 430M							.*NVIDIA .*GT *43[0-9]M.*							3	1	1	4.2
+NVIDIA GT 440M							.*NVIDIA .*GT *44[0-9]M.*							3	1	1	4.2
+NVIDIA GT 450M							.*NVIDIA .*GT *45[0-9]M.*							3	1	0	0
+NVIDIA GTX 460M							.*NVIDIA .*GTX *46[0-9]M.*							4	1	1	4.2
+NVIDIA GTX 470M							.*NVIDIA .*GTX *47[0-9]M.*							3	1	0	4.2
+NVIDIA GTX 480M							.*NVIDIA .*GTX *48[0-9]M.*							3	1	1	4.2
+NVIDIA GT 520M							.*NVIDIA .*GT *52[0-9]M.*							3	1	1	4.2
+NVIDIA GT 530M							.*NVIDIA .*GT *53[0-9]M.*							3	1	1	4.2
+NVIDIA GT 540M							.*NVIDIA .*GT *54[0-9]M.*							3	1	1	4.2
+NVIDIA GT 550M							.*NVIDIA .*GT *55[0-9]M.*							3	1	1	4.2
+NVIDIA GTX 560M							.*NVIDIA .*GTX *56[0-9]M.*							3	1	0	4.2
+NVIDIA GTX 570M							.*NVIDIA .*GTX *57[0-9]M.*							5	1	0	4.2
+NVIDIA GTX 580M							.*NVIDIA .*GTX *58[0-9]M.*							5	1	1	4.2
+NVIDIA 610M								.*NVIDIA .*61[0-9]M.*								3	1	1	4.2
+NVIDIA GT 620M							.*NVIDIA .*GT *62[0-9]M.*							3	1	0	4.2
+NVIDIA GT 630M							.*NVIDIA .*GT *63[0-9]M.*							3	1	0	4.2
+NVIDIA GT 640M							.*NVIDIA .*GT *64[0-9]M.*							3	1	0	4.2
+NVIDIA GT 650M							.*NVIDIA .*GT *65[0-9]M.*							3	1	0	4.2
+NVIDIA GTX 660M							.*NVIDIA .*GTX *66[0-9]M.*							5	1	0	4.2
+NVIDIA GTX 670M							.*NVIDIA .*GTX *67[0-9]M.*							5	1	1	4.2
+NVIDIA GTX 680M							.*NVIDIA .*GTX *68[0-9]M.*							5	1	0	4.2
+NVIDIA GTX 690M							.*NVIDIA .*GTX *69[0-9]M.*							5	1	0	4.2
 NVIDIA 710M								.*NVIDIA.* 71[0-9]M.*								3	1	0	4.2
 NVIDIA GT 720M							.*NVIDIA .*GT *72[0-9]M.*							3	1	0	4.2
 NVIDIA GT 730M							.*NVIDIA .*GT *73[0-9]M.*							3	1	0	4.2
@@ -378,43 +397,50 @@ NVIDIA G100								.*NVIDIA .*G10.*									3	1	1	4.2
 NVIDIA GT 120							.*NVIDIA .*GT 12.*									2	1	0	3.3
 NVIDIA GT 130							.*NVIDIA .*GT 13.*									2	1	0	3.3
 NVIDIA GT 140							.*NVIDIA .*GT 14.*									2	1	0	3.3
+NVIDIA GT 150							.*NVIDIA .*GT 15.*									2	1	1	3.3
 NVIDIA GTS 150							.*NVIDIA .*GTS 15.*									2	1	0	0
-NVIDIA 200								.*NVIDIA .*GeForce 20.*								2	1	1	3.3
-NVIDIA G200								.*NVIDIA .*GeForce G20.*							2	1	1	3.3
-NVIDIA G210								.*NVIDIA .*GeForce G210.*							3	1	1	3.3
-NVIDIA 210								.*NVIDIA .*GeForce 210.*							3	1	1	3.3
+NVIDIA 200								.*NVIDIA .*200.*								2	1	1	3.3
+NVIDIA G200								.*NVIDIA .*G200.*							2	1	1	3.3
+NVIDIA G210								.*NVIDIA .*G210.*							3	1	1	3.3
+NVIDIA 205								.*NVIDIA .*205.*							3	1	1	3.3
+NVIDIA 210								.*NVIDIA .*210.*							3	1	1	3.3
 NVIDIA GT 220							.*NVIDIA .*GT *22.*									2	1	1	3.3
 NVIDIA GT 230							.*NVIDIA .*GT *23.*									2	1	1	3.3
 NVIDIA GT 240							.*NVIDIA .*GT *24.*									4	1	1	3.3
 NVIDIA GTS 240							.*NVIDIA .*GTS *24.*									4	1	1	3.3
 NVIDIA GTS 250							.*NVIDIA .*GTS *25.*									4	1	1	3.3
+NVIDIA GTS 360							.*NVIDIA .*GTS *36.*									4	1	1	3.3
 NVIDIA GTX 260							.*NVIDIA .*GTX *26.*									4	1	1	3.3
 NVIDIA GTX 270							.*NVIDIA .*GTX *27.*									4	1	0	3.3
 NVIDIA GTX 280							.*NVIDIA .*GTX *28.*									4	1	1	3.3
 NVIDIA GTX 290							.*NVIDIA .*GTX *29.*									5	1	0	3.3
-NVIDIA 310								.*NVIDIA .*GeForce 310.*							3	1	1	3.3
-NVIDIA 315								.*NVIDIA .*GeForce 315.*							3	1	1	3.3
+NVIDIA 310								.*NVIDIA .*310.*							3	1	1	3.3
+NVIDIA 315								.*NVIDIA .*315.*							3	1	1	3.3
 NVIDIA GT 320							.*NVIDIA .*GT *32.*									3	1	0	3.3
 NVIDIA GT 330							.*NVIDIA .*GT *33.*									3	1	0	3.3
 NVIDIA GT 340							.*NVIDIA .*GT *34.*						3	1	0	0
-NVIDIA 405								.*NVIDIA .* 405.*									3	1	0	3.3
+NVIDIA 405								.*NVIDIA .*405.*									3	1	0	3.3
+NVIDIA 410								.*NVIDIA .*410.*									3	1	0	3.3
+NVIDIA GT 415							.*NVIDIA .*GT *415.*									3	1	1	4.2
 NVIDIA GT 420							.*NVIDIA .*GT *42.*									3	1	1	4.2
 NVIDIA GT 430							.*NVIDIA .*GT *43.*									3	1	1	4.2
-NVIDIA GT 440							.*NVIDIA .*GT *44.*									4	1	0	4.2
+NVIDIA GT 440							.*NVIDIA .*GT *44.*									4	1	1	4.2
+NVIDIA GT 450							.*NVIDIA .*GT *45.*									4	1	1	4.2
 NVIDIA GTS 450							.*NVIDIA .*GTS *45.*									4	1	1	4.2
 NVIDIA GTX 460							.*NVIDIA .*GTX *46.*					5	1	1	4.3
 NVIDIA GTX 470							.*NVIDIA .*GTX *47.*									5	1	1	4.2
 NVIDIA GTX 480							.*NVIDIA .*GTX *48.*									5	1	1	4.2
-NVIDIA 510								.*NVIDIA .* 510.*						3	1	0	0
+NVIDIA 510								.*NVIDIA .*510.*						3	1	0	0
 NVIDIA GT 520							.*NVIDIA .*GT *52.*									3	1	1	4.2
 NVIDIA GT 530							.*NVIDIA .*GT *53.*									3	1	1	4.2
 NVIDIA GT 540							.*NVIDIA .*GT *54.*									3	1	1	4.2
+NVIDIA GT 550							.*NVIDIA .*GT *55.*									3	1	1	4.2
 NVIDIA GTX 550							.*NVIDIA .*GTX *55.*					5	1	1	4.3
 NVIDIA GTX 560							.*NVIDIA .*GTX *56.*									5	1	1	4.2
 NVIDIA GTX 570							.*NVIDIA .*GTX *57.*									5	1	1	4.2
 NVIDIA GTX 580							.*NVIDIA .*GTX *58.*					5	1	1	4.3
 NVIDIA GTX 590							.*NVIDIA .*GTX *59.*									5	1	1	4.2
-NVIDIA 605								.*NVIDIA .* 605.*									3	1	1	4.2
+NVIDIA 605								.*NVIDIA .*605.*									3	1	1	4.2
 NVIDIA GT 610							.*NVIDIA .*GT 61.*									3	1	1	4.2
 NVIDIA GT 620							.*NVIDIA .*GT 62.*									3	1	0	4.2
 NVIDIA GT 630							.*NVIDIA .*GT 63.*									3	1	0	4.2
@@ -527,7 +553,7 @@ NVIDIA D9M								.*NVIDIA .*D9M.*									1	1	0	0
 NVIDIA G94								.*NVIDIA .*G94.*									3	1	0	0
 NVIDIA GeForce Go 6						.*GeForce Go 6.*									1	1	0	0
 NVIDIA ION 2							.*NVIDIA .*ION 2.*									2	1	0	0
-NVIDIA ION 								.*NVIDIA Corporation.*ION.*							2	1	1	3.3
+NVIDIA ION 								.*NVIDIA .*ION.*									2	1	1	3.3
 NVIDIA NB8M								.*NVIDIA .*NB8M.*									1	1	0	0
 NVIDIA NB8P								.*NVIDIA .*NB8P.*									2	1	0	0
 NVIDIA NB9E								.*NVIDIA .*NB9E.*									3	1	0	0
@@ -535,7 +561,9 @@ NVIDIA NB9M								.*NVIDIA .*NB9M.*									1	1	0	0
 NVIDIA NB9P								.*NVIDIA .*NB9P.*									2	1	0	0
 NVIDIA N10								.*NVIDIA .*N10.*									1	1	0	2.1
 NVIDIA GeForce PCX						.*GeForce PCX.*										0	1	0	1.5
-NVIDIA Generic							.*NVIDIA .*Unknown.*								0	0	0	2.1
+NVIDIA PCI								.*NVIDIA PCI[ ]*								0	0	0	2.1
+NVIDIA Generic							.*NVIDIA Generic.*								0	0	0	2.1
+NVIDIA Generic Unknown					.*NVIDIA .*Unknown.*								0	0	0	2.1
 NVIDIA NV17								.*NVIDIA .*NV17.*									0	1	0	0
 NVIDIA NV34								.*NVIDIA .*NV34.*									0	1	0	0
 NVIDIA NV35								.*NVIDIA .*NV35.*									0	1	0	0
@@ -559,8 +587,8 @@ NVIDIA Quadro 2000 M/D					.*Quadro.* (K2|2)000.*								3	1	0	4.2
 NVIDIA Quadro 3000M						.*Quadro.* (K3|3)00[0-9]M.*							3	1	0	4.2
 NVIDIA Quadro 4000M						.*Quadro.* (K4|4)00[0-9]M.*							3	1	0	4.2
 NVIDIA Quadro 4000						.*Quadro 4000.*										3	1	0	4.2
-NVIDIA Quadro 50x0 M					.*Quadro.* 50.0.*									3	1	0	4.2
-NVIDIA Quadro 6000						.*Quadro.* 6000.*									3	1	0	0
+NVIDIA Quadro 50x0 M					.*Quadro.* (K5|5)0.0.*									3	1	0	4.2
+NVIDIA Quadro 6000						.*Quadro.* (K6|6)000.*									3	1	0	0
 NVIDIA Quadro 400						.*Quadro.* 400.*									2	1	0	3.3
 NVIDIA Quadro 600						.*Quadro.* 600.*									2	1	0	4.2
 NVIDIA Quadro4							.*Quadro4.*											0	1	0	1.5
@@ -591,7 +619,7 @@ NVIDIA Quadro NVS						.*NVIDIA .*NVS										0	1	0	4.2
 NVIDIA Corporation N12P					.*NVIDIA .*N12P.*									1	1	1	4.1
 NVIDIA Corporation N11M					.*NVIDIA .*N11M.*									2	1	0	3.1
 NVIDIA RIVA TNT							.*RIVA TNT.*										0	0	0	1.5
-S3										.*S3 Graphics.*										0	0	1	1.4
+S3										.*S3 *(Graphics)*.*										0	0	1	1.4
 SiS										SiS.*												0	0	1	1.5
 Trident									Trident.*											0	0	0	0
 Tungsten Graphics						Tungsten.*											0	0	0	0
@@ -599,5 +627,6 @@ XGI										XGI.*												0	0	0	0
 VIA										VIA.*												0	0	0	0
 Apple Generic							Apple.*Generic.*									0	0	0	0
 Apple Software Renderer					Apple.*Software Renderer.*							0	0	0	0
+Oracle									VirtualBox.*										0	1	1	2.1
 Humper									Humper.*											0	1	1	2.1
 PowerVR SGX545							.*PowerVR SGX.*										1	1	1	3