Remove direct GetTickCount use

Author: jet2jet

Common/OS.cpp

@@ -24,3 +24,12 @@ EXTERN_C bool IsUnicodeAvailableOS()
 	}
 	return (s_dwPlatformId != VER_PLATFORM_WIN32_WINDOWS);
 }
+
+EXTERN_C DWORD MyGetTick32()
+{
+#pragma warning(push)
+#pragma warning(disable:28159)
+	// If the caller ensures 32-bit value of tick, we should use GetTickCount safely
+	return GetTickCount();
+#pragma warning(pop)
+}

Common/OS.h

@@ -7,3 +7,4 @@
 #pragma once
 
 EXTERN_C bool IsUnicodeAvailableOS();
+EXTERN_C DWORD MyGetTick32();

ShellDLL/FTPFldr.cpp

@@ -3,6 +3,8 @@
 #include "ShellDLL.h"
 #include "FTPFldr.h"
 
+#include "OS.h"
+
 static void __stdcall GetFTPStatusMessage(int nStatus, LPCWSTR lpszMessage, CMyStringW& rstrMessage)
 {
 	CMyStringW strMsg;
@@ -419,7 +421,7 @@ STDMETHODIMP CSFTPFolderFTP::ReadFile(HANDLE hFile, void* outBuffer, DWORD dwSiz
 	auto* pSocket = data->pPassive->pPassive;
 
 	ULONG read = 0;
-	DWORD dwStartTick = GetTickCount();
+	DWORD dwStartTick = MyGetTick32();
 	while (dwSize)
 	{
 		if (pSocket->IsRemoteClosed())
@@ -441,7 +443,7 @@ STDMETHODIMP CSFTPFolderFTP::ReadFile(HANDLE hFile, void* outBuffer, DWORD dwSiz
 		if (!pSocket->CanReceive(0))
 		{
 			::Sleep(1);
-			if (GetTickCount() - dwStartTick >= WAIT_RECEIVE_TIME)
+			if (MyGetTick32() - dwStartTick >= WAIT_RECEIVE_TIME)
 				break;
 			continue;
 		}
@@ -2567,7 +2569,7 @@ bool CSFTPFolderFTP::WaitForReceiveEstablishPassive(bool* pbWaiting, CFTPWaitEst
 
 bool CSFTPFolderFTP::WaitForReceivePassive(bool* pbWaiting, CFTPWaitPassive* pPassive, DWORD dwTimeoutMilliseconds)
 {
-	auto dwEnd = GetTickCount() + dwTimeoutMilliseconds;
+	auto dwEnd = MyGetTick32() + dwTimeoutMilliseconds;
 	while (*pbWaiting)
 	{
 		if (!pPassive->pPassive)
@@ -2628,7 +2630,7 @@ bool CSFTPFolderFTP::WaitForReceivePassive(bool* pbWaiting, CFTPWaitPassive* pPa
 			pPassive->nWaitFlags == CFTPWaitPassive::WaitFlags::Error)
 			break;
 		::Sleep(1);
-		if (dwTimeoutMilliseconds != INFINITE && static_cast<long>(GetTickCount()) - static_cast<long>(dwEnd) >= 0)
+		if (dwTimeoutMilliseconds != INFINITE && static_cast<long>(MyGetTick32()) - static_cast<long>(dwEnd) >= 0)
 			return false;
 	}
 	return true;

ShellDLL/SFTPStrm.cpp

@@ -8,6 +8,8 @@
 #include "ShellDLL.h"
 #include "SFTPStrm.h"
 
+#include "OS.h"
+
 #define CACHE_SIZE  32768
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -21,7 +23,7 @@ bool CSFTPSyncMessenger::WaitForCurrentMessage()
 	if (!m_pChannel->RegisterMessageListener(uRegID, this))
 		return false;
 
-	DWORD dwStart = GetTickCount();
+	DWORD dwStart = MyGetTick32();
 	while (true)
 	{
 		auto hr = m_pProcessor->PumpSocketAndMessage(0);
@@ -38,7 +40,7 @@ bool CSFTPSyncMessenger::WaitForCurrentMessage()
 			bRet = !m_bFailed;
 			break;
 		}
-		if (GetTickCount() - dwStart >= 10000)
+		if (MyGetTick32() - dwStart >= 10000)
 		{
 			bRet = false;
 			break;

ShellDLL/ShellDLL.cpp

@@ -1241,7 +1241,7 @@ bool CMainDLL::InitInstance()
 	// for SSL library
 	SSL_library_init();
 
-	::srand((unsigned int) (time(NULL) * GetTickCount()));
+	::srand(static_cast<unsigned int>(time(NULL)));
 
 	// Check whether we can use Unicode version of GetOpenFileName/GetSaveFileName
 	m_bUseOFNUnicode = IsUnicodeAvailableOS();
@@ -2328,7 +2328,7 @@ UINT_PTR CMainDLL::RegisterTimer(DWORD dwSpan, PFNEASYSFTPTIMERPROC pfnTimerProc
 	pData->pfnTimerProc = pfnTimerProc;
 	pData->lParam = lParam;
 	pData->dwSpan = dwSpan;
-	pData->dwTickStart = GetTickCount();
+	pData->dwTickStart = MyGetTick32();
 	::EnterCriticalSection(&theApp.m_csTimer);
 	m_arrTimers.Add(pData);
 	SetEvent(m_TimerThread.m_hEventChanged);
@@ -2547,7 +2547,7 @@ int CMainDLL::CTimerThread::Run()
 	lastCount = 0;
 	while (!m_bExit)
 	{
-		DWORD dwTick = GetTickCount();
+		DWORD dwTick = MyGetTick32();
 		CMyTimerData* pData = NULL;
 		::EnterCriticalSection(&theApp.m_csTimer);
 		auto newCount = theApp.m_arrTimers.GetCount();

ShellDLL/Transfer.cpp

@@ -68,7 +68,7 @@ CTransferDialog::CTransferItem* CTransferDialog::AddTransferItem(ULONGLONG uliMa
 	pItem->strDestName = lpszDestName;
 	if (lpszLocalFileName)
 		pItem->strLocalFileName = lpszLocalFileName;
-	pItem->dwStartTime = pItem->dwCurrentTime = GetTickCount();
+	pItem->dwStartTime = pItem->dwCurrentTime = GetTickCount64();
 	pItem->bWaiting = bWaiting;
 	pItem->bFinished = false;
 	pItem->bCanceled = false;
@@ -104,7 +104,7 @@ void CTransferDialog::SetTransferItemSize(CTransferItem* pvItem, ULONGLONG uliMa
 	}
 	pvItem->uliMax = uliMax;
 	pvItem->uliCurrent = 0;
-	pvItem->dwCurrentTime = GetTickCount();
+	pvItem->dwCurrentTime = GetTickCount64();
 	if (pvItem->bWaiting)
 	{
 		pvItem->bWaiting = false;
@@ -128,7 +128,7 @@ void CTransferDialog::UpdateTransferItem(CTransferItem* pvItem, ULONGLONG uliPos
 		return;
 	}
 	pvItem->uliCurrent = uliPosition;
-	pvItem->dwCurrentTime = GetTickCount();
+	pvItem->dwCurrentTime = GetTickCount64();
 	if (pvItem->bWaiting)
 	{
 		pvItem->bWaiting = false;
@@ -369,7 +369,7 @@ LRESULT CTransferDialog::OnDrawItem(WPARAM wParam, LPARAM lParam)
 				else
 				{
 					CMyStringW strSizeCur, strSizeRate;
-					DWORD dwPassTime = pItem->dwCurrentTime - pItem->dwStartTime;
+					auto dwPassTime = pItem->dwCurrentTime - pItem->dwStartTime;
 					{
 						ULARGE_INTEGER uli;
 						uli.QuadPart = pItem->uliCurrent;
@@ -392,14 +392,14 @@ LRESULT CTransferDialog::OnDrawItem(WPARAM wParam, LPARAM lParam)
 							uli.QuadPart = 1024;
 						uli.QuadPart = ((pItem->uliMax - pItem->uliCurrent) * 1000 / uli.QuadPart);
 						if (uli.HighPart != 0)
-							dwPassTime = 0xFFFFFFFF;
+							dwPassTime = 0xFFFFFFFFFFFFFFFF;
 						else
 							dwPassTime = uli.LowPart;
 					}
 					{
 						register int nMinute, nSecond;
 						nMinute = (int) (dwPassTime / 60000);
-						nSecond = (int) ((dwPassTime - ((DWORD) nMinute * 60000)) / 1000);
+						nSecond = (int) ((dwPassTime - (static_cast<decltype(dwPassTime)>(nMinute) * 60000)) / 1000);
 						strTransfer.Format(IDS_TRANSFER_RATE, (LPCWSTR) strSizeCur, (LPCWSTR) strSizeMax,
 							nMinute, nSecond, (LPCWSTR) strSizeRate);
 					}

ShellDLL/Transfer.h

@@ -28,8 +28,8 @@ class CTransferDialog :
 	{
 		ULONGLONG uliCurrent;
 		ULONGLONG uliMax;
-		DWORD dwStartTime;
-		DWORD dwCurrentTime;
+		ULONGLONG dwStartTime;
+		ULONGLONG dwCurrentTime;
 		CMyStringW strDestName;
 		CMyStringW strLocalFileName;
 		int iIconIndex;

ShellDLL/WinOpSSH.cpp

@@ -3,6 +3,7 @@
 #include "WinOpSSH.h"
 
 #include <AclAPI.h>
+#include "OS.h"
 
 // ConvertEndian
 #include "ExBuffer.h"
@@ -111,7 +112,7 @@ bool CWinOpenSSHAgent::Query(const void* dataSend, size_t dataSendSize, void** d
 			}
 		}
 
-		DWORD dwStartTick = ::GetTickCount() + 1000;
+		DWORD dwStartTick = MyGetTick32() + 1000;
 		while (true)
 		{
 			h = ::CreateFile(WIN_OPENSSH_AGENT_PIPE, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -126,7 +127,7 @@ bool CWinOpenSSHAgent::Query(const void* dataSend, size_t dataSendSize, void** d
 				LogWin32LastError(L"CreateFile");
 				return false;
 			}
-			if (::GetTickCount() >= dwStartTick)
+			if (MyGetTick32() >= dwStartTick)
 			{
 				return false;
 			}