feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Winutils: define Windows version correctly. Fix gcc warning.

Browse Source
This commit is contained in:
Friedemann Kleint
2010-11-01 09:12:56 +01:00
parent 2c84d4c9d6
commit 36ebe35e25
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/winutils.cpp
View File

@@ -28,6 +28,9 @@
**************************************************************************/ **************************************************************************/
#include "winutils.h" #include "winutils.h"
// Enable WinAPI Windows XP and later
#define _WIN32_WINNT 0x0501
#include <windows.h> #include <windows.h>
#include <QtCore/QString> #include <QtCore/QString>
@@ -105,8 +108,9 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
return QString(); return QString();
} }
VS_FIXEDFILEINFO *versionInfo; VS_FIXEDFILEINFO *versionInfo;
const LPCWSTR backslash = TEXT("\\");
UINT len = 0; UINT len = 0;
if (!(*verQueryValueW)(data, TEXT("\\"), &versionInfo, &len)) { if (!(*verQueryValueW)(data, const_cast<LPWSTR>(backslash), &versionInfo, &len)) {
*errorMessage = QString::fromLatin1("Unable to determine version string of %1: %2").arg(name, winErrorMessage(GetLastError())); *errorMessage = QString::fromLatin1("Unable to determine version string of %1: %2").arg(name, winErrorMessage(GetLastError()));
return QString(); return QString();
} }
@@ -163,15 +167,10 @@ QTCREATOR_UTILS_EXPORT unsigned long winQPidToPid(const Q_PID qpid)
QTCREATOR_UTILS_EXPORT bool winIs64BitSystem() QTCREATOR_UTILS_EXPORT bool winIs64BitSystem()
{ {
// Exclude VS 2005
#if defined(_MSC_VER) && _MSC_VER < 1400
return false;
#else
SYSTEM_INFO systemInfo; SYSTEM_INFO systemInfo;
GetNativeSystemInfo(&systemInfo); GetNativeSystemInfo(&systemInfo);
return systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 return systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64
|| systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64; || systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64;
#endif
} }
} // namespace Utils } // namespace Utils