commit 63943a37116f0651079f0a99b0941f38219c31aa
author Dennis Syrovatsky <dennis@tightvnc.com> Thu Nov 10 06:24:56 2005 +0000
committer Dennis Syrovatsky <dennis@tightvnc.com> Thu Nov 10 06:24:56 2005 +0000
tree edaf1a9b08c3fbb81047fe3a2c1d6d0bc6edc8d3
parent 4fb272961a982e4debe1352e70a35f53f96e52ea

Code improvements.
Added FileTransfer::processFTMsg(...) method.


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

vncviewer/FTMsgReader.h

diff --git a/vncviewer/FTMsgReader.h b/vncviewer/FTMsgReader.h
index f1554cb..da36aa6 100644
--- a/vncviewer/FTMsgReader.h
+++ b/vncviewer/FTMsgReader.h
@@ -24,9 +24,10 @@
 #ifndef __RFB_WIN32_FTMSGREADER_H__
 #define __RFB_WIN32_FTMSGREADER_H__
 
+#include <windows.h>
+
 #include <rdr/InStream.h>
 #include <rfb/FileInfo.h>
-#include <vncviewer/FileTransfer.h>
 
 namespace rfb {
   namespace win32 {

vncviewer/FTMsgWriter.h

diff --git a/vncviewer/FTMsgWriter.h b/vncviewer/FTMsgWriter.h
index 81c2205..a7026f1 100644
--- a/vncviewer/FTMsgWriter.h
+++ b/vncviewer/FTMsgWriter.h
@@ -26,7 +26,6 @@
 
 #include <rdr/types.h>
 #include <rdr/OutStream.h>
-#include <vncviewer/FileTransfer.h>
 
 namespace rfb {
   namespace win32 {

vncviewer/FileTransfer.cxx

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index d690f6d..5da3c9f 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -32,8 +32,9 @@
   m_bInitialized = false;
 
   m_pFTDialog = new FTDialog(GetModuleHandle(0), this);
-  m_pInStream = NULL;
-  m_pOutStream = NULL;
+
+  m_pReader = NULL;
+  m_pWriter = NULL;
 }
 
 FileTransfer::~FileTransfer()
@@ -49,8 +50,8 @@
 {
   if (m_bInitialized) return false;
 
-  m_pInStream = pIS;
-  m_pOutStream = pOS;
+  m_pReader = new FTMsgReader(pIS);
+  m_pWriter = new FTMsgWriter(pOS);
 
   m_bInitialized = true;
   return true;
@@ -64,3 +65,29 @@
   m_bFTDlgShown = m_pFTDialog->createFTDialog();
   return m_bFTDlgShown;
 }
+
+bool
+FileTransfer::processFTMsg(int type)
+{
+  if (m_bInitialized) return false;
+
+  switch (type)
+  {
+  case msgTypeFileListData:
+    break;
+  case msgTypeFileDownloadData:
+    break;
+  case msgTypeFileUploadCancel:
+    break;
+  case msgTypeFileDownloadFailed:
+    break;
+  case msgTypeFileDirSizeData:
+    break;
+  case msgTypeFileLastRequestFailed:
+    break;
+  default:
+    return false;
+  }
+
+  return false;
+}
\ No newline at end of file

vncviewer/FileTransfer.h

diff --git a/vncviewer/FileTransfer.h b/vncviewer/FileTransfer.h
index 76bba1e..9f05cb1 100644
--- a/vncviewer/FileTransfer.h
+++ b/vncviewer/FileTransfer.h
@@ -26,7 +26,10 @@
 
 #include <rdr/InStream.h>
 #include <rdr/OutStream.h>
+#include <rfb/msgTypes.h>
 #include <vncviewer/FTDialog.h>
+#include <vncviewer/FTMsgReader.h>
+#include <vncviewer/FTMsgWriter.h>
 
 namespace rfb {
   namespace win32 {
@@ -39,6 +42,7 @@
       ~FileTransfer();
 
       bool initialize(rdr::InStream *pIS, rdr::OutStream *pOS);
+      bool processFTMsg(int type);
       bool show();
 
     private:
@@ -47,8 +51,9 @@
 
       FTDialog *m_pFTDialog;
 
-      rdr::InStream *m_pInStream;
-      rdr::OutStream *m_pOutStream;
+      FTMsgReader *m_pReader;
+      FTMsgWriter *m_pWriter;
+
     };
   }
 }