Fix bugs of file list type detection.

Add options not to save firewall user settings for shared computers.
Modify documents.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index d88320b..ab6feb7 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe
index 98b624e..6b5cac6 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 92f628d..bf078c1 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe
index 2976715..d65cae8 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index 18320fb..3655426 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -619,7 +619,7 @@ BEGIN
     COMBOBOX        FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "FireWall\83z\83X\83g(&H)",-1,7,32,80,8\r
     EDITTEXT        FIRE_HOST,7,41,150,12,ES_AUTOHSCROLL\r
-    LTEXT           "\83|\81[\83g(&X)",-1,168,32,36,8\r
+    LTEXT           "\83|\81[\83g(&O)",-1,168,32,36,8\r
     EDITTEXT        FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER\r
     LTEXT           "FireWall\83\86\81[\83U\81[\96¼(&U)",-1,7,56,76,8\r
     EDITTEXT        FIRE_USER,7,65,68,12,ES_AUTOHSCROLL\r
@@ -629,10 +629,11 @@ BEGIN
     EDITTEXT        FIRE_DELIMIT,169,65,35,12,ES_AUTOHSCROLL\r
     LTEXT           "\83Z\83L\83\85\83\8a\83e\83B(&Q)",-1,7,80,63,8\r
     COMBOBOX        FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "\83z\83X\83g\82Ì\8c\9f\8dõ\82ÍSOCKS\83T\81[\83o\81[\82É\94C\82¹\82é(&S)",FIRE_RESOLV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10\r
+    CONTROL         "\83z\83X\83g\82Ì\8c\9f\8dõ\82ÍSOCKS\83T\81[\83o\81[\82É\94C\82¹\82é(&R)",FIRE_RESOLV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10\r
     CONTROL         "OPEN/SITE\83R\83}\83\93\83h\82ð\8f¬\95¶\8e\9a\82É\82·\82é(&L)",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10\r
-    CONTROL         "\83z\83X\83g\88ê\97\97\82É\96¢\93o\98^\82Ì\83z\83X\83g\82ÍFireWall\82ð\8eg\82Á\82Ä\90Ú\91±(&C)",FIRE_USEIT,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10\r
+    CONTROL         "\83z\83X\83g\88ê\97\97\82É\96¢\93o\98^\82Ì\83z\83X\83g\82ÍFireWall\82ð\8eg\82Á\82Ä\90Ú\91±(&E)",FIRE_USEIT,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10\r
     CONTROL         "\83z\83X\83g\88ê\97\97\82É\96¢\93o\98^\82Ì\83z\83X\83g\82ÍPASV\83\82\81[\83h\82ð\8eg\82¤(&V)",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10\r
+    CONTROL         "FireWall\83\86\81[\83U\81[\96¼/\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢(&N)",FIRE_SHARED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,135,197,10\r
 END\r
 \r
 hset_adv_dlg DIALOG  0, 0, 207, 155\r

diff --git a/Resource/resource.h b/Resource/resource.h
index 6f5ab7a..ca0239a 100644 (file)
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -229,6 +229,7 @@
 #define CONNECT_CLOSE_NOTIFY            1015\r
 #define DISP2_PERMIT_NUM                1015\r
 #define MISC_ENCRYPT_SETTINGS           1015\r
+#define FIRE_SHARED                     1015\r
 #define PERM_O_EXEC                     1016\r
 #define TOOL_EDITOR2_BR                 1016\r
 #define CONNECT_QUICK_ANONY             1016\r

diff --git a/Resource_eng/ffftp.rc b/Resource_eng/ffftp.rc
index fc47b11..928818c 100644 (file)
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -623,22 +623,23 @@ BEGIN
     COMBOBOX        FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "Firewall &Hostname",-1,7,32,80,8\r
     EDITTEXT        FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL\r
-    LTEXT           "&Port",-1,168,32,36,8\r
+    LTEXT           "P&ort",-1,168,32,36,8\r
     EDITTEXT        FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER\r
     LTEXT           "Firewall &Username",-1,7,56,72,8\r
     EDITTEXT        FIRE_USER,7,65,70,12,ES_AUTOHSCROLL\r
-    LTEXT           "Firewall P&assword",-1,81,56,70,8\r
+    LTEXT           "Firewall &Password",-1,81,56,70,8\r
     EDITTEXT        FIRE_PASS,81,65,70,12,ES_PASSWORD | ES_AUTOHSCROLL\r
+    LTEXT           "Replace @ by",-1,154,55,50,8\r
+    EDITTEXT        FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL\r
     LTEXT           "&Security",-1,7,80,63,8\r
     COMBOBOX        FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,\r
                     "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10\r
-    CONTROL         "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10\r
+    CONTROL         "Use &lowercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10\r
     CONTROL         "Us&e the firewall for undefined hosts",FIRE_USEIT,\r
                     "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10\r
     CONTROL         "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10\r
