aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rfb/FileManager.cxx6
-rw-r--r--rfb/FileManager.h2
-rw-r--r--rfb/FileReader.cxx14
-rw-r--r--rfb/FileWriter.cxx2
-rw-r--r--rfb/fttypes.h2
-rw-r--r--vncviewer/FTDialog.cxx22
-rw-r--r--vncviewer/FTDialog.h3
-rw-r--r--vncviewer/FileTransfer.cxx78
-rw-r--r--vncviewer/FileTransfer.h2
9 files changed, 105 insertions, 26 deletions
diff --git a/rfb/FileManager.cxx b/rfb/FileManager.cxx
index 9592152b..1bd3ab66 100644
--- a/rfb/FileManager.cxx
+++ b/rfb/FileManager.cxx
@@ -65,3 +65,9 @@ FileManager::close()
return true;
}
}
+
+bool
+FileManager::isCreated()
+{
+ if (m_pFile != NULL) return true; else return false;
+} \ No newline at end of file
diff --git a/rfb/FileManager.h b/rfb/FileManager.h
index 609f2818..a673f4d7 100644
--- a/rfb/FileManager.h
+++ b/rfb/FileManager.h
@@ -35,6 +35,8 @@ namespace rfb {
bool create(char *pFilename);
bool close();
+ bool isCreated();
+
protected:
FILE *m_pFile;
char m_szMode[4];
diff --git a/rfb/FileReader.cxx b/rfb/FileReader.cxx
index 5b533ac1..13c677fd 100644
--- a/rfb/FileReader.cxx
+++ b/rfb/FileReader.cxx
@@ -27,7 +27,7 @@ using namespace rfb;
FileReader::FileReader()
{
- strcpy(m_szMode, "r");
+ strcpy(m_szMode, "rb");
}
bool
@@ -35,15 +35,9 @@ FileReader::read(void *pBuf, unsigned int count, unsigned int *pBytesRead)
{
if (m_pFile == NULL) return false;
- unsigned int bytesRead = fread(pBuf, 1, count, m_pFile);
-
+ *pBytesRead = fread(pBuf, 1, count, m_pFile);
+
if (ferror(m_pFile)) return false;
-
- if (feof(m_pFile)) {
- *pBytesRead = 0;
- } else {
- *pBytesRead = bytesRead;
- }
-
+
return true;
}
diff --git a/rfb/FileWriter.cxx b/rfb/FileWriter.cxx
index 6503cc9c..9d8c4a54 100644
--- a/rfb/FileWriter.cxx
+++ b/rfb/FileWriter.cxx
@@ -27,7 +27,7 @@ using namespace rfb;
FileWriter::FileWriter()
{
- strcpy(m_szMode, "w");
+ strcpy(m_szMode, "wb");
}
bool
diff --git a/rfb/fttypes.h b/rfb/fttypes.h
index 5b08fd01..1e9f601a 100644
--- a/rfb/fttypes.h
+++ b/rfb/fttypes.h
@@ -30,6 +30,8 @@
#define FT_MAX_STATUS_STRINGS 255
#define FT_MAX_LENGTH_STATUS_STRINGS 130
+#define FT_MAX_SENDING_SIZE 8192
+
#define FT_ATTR_UNKNOWN 0x00000000
#define FT_ATTR_FILE 0x00000001
#define FT_ATTR_DIR 0x00000002
diff --git a/vncviewer/FTDialog.cxx b/vncviewer/FTDialog.cxx
index 8acebd40..40454701 100644
--- a/vncviewer/FTDialog.cxx
+++ b/vncviewer/FTDialog.cxx
@@ -66,6 +66,8 @@ FTDialog::createFTDialog(HWND hwndParent)
return true;
}
+ if (!initFTWndMsgs()) return false;
+
m_hwndFTDialog = CreateDialogParam(m_hInstance,
MAKEINTRESOURCE(IDD_FILETRANSFER_DLG),
hwndParent,
@@ -74,8 +76,6 @@ FTDialog::createFTDialog(HWND hwndParent)
if (m_hwndFTDialog == NULL) return false;
- if (!initFTWndMsgs()) return false;
-
HWND hwndLocalList = GetDlgItem(m_hwndFTDialog, IDC_FTLOCALLIST);
HWND hwndRemoteList = GetDlgItem(m_hwndFTDialog, IDC_FTREMOTELIST);
@@ -169,9 +169,11 @@ BOOL CALLBACK
FTDialog::FTDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
FTDialog *_this = (FTDialog *) GetWindowLong(hwnd, GWL_USERDATA);
+
switch (uMsg)
{
case WM_INITDIALOG:
+ _this = (FTDialog*)lParam;
SetWindowLong(hwnd, GWL_USERDATA, (LONG) lParam);
SetForegroundWindow(hwnd);
return TRUE;
@@ -278,14 +280,16 @@ FTDialog::FTDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}
- if (uMsg == _this->m_msgCheckTransferQueue)
- _this->m_pFileTransfer->checkTransferQueue();
-
- if (uMsg == _this->m_msgDownloadFilePortion)
- _this->m_pFileTransfer->downloadFilePortion();
+ if (_this != NULL) {
+ if (uMsg == _this->m_msgCheckTransferQueue)
+ _this->m_pFileTransfer->checkTransferQueue();
- if (uMsg == _this->m_msgUploadFilePortion)
- _this->m_pFileTransfer->uploadFilePortion();
+ if (uMsg == _this->m_msgUploadFilePortion)
+ _this->m_pFileTransfer->uploadFilePortion();
+
+ if (uMsg == _this->m_msgDownloadFilePortion)
+ _this->m_pFileTransfer->downloadFilePortion();
+ }
return FALSE;
}
diff --git a/vncviewer/FTDialog.h b/vncviewer/FTDialog.h
index 82e75367..c8e9f0a8 100644
--- a/vncviewer/FTDialog.h
+++ b/vncviewer/FTDialog.h
@@ -60,6 +60,9 @@ namespace rfb {
void postUploadFilePortionMsg();
void postDownloadFilePortionMsg();
+ char *getLocalPath() { return m_szLocalPath; }
+ char *getRemotePath() { return m_szRemotePath; }
+
FTProgress *m_pProgress;
private:
diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 0a3009a9..fe08dd8e 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -68,6 +68,7 @@ FileTransfer::show(HWND hwndParent)
if (!m_bInitialized) return false;
m_bFTDlgShown = m_pFTDialog->createFTDialog(hwndParent);
+
return m_bFTDlgShown;
}
@@ -161,8 +162,8 @@ FileTransfer::checkTransferQueue()
if (flag0 & FT_ATTR_COPY_UPLOAD) {
if (flag0 & FT_ATTR_FILE) {
- uploadFile();
- return;
+ uploadFile();
+ return;
}
if (flag0 & FT_ATTR_DIR) {
char *pFullPath = m_TransferQueue.getFullRemPathAt(0);
@@ -172,7 +173,7 @@ FileTransfer::checkTransferQueue()
char *pPath = m_TransferQueue.getRemPathAt(0);
m_TransferQueue.setFlagsAt(0, (flag0 | FT_ATTR_FLR_UPLOAD_CHECK));
m_queueFileListRqst.add(pPath, 0, 0, FT_FLR_DEST_UPLOAD);
- m_pWriter->writeFileListRqst(strlen(pPath), pPath, 0);
+ m_pWriter->writeFileListRqst(strlen(pPath), pPath, false);
return;
}
} else {
@@ -191,6 +192,13 @@ FileTransfer::checkTransferQueue()
bool
FileTransfer::uploadFile()
{
+ if (m_TransferQueue.getFlagsAt(0) & FT_ATTR_FILE) {
+ if (m_fileReader.create(m_TransferQueue.getFullLocPathAt(0))) {
+ m_pWriter->writeFileUploadRqst(strlen(m_TransferQueue.getFullRemPathAt(0)),
+ m_TransferQueue.getFullRemPathAt(0), 0);
+ uploadFilePortion();
+ }
+ }
return false;
}
@@ -203,7 +211,25 @@ FileTransfer::downloadFile()
void
FileTransfer::uploadFilePortion()
{
-
+ if (m_fileReader.isCreated()) {
+ char buf[FT_MAX_SENDING_SIZE];
+ unsigned int bytesRead = 0;
+ if (m_fileReader.read((void *)buf, FT_MAX_SENDING_SIZE, &bytesRead)) {
+ if (bytesRead == 0) {
+ m_pWriter->writeFileUploadData(m_TransferQueue.getDataAt(0));
+ m_fileReader.close();
+ m_TransferQueue.deleteAt(0);
+ m_pFTDialog->postCheckTransferQueueMsg();
+ } else {
+ m_pWriter->writeFileUploadData(bytesRead, (char *)buf);
+ m_pFTDialog->postUploadFilePortionMsg();
+ }
+ } else {
+ m_fileReader.close();
+ m_TransferQueue.deleteAt(0);
+ m_pFTDialog->postCheckTransferQueueMsg();
+ }
+ }
}
void
@@ -301,7 +327,36 @@ FileTransfer::procFLRBrowse(FileInfo *pFI)
bool
FileTransfer::procFLRUpload(FileInfo *pFI)
{
- return false;
+ unsigned int flags = m_TransferQueue.getFlagsAt(0);
+ if (flags & FT_ATTR_FLR_UPLOAD_CHECK) {
+ int num = isExistName(pFI, m_TransferQueue.getRemNameAt(0));
+ if (num >= 0) {
+ if ((m_bFTDlgShown) && (strcmp(m_TransferQueue.getRemPathAt(0), m_pFTDialog->getRemotePath()) == 0)) {
+ m_pFTDialog->addRemoteLVItems(pFI);
+ }
+ } else {
+ if (flags & FT_ATTR_DIR) {
+ m_TransferQueue.deleteAt(0);
+ if (m_bFTDlgShown) m_pFTDialog->setStatusText("Create Remote Folder Failed.");
+ }
+ }
+ }
+ FolderManager fm;
+ FileInfo fi;
+ flags = m_TransferQueue.getFlagsAt(0);
+ if (flags & FT_ATTR_FILE) {
+ uploadFile();
+ return true;
+ } else {
+ if (fm.getDirInfo(m_TransferQueue.getFullLocPathAt(0), &fi, 0)) {
+ m_TransferQueue.add(m_TransferQueue.getFullLocPathAt(0),
+ m_TransferQueue.getFullRemPathAt(0),
+ &fi, FT_ATTR_COPY_UPLOAD);
+ }
+ }
+ m_TransferQueue.deleteAt(0);
+ m_pFTDialog->postCheckTransferQueueMsg();
+ return true;
}
bool
@@ -328,4 +383,15 @@ FileTransfer::requestFileList(char *pPath, int dest, bool bDirOnly)
m_queueFileListRqst.add(pPath, 0, 0, dest);
m_pWriter->writeFileListRqst(strlen(pPath), pPath, bDirOnly);
-} \ No newline at end of file
+}
+
+int
+FileTransfer::isExistName(FileInfo *pFI, char *pName)
+{
+ for (int i = 0; i < pFI->getNumEntries(); i++) {
+ if (strcmp(pFI->getNameAt(i), pName) == 0) {
+ return i;
+ }
+ }
+ return -1;
+}
diff --git a/vncviewer/FileTransfer.h b/vncviewer/FileTransfer.h
index 3a56f3f1..dcc78c73 100644
--- a/vncviewer/FileTransfer.h
+++ b/vncviewer/FileTransfer.h
@@ -78,6 +78,8 @@ namespace rfb {
bool resizeSending();
bool uploadFile();
bool downloadFile();
+
+ int isExistName(FileInfo *pFI, char *pName);
bool procFileListDataMsg();
bool procFileDownloadDataMsg();
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 12:03:10 +0000