Fix bugs of automatic software update.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index e223bc8..e80b258 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 86073ad..5650cb6 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 2d8623c..5948fb4 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 71dac52..bacc2c1 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/common.h b/common.h
index f42d95d..cdd5798 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            2016032300      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2016032400      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/updater.c b/updater.c
index 76ed554..ad70f62 100644 (file)
--- a/updater.c
+++ b/updater.c
@@ -50,32 +50,37 @@ BOOL ReadFileViaHTTPW(void* pOut, DWORD Length, DWORD* pLength, LPCWSTR UserAgen
 {\r
        BOOL bResult;\r
        HINTERNET hSession;\r
+       DWORD Buffer;\r
        HINTERNET hConnect;\r
        HINTERNET hRequest;\r
        bResult = FALSE;\r
        if(hSession = WinHttpOpen(UserAgent, WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0))\r
        {\r
-               if(hConnect = WinHttpConnect(hSession, ServerName, INTERNET_DEFAULT_HTTP_PORT, 0))\r
+               Buffer = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS;\r
+               if(WinHttpSetOption(hSession, WINHTTP_OPTION_REDIRECT_POLICY, &Buffer, sizeof(DWORD)))\r
                {\r
-                       if(hRequest = WinHttpOpenRequest(hConnect, L"GET", ObjectName, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0))\r
+                       if(hConnect = WinHttpConnect(hSession, ServerName, INTERNET_DEFAULT_HTTP_PORT, 0))\r
                        {\r
-                               if(WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0))\r
+                               if(hRequest = WinHttpOpenRequest(hConnect, L"GET", ObjectName, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0))\r
                                {\r
-                                       if(WinHttpReceiveResponse(hRequest, NULL))\r
+                                       if(WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0))\r
                                        {\r
-                                               if(WinHttpQueryDataAvailable(hRequest, pLength))\r
+                                               if(WinHttpReceiveResponse(hRequest, NULL))\r
                                                {\r
-                                                       if(*pLength <= Length)\r
+                                                       if(WinHttpQueryDataAvailable(hRequest, pLength))\r
                                                        {\r
-                                                               if(WinHttpReadData(hRequest, pOut, Length, pLength))\r
-                                                                       bResult = TRUE;\r
+                                                               if(*pLength <= Length)\r
+                                                               {\r
+                                                                       if(WinHttpReadData(hRequest, pOut, Length, pLength))\r
+                                                                               bResult = TRUE;\r
+                                                               }\r
                                                        }\r
                                                }\r
                                        }\r
+                                       WinHttpCloseHandle(hRequest);\r
                                }\r
-                               WinHttpCloseHandle(hRequest);\r
+                               WinHttpCloseHandle(hConnect);\r
                        }\r
-                       WinHttpCloseHandle(hConnect);\r
                }\r
                WinHttpCloseHandle(hSession);\r
        }\r