Fix the update of OpenSSL.

[ffftp/ffftp.git] / common.h

diff --git a/common.h b/common.h
index 5a5b9ff..71b557d 100644 (file)
--- a/common.h
+++ b/common.h
@@ -316,7 +316,7 @@
 // uClinux\r
 #define LIST_UNIX_17   51              /* UNIX 17 */\r
 // Windows Server 2008 R2\r
-#define LIST_DOS_5             52              /* MS-DOS 4 */\r
+#define LIST_DOS_5             52              /* MS-DOS 5 */\r
 \r
 #define LIST_MELCOM            0x100   /* MELCOM80 */\r
 \r
@@ -746,6 +746,8 @@ LIST_UNIX_70
 #define KANJI_UTF8N            5               /* UTF-8 */\r
 // UTF-8対応\r
 #define KANJI_UTF8BOM          6               /* UTF-8 BOM */\r
+// UTF-8 HFS+対応\r
+#define KANJI_UTF8HFSX         7               /* UTF-8 HFS+ */\r
 \r
 #define KANJI_NOCNV            -1              /* 漢字コード変換なし */\r
 \r
@@ -1368,6 +1370,16 @@ BOOL IsMainThread();
 // ポータブル版判定\r
 void CheckPortableVersion();\r
 int AskPortableVersion(void);\r
+// 全設定暗号化対応\r
+int Restart();\r
+void RestartAndTerminate();\r
+// タスクバー進捗表示\r
+int LoadTaskbarList3();\r
+void FreeTaskbarList3();\r
+int IsTaskbarList3Loaded();\r
+void UpdateTaskbarProgress();\r
+// 高DPI対応\r
+int AskToolWinHeight(void);\r
 \r
 /*===== filelist.c =====*/\r
 \r
@@ -1714,6 +1726,10 @@ void GoForwardTransWindow(void);
 void InitTransCurDir(void);\r
 int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork);\r
 int CheckPathViolation(TRANSPACKET *packet);\r
+// タスクバー進捗表示\r
+LONGLONG AskTransferSizeLeft(void);\r
+LONGLONG AskTransferSizeTotal(void);\r
+int AskTransferErrorDisplay(void);\r
 \r
 /*===== codecnv.c =====*/\r
 \r
@@ -1723,6 +1739,8 @@ int ConvTermCodeToCRLF(TERMCODECONVINFO *cInfo);
 \r
 void InitCodeConvInfo(CODECONVINFO *cInfo);\r
 int FlushRestData(CODECONVINFO *cInfo);\r
+// UTF-8対応\r
+int ConvNoConv(CODECONVINFO *cInfo);\r
 int ConvEUCtoSJIS(CODECONVINFO *cInfo);\r
 int ConvJIStoSJIS(CODECONVINFO *cInfo);\r
 int ConvSMBtoSJIS(CODECONVINFO *cInfo);\r
@@ -1732,8 +1750,15 @@ int ConvSJIStoJIS(CODECONVINFO *cInfo);
 int ConvSJIStoSMB_HEX(CODECONVINFO *cInfo);\r
 int ConvSJIStoSMB_CAP(CODECONVINFO *cInfo);\r
 int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8対応\r
+// UTF-8 HFS+対応\r
+int ConvUTF8NtoUTF8HFSX(CODECONVINFO *cInfo);\r
+int ConvUTF8HFSXtoUTF8N(CODECONVINFO *cInfo);\r
 void ConvAutoToSJIS(char *Text, int Pref);\r
 int CheckKanjiCode(char *Text, int Size, int Pref);\r
+// UTF-8対応\r
+int LoadUnicodeNormalizationDll();\r
+void FreeUnicodeNormalizationDll();\r
+int IsUnicodeNormalizationDllLoaded();\r
 \r
 /*===== option.c =====*/\r
 \r
@@ -1788,6 +1813,8 @@ int LoadSettingsFromFile(void);
 // ポータブル版判定\r
 int IsRegAvailable();\r
 int IsIniAvailable();\r
+// バージョン確認\r
+int ReadSettingsVersion();\r
 \r
 /*===== lvtips.c =====*/\r
 \r
@@ -1871,6 +1898,11 @@ char* GetAppTempPath(char* Buf);
 #if defined(HAVE_TANDEM)\r
 void CalcExtentSize(TRANSPACKET *Pkt, LONGLONG Size);\r
 #endif\r
+// 高DPI対応\r
+void QueryDisplayDPI();\r
+int CalcPixelX(int x);\r
+int CalcPixelY(int y);\r
+HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNumerator, int ScaleDenominator);\r
 \r
 /*===== dlgsize.c =====*/\r
 \r
@@ -1885,6 +1917,8 @@ int Make6WordPass(int seq, char *seed, char *pass, int type, char *buf);
 /*===== tool.c =====*/\r
 \r
 void OtpCalcTool(void);\r
+// FTPS対応\r
+void TurnStatefulFTPFilter();\r
 \r
 /*===== history.c =====*/\r
 \r
@@ -1915,8 +1949,10 @@ void DeleteSocketWin(void);
 // ソケットにデータを付与\r
 int SetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);\r
 int SetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);\r
+int SetAsyncTableDataMapPort(SOCKET s, int Port);\r
 int GetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);\r
 int GetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);\r
+int GetAsyncTableDataMapPort(SOCKET s, int* Port);\r
 // IPv6対応\r
 //struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork);\r
 struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *CancelCheckWork);\r
@@ -1930,6 +1966,12 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOut, int *CancelCh
 int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int *CancelCheckWork);\r
 // 同時接続対応\r
 void RemoveReceivedData(SOCKET s);\r
+// UPnP対応\r
+int LoadUPnP();\r
+void FreeUPnP();\r
+int IsUPnPLoaded();\r
+int AddPortMapping(char* Adrs, int Port);\r
+int RemovePortMapping(int Port);\r
 int CheckClosedAndReconnect(void);\r
 // 同時接続対応\r
 int CheckClosedAndReconnectTrnSkt(SOCKET *Skt, int *CancelCheckWork);\r