diff options
Diffstat (limited to 'updater/xmldata.cpp')
| -rw-r--r-- | updater/xmldata.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/updater/xmldata.cpp b/updater/xmldata.cpp index bffba57..46c4449 100644 --- a/updater/xmldata.cpp +++ b/updater/xmldata.cpp @@ -28,7 +28,7 @@ bool OldXMLDataExists(const Category cat) { _tcscat(xml_data_filename, _T("\\"));
_tcscat(xml_data_filename, ts = GetTString(category_files[cat]));
_tcscat(xml_data_filename, _T(".xml"));
- free(ts);
+ mir_free(ts);
HANDLE hDataFile = CreateFile(xml_data_filename, 0, 0, 0, OPEN_EXISTING, 0, 0);
if(hDataFile != INVALID_HANDLE_VALUE) {
@@ -48,7 +48,7 @@ long OldXMLDataAge(const Category cat) { _tcscat(xml_data_filename, _T("\\"));
_tcscat(xml_data_filename, ts = GetTString(category_files[cat]));
_tcscat(xml_data_filename, _T(".xml"));
- free(ts);
+ mir_free(ts);
HANDLE hDataFile = CreateFile(xml_data_filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
if(hDataFile != INVALID_HANDLE_VALUE) {
@@ -84,7 +84,7 @@ bool LoadOldXMLData(const Category cat, bool update_age) { _tcscat(xml_data_filename, _T("\\"));
_tcscat(xml_data_filename, ts = GetTString(category_files[cat]));
_tcscat(xml_data_filename, _T(".xml"));
- free(ts);
+ mir_free(ts);
if(pData[cat]) free(pData[cat]);
pData[cat] = 0;
@@ -132,7 +132,7 @@ bool SaveXMLData(const Category cat) { _tcscat(xml_data_filename, _T("\\"));
_tcscat(xml_data_filename, ts = GetTString(category_files[cat]));
_tcscat(xml_data_filename, _T(".xml"));
- free(ts);
+ mir_free(ts);
if(!CreatePath(options.data_folder)) {
return false;
@@ -152,6 +152,8 @@ bool SaveXMLData(const Category cat) { return false;
}
+extern "C" void bz_internal_error ( int errcode ){}
+
bool bz2_decompress_xml(char *in_data, int in_data_length, BYTE **pDat, int *data_length) {
const int BLOCKSIZE = 1024 * 100;
@@ -215,7 +217,7 @@ bool bz2_decompress_xml(char *in_data, int in_data_length, BYTE **pDat, int *dat bool UpdateXMLData(const Category cat, const char *redirect_url /*= 0*/, int recurse_count /*=0*/) {
if(recurse_count > MAX_REDIRECT_RECURSE) {
- PUShowMessage(Translate("Updater: Error getting data - too many redirects"), SM_WARNING);
+ PUShowMessageT(TranslateT("Updater: Error getting data - too many redirects"), SM_WARNING);
return false;
}
@@ -278,13 +280,13 @@ bool UpdateXMLData(const Category cat, const char *redirect_url /*= 0*/, int rec int len = mir_sntprintf(buff, SIZEOF(buff), TranslateT("Failed to download XML data: "));
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, 0, err, 0, buff + len, 512 - len, 0);
ShowError(buff);
- //MessageBox(0, buff + len, Translate("Updater: Error Downloading XML Data"), MB_OK | MB_ICONWARNING);
- char *ts = GetAString(buff);
+ //MessageBox(0, buff + len, TranslateT("Updater: Error Downloading XML Data"), MB_OK | MB_ICONWARNING);
+ char *ts = mir_t2a(buff);
NLog(ts);
- free(ts);
+ mir_free(ts);
} else {
ShowError(TranslateT("Failed to download XML data - Response is NULL"));
- //MessageBox(0, "Error downloading XML data...\nResponse is NULL"), Translate("Updater Error"), MB_OK | MB_ICONWARNING);
+ //MessageBox(0, TranslateT("Error downloading XML data...\nResponse is NULL"), Translate("Updater Error"), MB_OK | MB_ICONWARNING);
NLog("Failed to download XML data - Response is NULL");
}
return LoadOldXMLData(cat, false);
@@ -322,9 +324,9 @@ bool UpdateXMLData(const Category cat, const char *redirect_url /*= 0*/, int rec mir_sntprintf(buff, SIZEOF(buff), TranslateT("Failed to download XML data - Invalid response, code %d"), resp->resultCode);
ShowError(buff);
- char *ts = GetAString(buff);
+ char *ts = mir_t2a(buff);
NLog(ts);
- free(ts);
+ mir_free(ts);
CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)resp);
resp = 0;
return LoadOldXMLData(cat, false);
|