actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't die if GetPrimaryVideoDriverName() fails

Browse Source
This commit is contained in:
Glenn Maynard
2003-07-30 00:13:58 +00:00
parent 3014693618
commit 265f1f8923
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/VideoDriverInfo.cpp
+11 -2
View File
@@ -17,8 +17,13 @@ bool GetVideoDriverInfo9x( int iIndex, VideoDriverInfo& infoOut )
{ {
HKEY hkey; HKEY hkey;
CString sKey = ssprintf("SYSTEM\\CurrentControlSet\\Services\\Class\\Display\\%04d",iIndex); CString sKey = ssprintf("SYSTEM\\CurrentControlSet\\Services\\Class\\Display\\%04d",iIndex);
if (RegOpenKey(HKEY_LOCAL_MACHINE, sKey, &hkey) != ERROR_SUCCESS) if (RegOpenKey(HKEY_LOCAL_MACHINE, sKey, &hkey) != ERROR_SUCCESS)
{
/* The first card should always exist. */
if( iIndex == 0 )
LOG->Warn("GetVideoDriverInfo9x error: index 0 doesn't exist!");
return false; return false;
}
infoOut.sDate = GetRegValue( hkey, "DriverDate"); infoOut.sDate = GetRegValue( hkey, "DriverDate");
infoOut.sDescription = GetRegValue( hkey, "DriverDesc"); infoOut.sDescription = GetRegValue( hkey, "DriverDesc");
@@ -36,7 +41,11 @@ bool GetVideoDriverInfo2k( int iIndex, VideoDriverInfo& infoOut )
HKEY hkey; HKEY hkey;
CString sKey = ssprintf("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E968-E325-11CE-BFC1-08002BE10318}\\%04d",iIndex); CString sKey = ssprintf("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E968-E325-11CE-BFC1-08002BE10318}\\%04d",iIndex);
if (RegOpenKey(HKEY_LOCAL_MACHINE, sKey, &hkey) != ERROR_SUCCESS) if (RegOpenKey(HKEY_LOCAL_MACHINE, sKey, &hkey) != ERROR_SUCCESS)
{
if( iIndex == 0 )
LOG->Warn("GetVideoDriverInfo2k error: index 0 doesn't exist!");
return false; return false;
}
infoOut.sDate = GetRegValue( hkey, "DriverDate"); infoOut.sDate = GetRegValue( hkey, "DriverDate");
infoOut.sDescription = GetRegValue( hkey, "DriverDesc"); infoOut.sDescription = GetRegValue( hkey, "DriverDesc");
@@ -98,7 +107,7 @@ CString GetPrimaryVideoDriverName()
VideoDriverInfo info; VideoDriverInfo info;
if( !GetVideoDriverInfo(0, info) ) if( !GetVideoDriverInfo(0, info) )
RageException::Throw( "GetVideoDriverInfo(0) failed"); return "(ERROR DETECTING VIDEO DRIVER)";
return info.sDescription; return info.sDescription;
} }