Fix bugs of host list dialog.

[ffftp/ffftp.git] / option.c

diff --git a/option.c b/option.c
index b43af07..2f7e00f 100644 (file)
--- a/option.c
+++ b/option.c
@@ -65,12 +65,19 @@ static BOOL CALLBACK ToolSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPA
 static BOOL CALLBACK SoundSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
 static BOOL CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
 static BOOL CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
-static int GetDecimalText(HWND hDlg, int Ctrl);\r
-static void SetDecimalText(HWND hDlg, int Ctrl, int Num);\r
-static void CheckRange2(int *Cur, int Max, int Min);\r
-static void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize);\r
-static void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text);\r
-static void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize);\r
+// hostman.cで使用\r
+//static int GetDecimalText(HWND hDlg, int Ctrl);\r
+//static void SetDecimalText(HWND hDlg, int Ctrl, int Num);\r
+//static void CheckRange2(int *Cur, int Max, int Min);\r
+//static void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize);\r
+//static void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text);\r
+//static void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize);\r
+int GetDecimalText(HWND hDlg, int Ctrl);\r
+void SetDecimalText(HWND hDlg, int Ctrl, int Num);\r
+void CheckRange2(int *Cur, int Max, int Min);\r
+void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize);\r
+void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text);\r
+void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize);\r
 \r
 \r
 \r
@@ -156,6 +163,10 @@ void SetOption(int Start)
        PROPSHEETPAGE psp[12];\r
        PROPSHEETHEADER psh;\r
 \r
+       // 変数が未初期化のバグ修正\r
+       memset(&psp, 0, sizeof(psp));\r
+       memset(&psh, 0, sizeof(psh));\r
+\r
        psp[0].dwSize = sizeof(PROPSHEETPAGE);\r
        psp[0].dwFlags = PSP_USETITLE | PSP_HASHELP;\r
        psp[0].hInstance = GetFtpInst();\r
@@ -1647,7 +1658,9 @@ static BOOL CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPA
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-static int GetDecimalText(HWND hDlg, int Ctrl)\r
+// hostman.cで使用\r
+//static int GetDecimalText(HWND hDlg, int Ctrl)\r
+int GetDecimalText(HWND hDlg, int Ctrl)\r
 {\r
        char Tmp[40];\r
 \r
@@ -1667,7 +1680,9 @@ static int GetDecimalText(HWND hDlg, int Ctrl)
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-static void SetDecimalText(HWND hDlg, int Ctrl, int Num)\r
+// hostman.cで使用\r
+//static void SetDecimalText(HWND hDlg, int Ctrl, int Num)\r
+void SetDecimalText(HWND hDlg, int Ctrl, int Num)\r
 {\r
        char Tmp[40];\r
 \r
@@ -1691,7 +1706,9 @@ static void SetDecimalText(HWND hDlg, int Ctrl, int Num)
 *              int *Cur : 設定値\r
 *----------------------------------------------------------------------------*/\r
 \r
-static void CheckRange2(int *Cur, int Max, int Min)\r
+// hostman.cで使用\r
+//static void CheckRange2(int *Cur, int Max, int Min)\r
+void CheckRange2(int *Cur, int Max, int Min)\r
 {\r
        if(*Cur < Min)\r
                *Cur = Min;\r
@@ -1713,7 +1730,9 @@ static void CheckRange2(int *Cur, int Max, int Min)
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-static void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize)\r
+// hostman.cで使用\r
+//static void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize)\r
+void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize)\r
 {\r
        char Tmp[FMAX_PATH+1];\r
        int Num;\r
@@ -1751,7 +1770,9 @@ static void AddTextToListBox(HWND hDlg, char *Str, int CtrlList, int BufSize)
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-static void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text)\r
+// hostman.cで使用\r
+//static void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text)\r
+void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text)\r
 {\r
        char *Pos;\r
 \r
@@ -1777,7 +1798,9 @@ static void SetMultiTextToList(HWND hDlg, int CtrlList, char *Text)
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-static void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize)\r
+// hostman.cで使用\r
+//static void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize)\r
+void GetMultiTextFromList(HWND hDlg, int CtrlList, char *Buf, int BufSize)\r
 {\r
        char Tmp[FMAX_PATH+1];\r
        int Num;\r