ToWord: fix return type
TFTPFileSystem::WaitForMessages: try to fix lock
Revert "TFTPFileSystem::WaitForMessages: try to fix lock"

This reverts commit 48175288d15f0d5280da27df50c156cc223d4326.
TFTPFileSystem::WaitForMessages: check queue
CMainThread::Run: check m_bQuit
TFTPFileSystem::DoWaitForReply: check terminal status
ChangeLog: update
Merge branch 'ftp-fix-lock'

* ftp-fix-lock:
  TFTPFileSystem::DoWaitForReply: check terminal status
  CMainThread::Run: check m_bQuit
  TFTPFileSystem::WaitForMessages: check queue
  Revert "TFTPFileSystem::WaitForMessages: try to fix lock"
  TFTPFileSystem::WaitForMessages: try to fix lock
version info: update
Merge branch 'master' into far3

* master:
  version info: update
  ChangeLog: update
  TFTPFileSystem::DoWaitForReply: check terminal status
  CMainThread::Run: check m_bQuit
  TFTPFileSystem::WaitForMessages: check queue
  Revert "TFTPFileSystem::WaitForMessages: try to fix lock"
  TFTPFileSystem::WaitForMessages: try to fix lock
  ToWord: fix return type