X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=common.h;h=853472d4470373aed746d8a3ec6b21e6f2c86bc6;hp=abba3f5f002156af4f966b870ba2dc1f73d5e13d;hb=554ddaeeff25cb5ca2494470a41834cfeadec8df;hpb=166d7d7d10119b178e33e04b4bed01976887cd57

diff --git a/common.h b/common.h
index abba3f5..853472d 100644
--- a/common.h
+++ b/common.h
@@ -30,12 +30,12 @@
 #define __COMMON_H__
 
 #include "config.h"
-#ifndef ENGLISH
+#ifndef FFFTP_ENGLISH
 #include "mesg-jpn.h"
 #else
 #include "mesg-eng.h"
 #endif
-#include "msgutil.h"
+
 
 #define NUL				'\0'
 
@@ -1422,11 +1422,11 @@ void DispDownloadSize(LONGLONG Size);
 int MakeTaskWindow(HWND hWnd, HINSTANCE hInst);
 void DeleteTaskWindow(void);
 HWND GetTaskWnd(void);
-void SetTaskMsg(const char *szFormat, ...);
+void SetTaskMsg(char *szFormat, ...);
 int SaveTaskMsg(char *Fname);
 void DispTaskMsg(void);
-void DoPrintf(const char *szFormat, ...);
-void DoPrintf2(const char *szFormat, ...);
+void DoPrintf(char *szFormat, ...);
+void DoPrintf2(char *szFormat, ...);
 
 /*===== hostman.c =====*/
 
@@ -1485,10 +1485,10 @@ int AskRealHostType(void);
 int SetOSS(int wkOss);
 int AskOSS(void);
 #endif
-SOCKET connectsock(char *host, int port, const char *PreMsg, int *CancelCheckWork);
+SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork);
 // IPv6対応
-SOCKET connectsockIPv4(const char *host, int port, const char *PreMsg, int *CancelCheckWork);
-SOCKET connectsockIPv6(const char *host, int port, const char *PreMsg, int *CancelCheckWork);
+SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork);
+SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork);
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork);
 // IPv6対応
 SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork);
@@ -1537,12 +1537,12 @@ void CountPrevFfftpWindows(void);
 
 /*===== ftpproc.c =====*/
 
-void DownLoadProc(int ChName, int ForceFile, int All);
-void DirectDownLoadProc(char *Fname);
-void InputDownLoadProc(void);
+void DownloadProc(int ChName, int ForceFile, int All);
+void DirectDownloadProc(char *Fname);
+void InputDownloadProc(void);
 void MirrorDownloadProc(int Notify);
-void UpLoadListProc(int ChName, int All);
-void UpLoadDragProc(WPARAM wParam);
+void UploadListProc(int ChName, int All);
+void UploadDragProc(WPARAM wParam);
 void MirrorUploadProc(int Notify);
 void DeleteProc(void);
 void RenameProc(void);
@@ -1599,9 +1599,13 @@ int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size, int *CancelCheckWork);
 // 同時接続対応
 //int DoMDTM(char *Path, FILETIME *Time);
 int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);
-int DoQUOTE(char *CmdStr);
+// 同時接続対応
+//int DoQUOTE(char *CmdStr);
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork);
 SOCKET DoClose(SOCKET Sock);
-int DoQUIT(SOCKET ctrl_skt);
+// 同時接続対応
+//int DoQUIT(SOCKET ctrl_skt);
+int DoQUIT(SOCKET ctrl_skt, int *CancelCheckWork);
 int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);
 #if defined(HAVE_TANDEM)
 void SwitchOSSProc(void);
@@ -1634,7 +1638,7 @@ int AskTransferNow(void);
 int AskTransferFileNum(void);
 void GoForwardTransWindow(void);
 void InitTransCurDir(void);
-int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork);
+int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork);
 int CheckPathViolation(TRANSPACKET *packet);
 
 /*===== codecnv.c =====*/
@@ -1694,13 +1698,13 @@ int CheckFname(char *str, char *regexp);
 
 /*===== registory.c =====*/
 
-void SaveRegistory(void);
-int LoadRegistory(void);
-void ClearRegistory(void);
+void SaveRegistry(void);
+int LoadRegistry(void);
+void ClearRegistry(void);
 void SetMasterPassword( const char* );
 int GetMasterPasswordStatus(void);
 int ValidateMasterPassword(void);
-DWORD LoadHideDriveListRegistory(void);
+DWORD LoadHideDriveListRegistry(void);
 void SaveSettingsToFile(void);
 int LoadSettingsFromFile(void);
 
@@ -1722,7 +1726,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name);
 
 /*===== misc.c =====*/
 
-int InputDialogBox(int Res, HWND hWnd, const char *Title, char *Buf, int Max, int *Flg, int Help);
+int InputDialogBox(int Res, HWND hWnd, char *Title, char *Buf, int Max, int *Flg, int Help);
 // 64ビット対応
 //BOOL CALLBACK ExeEscDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK ExeEscDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
@@ -1760,7 +1764,7 @@ void SpecificLocalFileTime2FileTime(FILETIME *Time, int TimeZone);
 int AttrString2Value(char *Str);
 void AttrValue2String(int Attr, char *Buf);
 void FormatIniString(char *Str);
-int SelectFile(HWND hWnd, char *Fname, const char *Title, const char *Filters, const char *Ext, int Flags, int Save);
+int SelectFile(HWND hWnd, char *Fname, char *Title, char *Filters, char *Ext, int Flags, int Save);
 int SelectDir(HWND hWnd, char *Buf, int MaxLen);
 void SetRadioButtonByValue(HWND hDlg, int Value, const RADIOBUTTON *Buttons, int Num);
 int AskRadioButtonValue(HWND hDlg, const RADIOBUTTON *Buttons, int Num);
@@ -1823,6 +1827,11 @@ char *AskLocalFreeSpace(char *Path);
 
 int MakeSocketWin(HWND hWnd, HINSTANCE hInst);
 void DeleteSocketWin(void);
+// ソケットにデータを付与
+int SetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);
+int SetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);
+int GetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);
+int GetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);
 // IPv6対応
 //struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork);
 struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *CancelCheckWork);
@@ -1837,7 +1846,8 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 // 同時接続対応
 void RemoveReceivedData(SOCKET s);
 int CheckClosedAndReconnect(void);
-void CheckAllEventClosed(void);
+// 同時接続対応
+int CheckClosedAndReconnectTrnSkt(SOCKET *Skt, int *CancelCheckWork);
 
 /*===== updatebell.c =====*/