flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-02 23:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use C++11 features in CWinDllUtils

Browse Source 
* Use std::vector::data() to get a raw pointer
* Use reinterpret_cast instead of C style cast
* Consistenly use generic WINAPI functions without suffix

refs #918
This commit is contained in:
Roland Winklmeier
2017-03-19 15:57:48 +01:00
committed by Mathew Sutcliffe
parent 06ab91334b
commit 87420e7890
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/windllutils.cpp
View File

@@ -34,10 +34,10 @@ namespace BlackMisc
QString languageToIsoCode(const LanguageCodePage &codePage) QString languageToIsoCode(const LanguageCodePage &codePage)
{ {
const LCID locale = codePage.wLanguage; const LCID locale = codePage.wLanguage;
const int nchars = GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, NULL, 0); const int nchars = GetLocaleInfo(locale, LOCALE_SISO639LANGNAME, NULL, 0);
std::vector<wchar_t> language(nchars); std::vector<wchar_t> language(nchars);
GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, &language[0], nchars); GetLocaleInfo(locale, LOCALE_SISO639LANGNAME, language.data(), nchars);
const QString iso = QString::fromWCharArray(&language[0], nchars); const QString iso = QString::fromWCharArray(language.data(), nchars);
return iso; return iso;
} }
@@ -45,15 +45,15 @@ namespace BlackMisc
{ {
UINT dwBytes = 0; UINT dwBytes = 0;
LPVOID lpBuffer = nullptr; LPVOID lpBuffer = nullptr;
VerQueryValueW(&pbVersionInfo[0], &subBlockNameBuffer[0], &lpBuffer, &dwBytes); VerQueryValueW(pbVersionInfo.data(), subBlockNameBuffer.data(), &lpBuffer, &dwBytes);
const QString queryString = QString::fromWCharArray((const wchar_t *) lpBuffer, dwBytes); const QString queryString = QString::fromWCharArray((const wchar_t *) lpBuffer, dwBytes);
return queryString; return queryString;
} }
QString queryToQString(const std::vector<BYTE> &pbVersionInfo, const LanguageCodePage &codePage, _In_ LPCTSTR subBlockpSzFormat, std::vector<TCHAR> &subBlockNameBuffer) QString queryToQString(const std::vector<BYTE> &pbVersionInfo, const LanguageCodePage &codePage, _In_ LPCTSTR subBlockpSzFormat, std::vector<TCHAR> &subBlockNameBuffer)
{ {
HRESULT hr = StringCchPrintf(&subBlockNameBuffer[0], subBlockNameBuffer.size() - 1, subBlockpSzFormat, codePage.wLanguage, codePage.wCodePage); HRESULT hr = StringCchPrintf(subBlockNameBuffer.data(), subBlockNameBuffer.size() - 1, subBlockpSzFormat, codePage.wLanguage, codePage.wCodePage);
if (FAILED(hr)) { return QString(""); } if (FAILED(hr)) { return QString(); }
return queryToQString(pbVersionInfo, subBlockNameBuffer); return queryToQString(pbVersionInfo, subBlockNameBuffer);
} }
} // ns } // ns
@@ -87,14 +87,14 @@ namespace BlackMisc
} }
std::vector<BYTE> pbVersionInfo(dwSize); std::vector<BYTE> pbVersionInfo(dwSize);
if (!GetFileVersionInfo(pszFilePath, 0, dwSize, &pbVersionInfo[0])) if (!GetFileVersionInfo(pszFilePath, 0, dwSize, pbVersionInfo.data()))
{ {
result.errorMsg.sprintf("Error in GetFileVersionInfo: %d\n", GetLastError()); result.errorMsg.sprintf("Error in GetFileVersionInfo: %d\n", GetLastError());
return result; return result;
} }
// Language independent version of VerQueryValue // Language independent version of VerQueryValue
if (!VerQueryValue(&pbVersionInfo[0], TEXT("\\"), (LPVOID *) &pFileInfo, &puLenFileInfo)) if (!VerQueryValue(pbVersionInfo.data(), TEXT("\\"), reinterpret_cast<LPVOID *>(&pFileInfo), &puLenFileInfo))
{ {
result.errorMsg.sprintf("Error in VerQueryValue: %d\n", GetLastError()); result.errorMsg.sprintf("Error in VerQueryValue: %d\n", GetLastError());
return result; return result;
@@ -121,7 +121,7 @@ namespace BlackMisc
PrivateWindows::LanguageCodePage *lpTranslate; PrivateWindows::LanguageCodePage *lpTranslate;
// Read the list of languages and code pages. // Read the list of languages and code pages.
VerQueryValue(&pbVersionInfo[0], TEXT("\\VarFileInfo\\Translation"), (LPVOID *)&lpTranslate, &puLenFileInfo); VerQueryValue(pbVersionInfo.data(), TEXT("\\VarFileInfo\\Translation"), reinterpret_cast<LPVOID *>(&lpTranslate), &puLenFileInfo);
// Read the file description for each language and code page. // Read the file description for each language and code page.
// All names: https://msdn.microsoft.com/en-us/library/windows/desktop/ms647464(v=vs.85).aspx // All names: https://msdn.microsoft.com/en-us/library/windows/desktop/ms647464(v=vs.85).aspx