Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 627693 - GfxInfo.cpp fails to compile on mingw after landing bug 590373 r=bjacob a=dbaron

Browse Source
This commit is contained in:
Jacek Caban 2011-01-28 10:35:40 +00:00
parent e14e74799c
commit 6ebb71b13f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -692,7 +692,7 @@ gfxWindowsPlatform::WindowsOSVersion()
}
void
gfxWindowsPlatform::GetDLLVersion(PRUnichar *aDLLPath, nsAString& aVersion)
gfxWindowsPlatform::GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion)
{
DWORD versInfoSize, vers[4] = {0};
// version info not available case
@ -703,7 +703,7 @@ gfxWindowsPlatform::GetDLLVersion(PRUnichar *aDLLPath, nsAString& aVersion)
if (!versionInfo.AppendElements(PRUint32(versInfoSize))) {
return;
}
if (!GetFileVersionInfoW(aDLLPath, NULL, versInfoSize,
if (!GetFileVersionInfoW(aDLLPath, 0, versInfoSize,
LPBYTE(versionInfo.Elements()))) {
return;
}

2
gfx/thebes/gfxWindowsPlatform.h
View File

@ -227,7 +227,7 @@ public:
static PRInt32 WindowsOSVersion();
static void GetDLLVersion(PRUnichar *aDLLPath, nsAString& aVersion);
static void GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion);
virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);

6
widget/src/windows/GfxInfo.cpp
View File

@ -352,9 +352,9 @@ GfxInfo::Init()
// with bad Intel driver installations where the DriverVersion reported by the registry was
// not the version of the DLL.
PRBool is64bitApp = sizeof(void*) == 8;
PRUnichar *dllFileName = is64bitApp
? L"igd10umd64.dll"
: L"igd10umd32.dll";
const PRUnichar *dllFileName = is64bitApp
? L"igd10umd64.dll"
: L"igd10umd32.dll";
nsString dllVersion;
// if GetDLLVersion fails, it gives "0.0.0.0"
gfxWindowsPlatform::GetPlatform()->GetDLLVersion(dllFileName, dllVersion);