Index: src/ch/UpdateChecker.cpp =================================================================== diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af --- src/ch/UpdateChecker.cpp (.../UpdateChecker.cpp) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/ch/UpdateChecker.cpp (.../UpdateChecker.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) @@ -41,7 +41,7 @@ { m_hKillEvent = ::CreateEvent(nullptr, FALSE, FALSE, nullptr); BOOST_ASSERT(m_hKillEvent); - ::InitializeCriticalSection(&m_cs); + InitializeCriticalSection(&m_cs); } // ============================================================================ @@ -61,9 +61,9 @@ } if(m_hKillEvent) - ::CloseHandle(m_hKillEvent); + CloseHandle(m_hKillEvent); - ::DeleteCriticalSection(&m_cs); + DeleteCriticalSection(&m_cs); } bool CUpdateChecker::AsyncCheckForUpdates(const wchar_t* pszSite, const wchar_t* pszLanguage, UpdateVersionInfo::EVersionType eUpdateChannel, bool bOnlyIfConnected, bool bSendHeaders) @@ -78,17 +78,17 @@ if(bOnlyIfConnected && !InternetGetConnectedState(&dwConnectionFlags, 0)) return false; - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_strSite = pszSite; m_eResult = eResult_Undefined; m_eUpdateChannel = eUpdateChannel; m_strLanguage = pszLanguage; m_bSendHeaders = bSendHeaders; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); - ::ResetEvent(m_hKillEvent); + ResetEvent(m_hKillEvent); m_hThread = CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)&CUpdateChecker::UpdateCheckThread, (void*)this, 0, nullptr); if(!m_hThread) @@ -111,19 +111,19 @@ if(m_hThread) { if(m_hKillEvent) - ::SetEvent(m_hKillEvent); + SetEvent(m_hKillEvent); DWORD dwResult = WaitForSingleObject(m_hThread, 5000); if (dwResult == WAIT_TIMEOUT || dwResult == WAIT_FAILED) throw std::exception("Failed to stop update checker thread."); m_hThread = nullptr; } - ::ResetEvent(m_hKillEvent); + ResetEvent(m_hKillEvent); m_httpFile.Close(); - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_strSite.Empty(); m_eUpdateChannel = UpdateVersionInfo::eStable; @@ -134,10 +134,10 @@ m_strReleaseDate.Empty(); m_strDownloadAddress.Empty(); m_strReleaseNotes.Empty(); - m_eResult = CUpdateChecker::eResult_Undefined; + m_eResult = eResult_Undefined; m_bSendHeaders = true; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } // ============================================================================ @@ -154,12 +154,12 @@ if(eCheckResult == eResult_Error && dwError != 0) strError = chcore::TWin32ErrorFormatter::FormatWin32ErrorCodeWithFallback(dwError, _T("wininet.dll"), true); - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_eResult = eCheckResult; m_strLastError = strError.c_str(); - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } // ============================================================================ @@ -171,9 +171,9 @@ // ============================================================================ void CUpdateChecker::SetLastError(PCTSTR pszError) { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_strLastError = pszError; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } // ============================================================================ @@ -187,27 +187,27 @@ // ============================================================================ void CUpdateChecker::SetVersionsAndAddress(PCTSTR pszAddress, PCTSTR pszNumericVersion, PCTSTR pszReadableVersion, PCTSTR pszReleaseDate, PCTSTR pszReleaseNotes) { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_strDownloadAddress = pszAddress; m_strNumericVersion = pszNumericVersion; m_strReadableVersion = pszReadableVersion; m_strReleaseDate = pszReleaseDate; m_strReleaseNotes = pszReleaseNotes; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } void CUpdateChecker::SetSendHeaders(bool bSendHeaders) { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); m_bSendHeaders = bSendHeaders; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } CString CUpdateChecker::GetSiteAddress() const { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); CString strAddress = m_strSite; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); return strAddress; } @@ -221,9 +221,9 @@ // ============================================================================ UpdateVersionInfo::EVersionType CUpdateChecker::GetUpdateChannel() { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); UpdateVersionInfo::EVersionType eUpdateChannel = m_eUpdateChannel; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); return eUpdateChannel; } @@ -237,9 +237,9 @@ // ============================================================================ CUpdateChecker::ECheckResult CUpdateChecker::GetResult() const { - ::EnterCriticalSection(&m_cs); + EnterCriticalSection(&m_cs); ECheckResult eResult = m_eResult; - ::LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); return eResult; }