-    LTEXT           "Replace @ by",-1,154,55,50,8\r
-    EDITTEXT        FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL\r
+    CONTROL         "Do &not save firewall username/password",FIRE_SHARED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,135,197,10\r
 END\r
 \r
 hset_adv_dlg DIALOG  0, 0, 207, 155\r

diff --git a/Resource_eng/resource.h b/Resource_eng/resource.h
index 6f5ab7a..ca0239a 100644 (file)
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -229,6 +229,7 @@
 #define CONNECT_CLOSE_NOTIFY            1015\r
 #define DISP2_PERMIT_NUM                1015\r
 #define MISC_ENCRYPT_SETTINGS           1015\r
+#define FIRE_SHARED                     1015\r
 #define PERM_O_EXEC                     1016\r
 #define TOOL_EDITOR2_BR                 1016\r
 #define CONNECT_QUICK_ANONY             1016\r

diff --git a/common.h b/common.h
index 5c8bfd7..4ca5e4c 100644 (file)
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2016013000      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2016022000      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/doc/eng/FFFTP.txt b/doc/eng/FFFTP.txt
index 31ab444..9e4430a 100644 (file)
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -101,6 +101,11 @@ Changes in Ver.1.99
 -- Fixed bugs to crash if certain operations are performed immediately after\r
    drag-and-drop from the remote file view.\r
 \r
+-- Fixed bugs to fail in recognizing file names that contain 2 or more spaces\r
+   in Windows Server 2008 R2 file list format.\r
+\r
+-- Added an option not to save the user name and password of the firewall.\r
+\r
 \r
 Outline\r
 -------\r

diff --git a/doc/eng/history.txt b/doc/eng/history.txt
index 393176a..0b359ae 100644 (file)
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -73,6 +73,11 @@ Changes in Ver.1.99
 -- Fixed bugs to crash if certain operations are performed immediately after\r
    drag-and-drop from the remote file view.\r
 \r
+-- Fixed bugs to fail in recognizing file names that contain 2 or more spaces\r
+   in Windows Server 2008 R2 file list format.\r
+\r
+-- Added an option not to save the user name and password of the firewall.\r
+\r
 Changes in Ver.1.98g2\r
 --------------------\r
 \r

