Fix bugs of dead locking.

[ffftp/ffftp.git] / updater.h

diff --git a/updater.h b/updater.h
index 029141c..8e62e8b 100644 (file)
--- a/updater.h
+++ b/updater.h
@@ -7,10 +7,25 @@
 \r
 #include <windows.h>\r
 \r
-#define HTTP_USER_AGENT L"Mozilla/4.0"\r
-#define UPDATE_SERVER L"ffftp.sourceforge.jp"\r
-#define UPDATE_HASH_PATH L"/update/hash"\r
-#define UPDATE_LIST_PATH L"/update/list"\r
+#define HTTP_USER_AGENT "Mozilla/4.0"\r
+#define UPDATE_SERVER "ffftp.osdn.jp"\r
+#if defined(_M_IX86)\r
+#if !defined(FFFTP_ENGLISH)\r
+#define UPDATE_HASH_PATH "/update/jpn/hash"\r
+#define UPDATE_LIST_PATH "/update/jpn/list"\r
+#else\r
+#define UPDATE_HASH_PATH "/update/eng/hash"\r
+#define UPDATE_LIST_PATH "/update/eng/list"\r
+#endif\r
+#elif defined(_M_AMD64)\r
+#if !defined(FFFTP_ENGLISH)\r
+#define UPDATE_HASH_PATH "/update/amd64/jpn/hash"\r
+#define UPDATE_LIST_PATH "/update/amd64/jpn/list"\r
+#else\r
+#define UPDATE_HASH_PATH "/update/amd64/eng/hash"\r
+#define UPDATE_LIST_PATH "/update/amd64/eng/list"\r
+#endif\r
+#endif\r
 #define UPDATE_RSA_PUBLIC_KEY \\r
        "-----BEGIN PUBLIC KEY-----\n" \\r
        "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsVo13yricPHxkQypqiMy\n" \\r
@@ -28,8 +43,13 @@
        "-----END PUBLIC KEY-----\n"\r
 #define UPDATE_SIGNATURE "\x4C\x2A\x8E\x57\xAB\x75\x0C\xB5\xDA\x5F\xFE\xB9\x57\x9A\x1B\xA2\x7A\x61\x32\xF8\xFA\x4B\x61\xE2\xBA\x20\x9C\x37\xD5\x0A\xDC\x94\x10\x4D\x02\x30\x9B\xCD\x01\x9B\xB8\x73\x1E\xDB\xFD\xD7\x45\xCA\xE0\x8E\xF9\xB0\x1F\xB4\x0D\xD8\xFB\xE8\x41\x48\xE7\xF5\xE8\x64"\r
 \r
-BOOL CheckForUpdates();\r
-BOOL StartUpdateProcess();\r
+BOOL BuildUpdates(LPCTSTR PrivateKeyFile, LPCTSTR Password, LPCTSTR ServerPath, LPCTSTR HashFile, LPCTSTR ListFile, DWORD Version, LPCTSTR VersionString, LPCTSTR Description);\r
+BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir, DWORD* pVersion, LPTSTR pVersionString, LPTSTR pDescription);\r
+BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir);\r
+BOOL ApplyUpdates(LPCTSTR DestinationDir, LPCTSTR BackupDirName);\r
+BOOL CleanupUpdates(LPCTSTR DownloadDir);\r
+BOOL StartUpdateProcess(LPCTSTR DownloadDir, LPCTSTR CommandLine);\r
+BOOL RestartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword);\r
 \r
 #endif\r
 \r