wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 844031 - Fix Intel graphics driver detection. r=bjacob

Browse Source
This commit is contained in:
Yuan Pengfei 2013-04-06 14:13:18 -04:00
parent c0840f1999
commit 2d67d2c192
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widget/windows/GfxInfo.cpp
View File

@ -451,18 +451,23 @@ GfxInfo::Init()
bool is64bitApp = sizeof(void*) == 8;
const PRUnichar *dllFileName = is64bitApp
? L"igd10umd64.dll"
: L"igd10umd32.dll";
nsString dllVersion;
: L"igd10umd32.dll",
*dllFileName2 = is64bitApp
? L"igd10iumd64.dll"
: L"igd10iumd32.dll";
nsString dllVersion, dllVersion2;
gfxWindowsPlatform::GetDLLVersion((PRUnichar*)dllFileName, dllVersion);
gfxWindowsPlatform::GetDLLVersion((PRUnichar*)dllFileName2, dllVersion2);
uint64_t dllNumericVersion = 0, driverNumericVersion = 0;
uint64_t dllNumericVersion = 0, dllNumericVersion2 = 0, driverNumericVersion = 0;
ParseDriverVersion(dllVersion, &dllNumericVersion);
ParseDriverVersion(dllVersion2, &dllNumericVersion2);
ParseDriverVersion(mDriverVersion, &driverNumericVersion);
// if GetDLLVersion fails, it gives "0.0.0.0"
// so if GetDLLVersion failed, we get dllNumericVersion = 0
// so this test implicitly handles the case where GetDLLVersion failed
if (dllNumericVersion != driverNumericVersion)
if (dllNumericVersion != driverNumericVersion && dllNumericVersion2 != driverNumericVersion)
mHasDriverVersionMismatch = true;
}