Fix bugs of automatic detection for Kanji code of filenames.

[ffftp/ffftp.git] / registry.c

diff --git a/registry.c b/registry.c
index 1bb3b8b..368745a 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -479,6 +479,7 @@ void SaveRegistory(void)
                                                        SaveStr(hKey5, "PKey", Str, DefaultHist.PrivateKey);\r
                                                        // 同時接続対応\r
                                                        SaveIntNum(hKey5, "ThreadCount", Hist.MaxThreadCount, DefaultHist.MaxThreadCount);\r
+                                                       SaveIntNum(hKey5, "ReuseCmdSkt", Hist.ReuseCmdSkt, DefaultHist.ReuseCmdSkt);\r
                                                        // MLSD対応\r
                                                        SaveIntNum(hKey5, "MLSD", Hist.UseMLSD, DefaultHist.UseMLSD);\r
                                                        // IPv6対応\r
@@ -560,6 +561,7 @@ void SaveRegistory(void)
                                                        SaveStr(hKey5, "PKey", Str, DefaultHost.PrivateKey);\r
                                                        // 同時接続対応\r
                                                        SaveIntNum(hKey5, "ThreadCount", Host.MaxThreadCount, DefaultHost.MaxThreadCount);\r
+                                                       SaveIntNum(hKey5, "ReuseCmdSkt", Host.ReuseCmdSkt, DefaultHost.ReuseCmdSkt);\r
                                                        // MLSD対応\r
                                                        SaveIntNum(hKey5, "MLSD", Host.UseMLSD, DefaultHost.UseMLSD);\r
                                                        // IPv6対応\r
@@ -832,6 +834,7 @@ int LoadRegistory(void)
                                        DecodePassword(Str, Hist.PrivateKey);\r
                                        // 同時接続対応\r
                                        ReadIntValueFromReg(hKey5, "ThreadCount", &Hist.MaxThreadCount);\r
+                                       ReadIntValueFromReg(hKey5, "ReuseCmdSkt", &Hist.ReuseCmdSkt);\r
                                        // MLSD対応\r
                                        ReadIntValueFromReg(hKey5, "MLSD", &Hist.UseMLSD);\r
                                        // IPv6対応\r
@@ -922,6 +925,7 @@ int LoadRegistory(void)
                                        DecodePassword(Str, Host.PrivateKey);\r
                                        // 同時接続対応\r
                                        ReadIntValueFromReg(hKey5, "ThreadCount", &Host.MaxThreadCount);\r
+                                       ReadIntValueFromReg(hKey5, "ReuseCmdSkt", &Host.ReuseCmdSkt);\r
                                        // MLSD対応\r
                                        ReadIntValueFromReg(hKey5, "MLSD", &Host.UseMLSD);\r
                                        // IPv6対応\r
@@ -1104,7 +1108,7 @@ void SaveSettingsToFile(void)
                                {\r
                                        if(SetCurrentDirectory(SysDir))\r
                                        {\r
-                                               if(ShellExecute(NULL, "open", "regedit", Tmp, ".", SW_SHOW) <= (HINSTANCE)32)\r
+                                               if(ShellExecute(NULL, "open", "regedit", Tmp, NULL, SW_SHOW) <= (HINSTANCE)32)\r
                                                {\r
                                                        MessageBox(NULL, MSGJPN285, "FFFTP", MB_OK);\r
                                                }\r
@@ -1168,7 +1172,7 @@ int LoadSettingsFromFile(void)
                                {\r
                                        if(SetCurrentDirectory(SysDir))\r
                                        {\r
-                                               if(ShellExecute(NULL, "open", "regedit", Tmp, ".", SW_SHOW) <= (HINSTANCE)32)\r
+                                               if(ShellExecute(NULL, "open", "regedit", Tmp, NULL, SW_SHOW) <= (HINSTANCE)32)\r
                                                {\r
                                                        MessageBox(NULL, MSGJPN285, "FFFTP", MB_OK);\r
                                                }\r
@@ -2347,7 +2351,6 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
                                Sts = FFFTP_SUCCESS;\r
                                if(!CheckStringM(Str))\r
                                        break;\r
-                               Str = Str;\r
                                // UTF-8ではない可能性がある\r
                                // Shift_JISとみなす\r
                        case KANJI_SJIS:\r