Replacing FileZilla's VERIFY with ours DebugCheck

Source commit: 92cd01cbb66c748924d215611d719e27177145fa

source/filezilla/AsyncProxySocketLayer.cpp

@@ -568,7 +568,7 @@ void CAsyncProxySocketLayer::OnReceive(int nErrorCode)
             TriggerEvent(FD_CONNECT, WSAECONNABORTED, TRUE);
           else
           {
-            VERIFY(m_nProxyOpID==PROXYOP_LISTEN);
+            DebugCheck(m_nProxyOpID == PROXYOP_LISTEN);
             TriggerEvent(FD_ACCEPT, WSAECONNABORTED, TRUE);
           }
           Reset();

source/filezilla/AsyncSocketEx.cpp

@@ -845,7 +845,7 @@ BOOL CAsyncSocketEx::Bind(const SOCKADDR* lpSockAddr, int nSockAddrLen)
 void CAsyncSocketEx::AttachHandle(SOCKET hSocket)
 {
   DebugAssert(m_pLocalAsyncSocketExThreadData);
-  VERIFY(m_pLocalAsyncSocketExThreadData->m_pHelperWindow->AddSocket(this, m_SocketData.nSocketIndex));
+  DebugCheck(m_pLocalAsyncSocketExThreadData->m_pHelperWindow->AddSocket(this, m_SocketData.nSocketIndex));
   SetState(attached);
 }
 
@@ -857,7 +857,7 @@ void CAsyncSocketEx::DetachHandle(SOCKET hSocket)
   DebugAssert(m_pLocalAsyncSocketExThreadData->m_pHelperWindow);
   if (!m_pLocalAsyncSocketExThreadData->m_pHelperWindow)
     return;
-  VERIFY(m_pLocalAsyncSocketExThreadData->m_pHelperWindow->RemoveSocket(this, m_SocketData.nSocketIndex));
+  DebugCheck(m_pLocalAsyncSocketExThreadData->m_pHelperWindow->RemoveSocket(this, m_SocketData.nSocketIndex));
   SetState(notsock);
 }
 
@@ -868,7 +868,7 @@ void CAsyncSocketEx::Close()
     m_pFirstLayer->Close();
   if (m_SocketData.hSocket != INVALID_SOCKET)
   {
-    VERIFY((closesocket(m_SocketData.hSocket) != SOCKET_ERROR));
+    DebugCheck((closesocket(m_SocketData.hSocket) != SOCKET_ERROR));
     DetachHandle(m_SocketData.hSocket);
     m_SocketData.hSocket = INVALID_SOCKET;
   }
@@ -1347,7 +1347,7 @@ BOOL CAsyncSocketEx::Attach(SOCKET hSocket, long lEvent /*= FD_READ | FD_WRITE |
   if (hSocket==INVALID_SOCKET || !hSocket)
     return FALSE;
 
-  VERIFY(InitAsyncSocketExInstance());
+  DebugCheck(InitAsyncSocketExInstance());
   m_SocketData.hSocket=hSocket;
   AttachHandle(hSocket);
 
@@ -1408,7 +1408,7 @@ BOOL CAsyncSocketEx::Accept( CAsyncSocketEx& rConnectedSocket, SOCKADDR* lpSockA
 
     if (hTemp == INVALID_SOCKET)
       return FALSE;
-    VERIFY(rConnectedSocket.InitAsyncSocketExInstance());
+    DebugCheck(rConnectedSocket.InitAsyncSocketExInstance());
     rConnectedSocket.m_SocketData.hSocket=hTemp;
     rConnectedSocket.AttachHandle(hTemp);
     rConnectedSocket.SetFamily(GetFamily());

source/filezilla/AsyncSocketExLayer.cpp

@@ -834,7 +834,7 @@ BOOL CAsyncSocketExLayer::AcceptNext( CAsyncSocketEx& rConnectedSocket, SOCKADDR
 
     if (hTemp == INVALID_SOCKET)
       return FALSE;
-    VERIFY(rConnectedSocket.InitAsyncSocketExInstance());
+    DebugCheck(rConnectedSocket.InitAsyncSocketExInstance());
     rConnectedSocket.m_SocketData.hSocket=hTemp;
     rConnectedSocket.AttachHandle(hTemp);
     rConnectedSocket.SetFamily(GetFamily());

source/filezilla/FtpControlSocket.cpp

@@ -2836,7 +2836,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
     pData->transferdata.bType = (pData->transferfile.nType == 1) ? TRUE : FALSE;
 
     CServerPath path;
-    VERIFY(m_pOwner->GetCurrentPath(path));
+    DebugCheck(m_pOwner->GetCurrentPath(path));
     if (path == pData->transferfile.remotepath)
     {
       if (m_pDirectoryListing)
@@ -3267,7 +3267,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
           break;
         }
 
-        VERIFY(m_pTransferSocket->AsyncSelect());
+        DebugCheck(m_pTransferSocket->AsyncSelect());
       }
       m_Operation.nOpState=FILETRANSFER_LIST_LIST;
       break;
@@ -3547,7 +3547,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
             break;
           }
 
-          VERIFY(m_pTransferSocket->AsyncSelect());
+          DebugCheck(m_pTransferSocket->AsyncSelect());
         }
 
         if (pData->transferdata.bResume)

source/filezilla/MFC64bitFix.cpp

@@ -16,7 +16,7 @@ BOOL GetLength64(CString filename, _int64 &size)
   HANDLE hFind = FindFirstFile(filename, &findFileData);
   if (hFind == INVALID_HANDLE_VALUE)
     return FALSE;
-  VERIFY(FindClose(hFind));
+  DebugCheck(FindClose(hFind));
 
   size=((_int64)findFileData.nFileSizeHigh<<32)+findFileData.nFileSizeLow;
 
@@ -31,7 +31,7 @@ BOOL PASCAL GetStatus64(LPCTSTR lpszFileName, CFileStatus64& rStatus)
   {
     return FALSE;
   }
-  VERIFY(FindClose(hFind));
+  DebugCheck(FindClose(hFind));
 
   // strip attribute of NORMAL bit, our API doesn't have a "normal" bit.
   rStatus.m_attribute = (BYTE)

source/filezilla/MainThread.cpp

@@ -233,7 +233,7 @@ void CMainThread::Command(const t_command &command)
   m_bBusy=TRUE;
   t_command *pCommand=new t_command;
   *pCommand=command;
-  VERIFY(PostThreadMessage(m_nInternalMessageID,FZAPI_THREADMSG_COMMAND,(LPARAM)pCommand));
+  DebugCheck(PostThreadMessage(m_nInternalMessageID,FZAPI_THREADMSG_COMMAND,(LPARAM)pCommand));
   m_LastCommand=command;
   LCS;
 }

source/filezilla/TransferSocket.cpp

@@ -1120,7 +1120,7 @@ void CTransferSocket::EnsureSendClose(int Mode)
       m_nMode |= Mode;
     }
     m_bSentClose = TRUE;
-    VERIFY(m_pOwner->m_pOwner->PostThreadMessage(m_nInternalMessageID, FZAPI_THREADMSG_TRANSFEREND, m_nMode));
+    DebugCheck(m_pOwner->m_pOwner->PostThreadMessage(m_nInternalMessageID, FZAPI_THREADMSG_TRANSFEREND, m_nMode));
   }
 }