diff --git a/doc/jpn/FFFTP.txt b/doc/jpn/FFFTP.txt
index 3f8fe7c..3fdf5fa 100644 (file)
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -105,6 +105,11 @@ Ver 1.99
 \81E\83\8a\83\82\81[\83g\91¤\82Ì\83t\83@\83C\83\8b\88ê\97\97\82©\82ç\83h\83\89\83b\83O\83A\83\93\83h\83h\83\8d\83b\83v\82µ\82½\92¼\8cã\82É\93Á\92è\82Ì\r
 \81@\91\80\8dì\82ð\8ds\82¤\82Æ\83N\83\89\83b\83V\83\85\82·\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
 \r
+\81EWindows Server 2008 R2\82Ì\83t\83@\83C\83\8b\88ê\97\97\8c`\8e®\82Å\94¼\8ap\83X\83y\81[\83X\82ð2\8cÂ\88È\8fã\8aÜ\82Þ\r
+\81@\83t\83@\83C\83\8b\96¼\82ð\94F\8e¯\82Å\82«\82È\82¢\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
+\r
+\81EFireWall\83\86\81[\83U\81[\96¼\82¨\82æ\82Ñ\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢\90Ý\92è\82ð\92Ç\89Á\82µ\82Ü\82µ\82½\81B\r
+\r
 \r
 Ver 1.96d\88È\91O\82Ö\96ß\82·\8fê\8d\87\r
 -----------------------\r

diff --git a/doc/jpn/history.txt b/doc/jpn/history.txt
index 59854e5..006ad30 100644 (file)
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -77,6 +77,11 @@ FFFTP
 \81E\83\8a\83\82\81[\83g\91¤\82Ì\83t\83@\83C\83\8b\88ê\97\97\82©\82ç\83h\83\89\83b\83O\83A\83\93\83h\83h\83\8d\83b\83v\82µ\82½\92¼\8cã\82É\93Á\92è\82Ì\r
 \81@\91\80\8dì\82ð\8ds\82¤\82Æ\83N\83\89\83b\83V\83\85\82·\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
 \r
+\81EWindows Server 2008 R2\82Ì\83t\83@\83C\83\8b\88ê\97\97\8c`\8e®\82Å\94¼\8ap\83X\83y\81[\83X\82ð2\8cÂ\88È\8fã\8aÜ\82Þ\r
+\81@\83t\83@\83C\83\8b\96¼\82ð\94F\8e¯\82Å\82«\82È\82¢\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
+\r
+\81EFireWall\83\86\81[\83U\81[\96¼\82¨\82æ\82Ñ\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢\90Ý\92è\82ð\92Ç\89Á\82µ\82Ü\82µ\82½\81B\r
+\r
 \81¡Ver 1.98g2\r
 \r
 \81E\83C\83\93\83X\83g\81[\83\89\94Å\82ÉZIP\94Å\82Ì\83t\83@\83C\83\8b\82ª\8d¬\93ü\82µ\82Ä\82¢\82½\96â\91è\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r

diff --git a/filelist.c b/filelist.c
index 83b8ad2..4f192d5 100755 (executable)
--- a/filelist.c
+++ b/filelist.c
@@ -3737,7 +3737,9 @@ static int AnalyzeFileInfo(char *Str)
                                }\r
                        }\r
 \r
-                       if(strlen(Tmp) >= 10)\r
+                       // バグ修正\r
+//                     if(strlen(Tmp) >= 10)\r
+                       if((strlen(Tmp) >= 10) && (strchr("+-dfl", Tmp[0]) != NULL))\r
                        {\r
                                Add1 = 0;\r
                                if((strlen(Tmp) > 10) && (IsDigit(Tmp[10]) != 0))\r

diff --git a/htmlhelp/FFFTP.CHM b/htmlhelp/FFFTP.CHM
index 0617b2a..c3313db 100644 (file)
Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ

diff --git a/htmlhelp/HTML/H0000049.HTM b/htmlhelp/HTML/H0000049.HTM
index 69863af..59023ae 100644 (file)
--- a/htmlhelp/HTML/H0000049.HTM
+++ b/htmlhelp/HTML/H0000049.HTM
@@ -64,4 +64,6 @@
 <P><STRONG>\81¡\83z\83X\83g\88ê\97\97\82É\96¢\93o\98^\82Ì\83z\83X\83g\82ÍFireWall\82ð\8eg\82Á\82Ä\90Ú\91±</STRONG></P>\r
 <P>\83N\83C\83b\83N\90Ú\91±\81A\82 \82é\82¢\82Í\83R\83}\83\93\83h\83\89\83C\83\93\82Å\83z\83X\83g\82ð\8ew\92è\82µ\82Ä\90Ú\91±\82·\82é\82Æ\82«\81AFireWall\82ð\8eg\82¤\82©\82Ç\82¤\82©\82ð\90Ý\92è\82µ\82Ü\82·\81B</P>\r
 <P><STRONG>\81¡\83z\83X\83g\88ê\97\97\82É\96¢\93o\98^\82Ì\83z\83X\83g\82ÍPASV\83\82\81[\83h\82ð\8eg\82¤</STRONG></P>\r
-<P>\83N\83C\83b\83N\90Ú\91±\81A\82 \82é\82¢\82Í\83R\83}\83\93\83h\83\89\83C\83\93\82Å\83z\83X\83g\82ð\8ew\92è\82µ\82Ä\90Ú\91±\82·\82é\82Æ\82«\81APASV\83\82\81[\83h\82ð\8eg\82¤\82©\82Ç\82¤\82©\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR></P></BODY></HTML>\r
+<P>\83N\83C\83b\83N\90Ú\91±\81A\82 \82é\82¢\82Í\83R\83}\83\93\83h\83\89\83C\83\93\82Å\83z\83X\83g\82ð\8ew\92è\82µ\82Ä\90Ú\91±\82·\82é\82Æ\82«\81APASV\83\82\81[\83h\82ð\8eg\82¤\82©\82Ç\82¤\82©\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR></P>\r
+<P><STRONG>\81¡FireWall\83\86\81[\83U\81[\96¼/\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢</STRONG></P>\r
+<P>FireWall\83\86\81[\83U\81[\96¼\82¨\82æ\82Ñ\83p\83X\83\8f\81[\83h\82Ì\90Ý\92è\82Æ\82µ\82Ä\95Û\91¶\82µ\82Ü\82¹\82ñ\81B<BR>\8b¤\97p\82Ì\83R\83\93\83s\83\85\81[\83^\82Å\8eg\97p\82·\82é\8fê\8d\87\82â\81AFireWall\82Å\83\86\81[\83U\81[\82ð\8aÇ\97\9d\82µ\82Ä\82¢\82é\8fê\8d\87\82É\82¨\8eg\82¢\82­\82¾\82³\82¢\81B<BR></P></BODY></HTML>\r

diff --git a/htmlhelp/pic/dlg_downmirror_list.png b/htmlhelp/pic/dlg_downmirror_list.png
index fde711c..d3aaeff 100644 (file)
Binary files a/htmlhelp/pic/dlg_downmirror_list.png and b/htmlhelp/pic/dlg_downmirror_list.png differ

diff --git a/htmlhelp/pic/dlg_opt_fwall.png b/htmlhelp/pic/dlg_opt_fwall.png
index 983f4ec..fe260f1 100644 (file)
Binary files a/htmlhelp/pic/dlg_opt_fwall.png and b/htmlhelp/pic/dlg_opt_fwall.png differ

diff --git a/main.c b/main.c
index 121284b..23ed158 100644 (file)
--- a/main.c
+++ b/main.c
@@ -287,6 +287,8 @@ time_t LastAutoCheckForUpdates = 0;
 int AbortOnListError = YES;\r
 // ミラーリング設定追加\r
 int MirrorNoTransferContents = NO; \r
+// FireWall設定追加\r
+int FwallNoSaveUser = NO; \r
 \r
 \r
 \r

diff --git a/option.c b/option.c
index ad6545c..c6a64aa 100644 (file)
--- a/option.c
+++ b/option.c
@@ -196,6 +196,8 @@ extern int AutoCheckForUptatesInterval;
 extern int AbortOnListError;\r
 // ミラーリング設定追加\r
 extern int MirrorNoTransferContents; \r
+// FireWall設定追加\r
+extern int FwallNoSaveUser; \r
 \r
 \r
 /*----- オプションのプロパティシート ------------------------------------------\r
@@ -1458,6 +1460,10 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN215);\r
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN216);\r
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_SETCURSEL, FwallSecurity, 0);\r
+\r
+                       // FireWall設定追加\r
+                       SendDlgItemMessage(hDlg, FIRE_SHARED, BM_SETCHECK, FwallNoSaveUser, 0);\r
+\r
                    return(TRUE);\r
 \r
                case WM_NOTIFY:\r
@@ -1479,6 +1485,8 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
                                        FwallResolve = SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_GETCHECK, 0, 0);\r
                                        FwallLower = SendDlgItemMessage(hDlg, FIRE_LOWER, BM_GETCHECK, 0, 0);\r
                                        FwallSecurity = SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_GETCURSEL, 0, 0);\r
+                                       // FireWall設定追加\r
+                                       FwallNoSaveUser = SendDlgItemMessage(hDlg, FIRE_SHARED, BM_GETCHECK, 0, 0);\r
                                        break;\r
 \r
                                case PSN_RESET :\r

diff --git a/registry.c b/registry.c
index 2e74c00..ac8e8d5 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -241,6 +241,8 @@ extern time_t LastAutoCheckForUpdates;
 extern int AbortOnListError;\r
 // ミラーリング設定追加\r
 extern int MirrorNoTransferContents; \r
+// FireWall設定追加\r
+extern int FwallNoSaveUser; \r
 \r
 /*----- マスタパスワードの設定 ----------------------------------------------\r
 *\r
@@ -544,8 +546,19 @@ void SaveRegistry(void)
                                WriteIntValueToReg(hKey4, "ListDrv", DispDrives);\r
 \r
                                WriteStringToReg(hKey4, "FwallHost", FwallHost);\r
-                               WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
-                               EncodePassword(FwallPass, Str);\r
+                               // FireWall設定追加\r
+//                             WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
+//                             EncodePassword(FwallPass, Str);\r
+                               if(FwallNoSaveUser == YES)\r
+                               {\r
+                                       WriteStringToReg(hKey4, "FwallUser", "");\r
+                                       EncodePassword("", Str);\r
+                               }\r
+                               else\r
+                               {\r
+                                       WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
+                                       EncodePassword(FwallPass, Str);\r
+                               }\r
                                WriteStringToReg(hKey4, "FwallPass", Str);\r
                                WriteIntValueToReg(hKey4, "FwallPort", FwallPort);\r
                                WriteIntValueToReg(hKey4, "FwallType", FwallType);\r
@@ -845,6 +858,8 @@ void SaveRegistry(void)
                                WriteIntValueToReg(hKey4, "AbortListErr", AbortOnListError);\r
                                // ミラーリング設定追加\r
                                WriteIntValueToReg(hKey4, "MirNoTransfer", MirrorNoTransferContents);\r
+                               // FireWall設定追加\r
+                               WriteIntValueToReg(hKey4, "FwallShared", FwallNoSaveUser);\r
                        }\r
                        CloseSubKey(hKey4);\r
                }\r
@@ -1435,6 +1450,8 @@ int LoadRegistry(void)
                        ReadIntValueFromReg(hKey4, "AbortListErr", &AbortOnListError);\r
                        // ミラーリング設定追加\r
                        ReadIntValueFromReg(hKey4, "MirNoTransfer", &MirrorNoTransferContents);\r
+                       // FireWall設定追加\r
+                       ReadIntValueFromReg(hKey4, "FwallShared", &FwallNoSaveUser);\r
 \r
                        CloseSubKey(hKey4);\r
                }\r