commit afb285f52aca0a454da5d713958202550d54b14c
author Dennis Syrovatsky <dennis@tightvnc.com> Sun Dec 18 09:10:43 2005 +0000
committer Dennis Syrovatsky <dennis@tightvnc.com> Sun Dec 18 09:10:43 2005 +0000
tree 2d028537036336b8d59060ab6648c4059be45b37
parent f8f977dfd66f7b697993355a3b51f5caa26869ea

Added FileTransfer::procFileUploadCancelMsg() and
FileTransfer::procFileDownloadFailedMsg() methods.
Code improvements. Major changes in the FTMsgReader class.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@459 3789f03b-4d11-0410-bbf8-ca57d06f2519

vncviewer/FileTransfer.cxx

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 32279d0..01aae56 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -452,14 +452,14 @@
 
   if ((!m_fileWriter.isCreated()) || (!isTransferEnable())) {
     m_bTransferSuccess = false;
-    if (pFile != NULL) delete pFile;
+    if (pFile != NULL) delete [] pFile;
     return false;
   }
 
   if (bufSize > 0) {
     unsigned int bytesWritten = 0;
     m_fileWriter.write(pFile, bufSize, &bytesWritten);
-    delete pFile;
+    delete [] pFile;
     if (bytesWritten != bufSize) {
       m_bTransferSuccess = false;
       char reason[] = "Error File Writting to File";
@@ -507,13 +507,33 @@
 bool 
 FileTransfer::procFileUploadCancelMsg()
 {
-  return false;
+  unsigned int reasonSize = 0;
+  char *pReason = m_pReader->readFileUploadCancel(&reasonSize);
+
+  if (m_bFTDlgShown) {
+    m_pFTDialog->setStatusText("Upload Canceled by Remote Computer : %s", pReason);
+  }
+  endUndoneOperation();
+  m_pFTDialog->postCheckTransferQueueMsg();
+
+  delete [] pReason;
+  return true;
 }
 
 bool 
 FileTransfer::procFileDownloadFailedMsg()
 {
-  return false;
+  unsigned int reasonSize = 0;
+  char *pReason = m_pReader->readFileDownloadFailed(&reasonSize);
+
+  if (m_bFTDlgShown) {
+    m_pFTDialog->setStatusText("Download Failed by Remote Computer : %s", pReason);
+  }
+  endUndoneOperation();
+  m_pFTDialog->postCheckTransferQueueMsg();
+
+  delete [] pReason;
+  return true;
 }
 
 bool 
@@ -530,7 +550,11 @@
 bool 
 FileTransfer::procFileLastRqstFailedMsg()
 {
-  return false;
+  unsigned int reasonSize = 0;
+  int requestType;
+  char *pReason = m_pReader->readFileLastRqstFailed(&requestType, &reasonSize);
+  delete [] pReason;
+  return true;
 }
 
 bool 
@@ -646,7 +670,6 @@
   if (m_bFTDlgShown) m_pFTDialog->processDlgMsgs();
   if (m_bCancel) {
     endUndoneOperation();
-    m_bTransferSuccess = false;
     if (m_bFTDlgShown) {
       m_pFTDialog->setStatusText("All Operations Canceled");
     }
@@ -660,6 +683,7 @@
 FileTransfer::endUndoneOperation()
 {
   m_bCancel = false;
+  m_bTransferSuccess = false;
   m_fileReader.close();
   m_fileWriter.close();
   freeQueues();