diff options
| -rw-r--r-- | updater/extern.cpp | 8 | ||||
| -rw-r--r-- | updater/progress_dialog.cpp | 2 | ||||
| -rw-r--r-- | updater/services.cpp | 20 | ||||
| -rw-r--r-- | updater/version.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/updater/extern.cpp b/updater/extern.cpp index 0c7f8c0..d33e0c2 100644 --- a/updater/extern.cpp +++ b/updater/extern.cpp @@ -273,7 +273,7 @@ void MoveFiles(HANDLE hLogFile, TCHAR *src_folder, TCHAR *dst_folder, TCHAR *bac DeleteFile(szBackupFileName);
if(!MoveFile(szNewFileName, szBackupFileName))
{
- // MessageBox(0, szNewFileName, "Could not backup!", MB_OK | MB_ICONWARNING);
+ // MessageBox(0, szNewFileName, __T("Could not backup!"), MB_OK | MB_ICONWARNING);
}
}
else
@@ -281,7 +281,7 @@ void MoveFiles(HANDLE hLogFile, TCHAR *src_folder, TCHAR *dst_folder, TCHAR *bac move_file = true;
if (!DeleteFile(szNewFileName))
{
- // MessageBox(0, szNewFileName, "Could not delete!", MB_OK | MB_ICONWARNING);
+ // MessageBox(0, szNewFileName, _T("Could not delete!"), MB_OK | MB_ICONWARNING);
}
}
@@ -289,10 +289,10 @@ void MoveFiles(HANDLE hLogFile, TCHAR *src_folder, TCHAR *dst_folder, TCHAR *bac {
if (!MoveFile(szOldFileName, szNewFileName))
{
- //MessageBox(0, szOldFileName, "Could not move!", MB_OK | MB_ICONWARNING);
+ //MessageBox(0, szOldFileName, _T("Could not move!"), MB_OK | MB_ICONWARNING);
// try a copy - possibly win98 etc. will not move the updater.dll when it is being used by this process
- CopyFile(szOldFileName, szNewFileName, TRUE);
+ CopyFile(szOldFileName, szNewFileName, FALSE);
DeleteFile(szOldFileName); // docs say it is marked for delete and actually removed when the last handle is closed...hmm
}
}
diff --git a/updater/progress_dialog.cpp b/updater/progress_dialog.cpp index 74ac4ef..545169b 100644 --- a/updater/progress_dialog.cpp +++ b/updater/progress_dialog.cpp @@ -107,5 +107,5 @@ void CreateProgressWindow(void) void ProgressWindowDone(void)
{
- if (hwndProgress) PostMessage(hwndProgress, WM_CLOSE, 0, 0);
+ if (hwndProgress) SendMessage(hwndProgress, WM_CLOSE, 0, 0);
}
diff --git a/updater/services.cpp b/updater/services.cpp index 3d6fcd7..f2b7dac 100644 --- a/updater/services.cpp +++ b/updater/services.cpp @@ -40,8 +40,8 @@ bool DownloadUpdates(UpdateList &todo, FilenameMap *map, bool dlls_only) { {
CreateProgressWindow();
- PostMessage(hwndProgress, WM_SETTEXT, 0, (LPARAM)TranslateT("Progress - Downloading updates..."));
- PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading"), 0);
+ SendMessage(hwndProgress, WM_SETTEXT, 0, (LPARAM)TranslateT("Progress - Downloading updates..."));
+ SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading"), 0);
}
TCHAR msg[512];
@@ -207,9 +207,9 @@ void CheckForUpdatesWorker(void *param) { {
CreateProgressWindow();
- PostMessage(hwndProgress, WM_SETTEXT, 0, (LPARAM)TranslateT("Progress - Checking for updates..."));
- if (options.use_xml_backend) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading XML data"), 0);
- else PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Checking for updates"), 0);
+ SendMessage(hwndProgress, WM_SETTEXT, 0, (LPARAM)TranslateT("Progress - Checking for updates..."));
+ if (options.use_xml_backend) SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading XML data"), 0);
+ else SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Checking for updates"), 0);
}
@@ -220,20 +220,20 @@ void CheckForUpdatesWorker(void *param) { if (UpdateXMLData(MC_PLUGINS)) // prevent double error messages (in some cases)
{
// iterate through the registered plugins
- if (!use_popup) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Scanning plugins folder"), 0);
+ if (!use_popup) SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Scanning plugins folder"), 0);
ScanPlugins(&fn_map, &update_list);
if (UpdateXMLData(MC_LOCALIZATION))
{
- if (!use_popup) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Scanning language packs"), 0);
+ if (!use_popup) SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Scanning language packs"), 0);
ScanLangpacks(&fn_map, &update_list);
}
- if(!use_popup) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Updating component file listing ids"), 0);
+ if(!use_popup) SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Updating component file listing ids"), 0);
UpdateFLIDs(update_list);
}
- if (!use_popup) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Checking for updates"), 0);
+ if (!use_popup) SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Checking for updates"), 0);
}
UpdateList update_list2(update_list);
@@ -260,7 +260,7 @@ void CheckForUpdatesWorker(void *param) { if(!use_popup) {
SendMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)msg, 0);
- PostMessage(hwndProgress, WMU_SETPROGRESS, (WPARAM)(int)(index * 100.0 / count), 0);
+ SendMessage(hwndProgress, WMU_SETPROGRESS, (WPARAM)(int)(index * 100.0 / count), 0);
} //else if(hwndPop) // disabled - just annoying
//ChangePopupText(hwndPop, msg);
diff --git a/updater/version.h b/updater/version.h index 3d31bb4..d4e41b8 100644 --- a/updater/version.h +++ b/updater/version.h @@ -5,7 +5,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 6
#define __RELEASE_NUM 1
-#define __BUILD_NUM 1
+#define __BUILD_NUM 3
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
|