From 0c12fe889baeced3e7d8c3f2558d10f563a43612 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 17 May 2018 19:38:12 +0300 Subject: Plugin Updater loses compatibility with Miranda IM completely due to CMPlugin --- plugins/PluginUpdater/src/DlgListNew.cpp | 4 +- plugins/PluginUpdater/src/DlgUpdate.cpp | 60 +++++++---------------------- plugins/PluginUpdater/src/Events.cpp | 7 +--- plugins/PluginUpdater/src/Notifications.cpp | 10 +---- plugins/PluginUpdater/src/Options.cpp | 2 +- plugins/PluginUpdater/src/PluginUpdater.cpp | 51 ++++++------------------ plugins/PluginUpdater/src/Utils.cpp | 43 +++++---------------- plugins/PluginUpdater/src/stdafx.h | 28 ++++++-------- plugins/PluginUpdater/src/unzipfile.cpp | 6 +-- plugins/PluginUpdater/src/version.h | 6 +-- 10 files changed, 55 insertions(+), 162 deletions(-) (limited to 'plugins/PluginUpdater') diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp index 0402a1dc9b..1db3a7b496 100644 --- a/plugins/PluginUpdater/src/DlgListNew.cpp +++ b/plugins/PluginUpdater/src/DlgListNew.cpp @@ -308,7 +308,7 @@ INT_PTR CALLBACK DlgList(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_SIZE: // make the dlg resizeable if (!IsIconic(hDlg)) - Utils_ResizeDialog(hDlg, hInst, MAKEINTRESOURCEA(IDD_LIST), ListDlg_Resize); + Utils_ResizeDialog(hDlg, g_plugin.getInst(), MAKEINTRESOURCEA(IDD_LIST), ListDlg_Resize); break; case WM_GETMINMAXINFO: @@ -340,7 +340,7 @@ INT_PTR CALLBACK DlgList(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) static void __stdcall LaunchListDialog(void *param) { - hwndDialog = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_LIST), GetDesktopWindow(), DlgList, (LPARAM)param); + hwndDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_LIST), GetDesktopWindow(), DlgList, (LPARAM)param); } static FILEINFO* ServerEntryToFileInfo(const ServListEntry &hash, const wchar_t* tszBaseUrl, const wchar_t* tszPath) diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 800ee9852c..58d293b43f 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -122,19 +122,10 @@ static void ApplyUpdates(void *param) } Skin_PlaySound("updatecompleted"); -#if MIRANDA_VER < 0x0A00 - // 4) Change title of clist - ptrW title(db_get_wsa(NULL, "CList", "TitleText")); - if (!lstrcmpi(title, L"Miranda IM")) - db_set_ws(NULL, "CList", "TitleText", L"Miranda NG"); -#endif - db_set_b(NULL, MODNAME, DB_SETTING_RESTART_COUNT, 5); -#if MIRANDA_VER >= 0x0A00 if (opts.bBackup) CallService(MS_AB_BACKUP, 0, 0); -#endif if (opts.bChangePlatform) { wchar_t mirandaPath[MAX_PATH]; @@ -160,23 +151,18 @@ static void ApplyUpdates(void *param) int rc = MessageBox(hDlg, TranslateT("Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit."), TranslateT("Plugin Updater"), MB_YESNO | MB_ICONQUESTION); PostMessage(hDlg, WM_CLOSE, 0, 0); if (rc == IDYES) { -#if MIRANDA_VER >= 0x0A00 BOOL bRestartCurrentProfile = db_get_b(NULL, MODNAME, "RestartCurrentProfile", 1) ? 1 : 0; if (opts.bChangePlatform) { wchar_t mirstartpath[MAX_PATH]; -#ifdef _WIN64 - mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath); -#else - mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath); -#endif + #ifdef _WIN64 + mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath); + #else + mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath); + #endif CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile, (LPARAM)mirstartpath); } - else - CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile); -#else - CallFunctionAsync(RestartMe, 0); -#endif + else CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile); } } @@ -196,12 +182,8 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM case WM_INITDIALOG: TranslateDialogDefault(hDlg); SendMessage(hwndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES); -#if MIRANDA_VER >= 0x0A00 + Window_SetIcon_IcoLib(hDlg, iconList[0].hIcolib); -#else - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update")); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update",1)); -#endif { OSVERSIONINFO osver = { sizeof(osver) }; if (GetVersionEx(&osver) && osver.dwMajorVersion >= 6) @@ -383,9 +365,9 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM hwndDialog = nullptr; delete (OBJLIST *)GetWindowLongPtr(hDlg, GWLP_USERDATA); SetWindowLongPtr(hDlg, GWLP_USERDATA, 0); -#if MIRANDA_VER >= 0x0A00 + db_set_dw(NULL, MODNAME, DB_SETTING_LAST_UPDATE, time(0)); -#endif + mir_forkthread(InitTimer); break; } @@ -474,13 +456,6 @@ static void DlgUpdateSilent(void *param) delete &UpdateFiles; Skin_PlaySound("updatecompleted"); -#if MIRANDA_VER < 0x0A00 - // 4) Change title of clist - ptrW title = db_get_wsa(NULL, "CList", "TitleText"); - if (!_wcsicmp(title, L"Miranda IM")) - db_set_ws(NULL, "CList", "TitleText", L"Miranda NG"); -#endif - opts.bForceRedownload = false; db_unset(NULL, MODNAME, DB_SETTING_REDOWNLOAD); @@ -503,11 +478,7 @@ static void DlgUpdateSilent(void *param) mir_snwprintf(tszText, L"%s\n\n%s", TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?")); if (MessageBox(nullptr, tszText, tszTitle, MB_ICONINFORMATION | MB_YESNO) == IDYES) -#if MIRANDA_VER >= 0x0A00 CallServiceSync(MS_SYSTEM_RESTART, db_get_b(NULL, MODNAME, "RestartCurrentProfile", 1) ? 1 : 0, 0); -#else - CallFunctionAsync(RestartMe, 0); -#endif } } } @@ -517,7 +488,7 @@ static void __stdcall LaunchDialog(void *param) if (opts.bSilentMode && opts.bSilent) mir_forkthread(DlgUpdateSilent, param); else - hwndDialog = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param); + hwndDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -559,7 +530,6 @@ static renameTable[] = { L"startupstatus.dll", L"Plugins\\statusmanager.dll" }, { L"dropbox.dll", L"Plugins\\cloudfile.dll" }, -#if MIRANDA_VER >= 0x0A00 { L"dbx_mmap_sa.dll", L"Plugins\\dbx_mmap.dll" }, { L"dbx_tree.dll", L"Plugins\\dbx_mmap.dll" }, { L"rc4.dll", nullptr }, @@ -568,7 +538,6 @@ static renameTable[] = { L"mir_app.dll", nullptr }, { L"mir_core.dll", nullptr }, { L"zlib.dll", nullptr }, -#endif { L"proto_newsaggr.dll", L"Icons\\proto_newsaggregator.dll" }, { L"clienticons_*.dll", L"Icons\\fp_icons.dll" }, @@ -712,7 +681,6 @@ static int ScanFolder(const wchar_t *tszFolder, size_t cbBaseLen, const wchar_t strdelw(tszNewName + iPos, 1); } -#if MIRANDA_VER >= 0x0A00 // No need to hash a file if we are forcing a redownload anyway if (!opts.bForceRedownload) { // try to hash the file @@ -732,9 +700,7 @@ static int ScanFolder(const wchar_t *tszFolder, size_t cbBaseLen, const wchar_t // smth went wrong, reload a file from scratch } } - else - Netlib_LogfW(hNetlibUser, L"File %s: Forcing redownload", ffd.cFileName); -#endif + else Netlib_LogfW(hNetlibUser, L"File %s: Forcing redownload", ffd.cFileName); ptszUrl = item->m_name; MyCRC = item->m_crc; @@ -836,9 +802,9 @@ static void DoCheck(bool bSilent = true) } else { opts.bSilent = bSilent; -#if MIRANDA_VER >= 0x0A00 + db_set_dw(NULL, MODNAME, DB_SETTING_LAST_UPDATE, time(0)); -#endif + hCheckThread = mir_forkthread(CheckUpdates); } } diff --git a/plugins/PluginUpdater/src/Events.cpp b/plugins/PluginUpdater/src/Events.cpp index c163b7d9d9..1d5e3176f0 100644 --- a/plugins/PluginUpdater/src/Events.cpp +++ b/plugins/PluginUpdater/src/Events.cpp @@ -52,10 +52,8 @@ int ModulesLoaded(WPARAM, LPARAM) } else lstrcpyn(g_tszRoot, VARSW(L"%miranda_path%\\" DEFAULT_UPDATES_FOLDER), _countof(g_tszRoot)); -#if MIRANDA_VER >= 0x0A00 if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) - AssocMgr_AddNewUrlTypeW("mirpu:", TranslateT("Plugin updater URI scheme"), hInst, IDI_PLGLIST, MODNAME "/ParseUri", 0); -#endif + AssocMgr_AddNewUrlTypeW("mirpu:", TranslateT("Plugin updater URI scheme"), g_plugin.getInst(), IDI_PLGLIST, MODNAME "/ParseUri", 0); int iRestartCount = db_get_b(NULL, MODNAME, DB_SETTING_RESTART_COUNT, 2); if (iRestartCount > 0) @@ -73,10 +71,7 @@ int ModulesLoaded(WPARAM, LPARAM) int OnPreShutdown(WPARAM, LPARAM) { UninitCheck(); - -#if MIRANDA_VER >= 0x0A00 UninitListNew(); -#endif return 0; } diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp index c8057276b7..e5a948f01d 100644 --- a/plugins/PluginUpdater/src/Notifications.cpp +++ b/plugins/PluginUpdater/src/Notifications.cpp @@ -97,19 +97,13 @@ void ShowPopup(LPCTSTR ptszTitle, LPCTSTR ptszText, int Number) { if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) { char setting[100]; -#if MIRANDA_VER < 0x0A00 - mir_snprintf(setting, sizeof(setting), "Popups%d", Number); -#else mir_snprintf(setting, "Popups%d", Number); -#endif + if (db_get_b(NULL, MODNAME, setting, DEFAULT_POPUP_ENABLED)) { POPUPDATAT pd = { 0 }; pd.lchContact = NULL; -#if MIRANDA_VER >= 0x0A00 pd.lchIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib); -#else - pd.lchIcon = IcoLib_GetIcon("check_update"); -#endif + if (Number == POPUP_TYPE_MSG) { pd.PluginWindowProc = PopupDlgProcRestart; pd.iSeconds = -1; diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index b8bbc5363c..57f50bd06f 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -505,7 +505,7 @@ static int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; - odp.hInstance = hInst; + odp.hInstance = g_plugin.getInst(); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY); odp.szGroup.w = LPGENW("Services"); diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index d3728d8e39..cc4f361e95 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -19,10 +19,12 @@ Boston, MA 02111-1307, USA. #include "stdafx.h" -HINSTANCE hInst = nullptr; -wchar_t g_tszRoot[MAX_PATH] = {0}, g_tszTempPath[MAX_PATH]; int hLangpack; -DWORD g_mirandaVersion; +CMPlugin g_plugin; + +wchar_t g_tszRoot[MAX_PATH] = {0}, g_tszTempPath[MAX_PATH]; + +///////////////////////////////////////////////////////////////////////////////////////// PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), @@ -33,42 +35,23 @@ PLUGININFOEX pluginInfoEx = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, -#if MIRANDA_VER < 0x0A00 - 0, -#endif // {968DEF4A-BC60-4266-AC08-754CE721DB5F} {0x968def4a, 0xbc60, 0x4266, {0xac, 0x8, 0x75, 0x4c, 0xe7, 0x21, 0xdb, 0x5f}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - hInst = hinstDLL; - return TRUE; -} - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - g_mirandaVersion = mirandaVersion; return &pluginInfoEx; } +///////////////////////////////////////////////////////////////////////////////////////// -#if MIRANDA_VER < 0x0A00 -extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) -{ - pluginLink = link; - mir_getMMI(&mmi); - li.cbSize = LIST_INTERFACE_V2_SIZE; - CallService(MS_SYSTEM_GET_LI, 0, (LPARAM)&li); - mir_getMD5I(&md5i); - mir_getUTFI(&utfi); -#else extern "C" __declspec(dllexport) int Load(void) { mir_getLP(&pluginInfoEx); InitServices(); -#endif + db_set_b(NULL, MODNAME, DB_SETTING_NEED_RESTART, 0); DWORD dwLen = GetTempPath(_countof(g_tszTempPath), g_tszTempPath); @@ -83,23 +66,15 @@ extern "C" __declspec(dllexport) int Load(void) // Add cheking update menu item InitCheck(); -#if MIRANDA_VER >= 0x0A00 CMenuItem mi; SET_UID(mi, 0xfa2cbe01, 0x3b37, 0x4a4c, 0xa6, 0x97, 0xe4, 0x6f, 0x31, 0xa9, 0xfc, 0x33); mi.name.a = LPGEN("Check for updates"); mi.hIcolibItem = iconList[0].hIcolib; -#else - CLISTMENUITEM mi = { 0 }; - mi.cbSize = sizeof(mi); - mi.icolibItem = IcoLib_GetIconHandle("check_update"); - mi.pszName = LPGEN("Check for updates"); -#endif mi.position = 400010000; mi.pszService = MS_PU_CHECKUPDATES; Menu_AddMainMenuItem(&mi); -#if MIRANDA_VER >= 0x0A00 InitListNew(); SET_UID(mi, 0xafe94fad, 0xea83, 0x41aa, 0xa4, 0x26, 0xcb, 0x4a, 0x1c, 0x37, 0xc1, 0xd3); @@ -120,11 +95,9 @@ extern "C" __declspec(dllexport) int Load(void) hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F10) | HKF_MIRANDA_LOCAL; hkd.lParam = FALSE; Hotkey_Register(&hkd); -#endif InitEvents(); -#if MIRANDA_VER >= 0x0A00 // add sounds Skin_AddSound("updatecompleted", LPGENW("Plugin Updater"), LPGENW("Update completed")); Skin_AddSound("updatefailed", LPGENW("Plugin Updater"), LPGENW("Update failed")); @@ -148,16 +121,16 @@ extern "C" __declspec(dllexport) int Load(void) else db_set_b(0, MODNAME, DB_SETTING_UPDATE_MODE, UPDATE_MODE_CUSTOM); } } -#endif + return 0; } +///////////////////////////////////////////////////////////////////////////////////////// + extern "C" __declspec(dllexport) int Unload(void) { UnloadCheck(); - #if MIRANDA_VER >= 0x0A00 - UnloadListNew(); - #endif + UnloadListNew(); UnloadNetlib(); return 0; } diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 4c8db5f5a2..6cc3841083 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -41,7 +41,6 @@ void LoadOptions() opts.bChangePlatform = db_get_b(NULL, MODNAME, DB_SETTING_CHANGEPLATFORM, 0); } -#if MIRANDA_VER >= 0x0A00 IconItemT iconList[] = { { LPGENW("Check for updates"),"check_update", IDI_MENU }, @@ -51,20 +50,14 @@ IconItemT iconList[] = void InitIcoLib() { - Icon_RegisterT(hInst,MODULE,iconList, _countof(iconList)); + Icon_RegisterT(g_plugin.getInst(), MODULE, iconList, _countof(iconList)); } -#endif void InitNetlib() { NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - #if MIRANDA_VER >= 0x0A00 - nlu.szDescriptiveName.w = TranslateT("Plugin Updater HTTP connections"); - #else - nlu.cbSize = sizeof(nlu); - nlu.ptszDescriptiveName = TranslateT("Plugin Updater HTTP connections"); - #endif + nlu.szDescriptiveName.w = TranslateT("Plugin Updater HTTP connections"); nlu.szSettingsModule = MODNAME; hNetlibUser = Netlib_RegisterUser(&nlu); } @@ -136,23 +129,14 @@ int CompareHashes(const ServListEntry *p1, const ServListEntry *p2) bool ParseHashes(const wchar_t *ptszUrl, ptrW &baseUrl, SERVLIST &arHashes) { REPLACEVARSARRAY vars[2]; -#if MIRANDA_VER >=0x0A00 vars[0].key.w = L"platform"; -#ifdef _WIN64 - vars[0].value.w = L"64"; -#else - vars[0].value.w = L"32"; -#endif + #ifdef _WIN64 + vars[0].value.w = L"64"; + #else + vars[0].value.w = L"32"; + #endif vars[1].key.w = vars[1].value.w = nullptr; -#else - vars[0].lptzKey = L"platform"; -#ifdef _WIN64 - vars[0].lptzValue = L"64"; -#else - vars[0].lptzValue = L"32"; -#endif - vars[1].lptzKey = vars[1].lptzValue = 0; -#endif + baseUrl = Utils_ReplaceVarsW(ptszUrl, 0, vars); // Download version info @@ -237,15 +221,8 @@ bool ParseHashes(const wchar_t *ptszUrl, ptrW &baseUrl, SERVLIST &arHashes) bool DownloadFile(FILEURL *pFileURL, HNETLIBCONN &nlc) { NETLIBHTTPREQUEST nlhr = {0}; -#if MIRANDA_VER < 0x0A00 - nlhr.cbSize = NETLIBHTTPREQUEST_V1_SIZE; - nlhr.flags = NLHRF_DUMPASTEXT | NLHRF_HTTP11; - if (g_mirandaVersion >= PLUGIN_MAKE_VERSION(0, 9, 0, 0)) - nlhr.flags |= NLHRF_PERSISTENT; -#else nlhr.cbSize = sizeof(nlhr); nlhr.flags = NLHRF_DUMPASTEXT | NLHRF_HTTP11 | NLHRF_PERSISTENT; -#endif nlhr.requestType = REQUEST_GET; nlhr.nlc = nlc; char *szUrl = mir_u2a(pFileURL->tszDownloadURL); @@ -321,9 +298,7 @@ bool DownloadFile(FILEURL *pFileURL, HNETLIBCONN &nlc) void __stdcall OpenPluginOptions(void*) { - #if MIRANDA_VER >= 0x0A00 - Options_Open(nullptr, L"Plugins"); - #endif + Options_Open(nullptr, L"Plugins"); } // FUNCTION: IsRunAsAdmin() diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h index 9de650f87a..4e5722de85 100644 --- a/plugins/PluginUpdater/src/stdafx.h +++ b/plugins/PluginUpdater/src/stdafx.h @@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. #include // Miranda header files -#define __NO_CMPLUGIN_NEEDED #include #include #include @@ -48,12 +47,7 @@ Boston, MA 02111-1307, USA. #include "version.h" #include "resource.h" -#if MIRANDA_VER < 0x0A00 - #include - #include "Compat/compat.h" -#else - #include -#endif +#include #include "Notifications.h" @@ -102,12 +96,7 @@ extern struct PlugOptions #define DEFAULT_UPDATEONPERIOD 0 #define DEFAULT_PERIOD 1 #define DEFAULT_PERIODMEASURE 1 - -#if MIRANDA_VER < 0x0A00 - #define DEFAULT_ONLYONCEADAY 0 -#else - #define DEFAULT_ONLYONCEADAY 1 -#endif +#define DEFAULT_ONLYONCEADAY 1 #define DEFAULT_UPDATE_URL L"https://miranda-ng.org/distr/stable/x%d" #define DEFAULT_UPDATE_URL_TRUNK L"https://miranda-ng.org/distr/x%d" @@ -160,16 +149,21 @@ extern struct PlugOptions using namespace std; -extern HINSTANCE hInst; - extern DWORD g_mirandaVersion; extern wchar_t g_tszRoot[MAX_PATH], g_tszTempPath[MAX_PATH]; extern aPopups PopupsList[POPUPS]; extern HANDLE hPipe; extern HNETLIBUSER hNetlibUser; -#if MIRANDA_VER >= 0x0A00 + extern IconItemT iconList[]; -#endif + +struct CMPlugin : public PLUGIN +{ + CMPlugin() : + PLUGIN(MODNAME) + {} +}; + void UninitCheck(void); void UninitListNew(void); diff --git a/plugins/PluginUpdater/src/unzipfile.cpp b/plugins/PluginUpdater/src/unzipfile.cpp index 95aa1bf009..7e0ddca0e5 100644 --- a/plugins/PluginUpdater/src/unzipfile.cpp +++ b/plugins/PluginUpdater/src/unzipfile.cpp @@ -21,11 +21,7 @@ Boston, MA 02111-1307, USA. extern "C" { - #if MIRANDA_VER < 0x0A00 - #include "Minizip/unzip.h" - #else - #include "../../libs/zlib/src/unzip.h" - #endif + #include "../../libs/zlib/src/unzip.h" void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def); } diff --git a/plugins/PluginUpdater/src/version.h b/plugins/PluginUpdater/src/version.h index 2b1e215138..8f75e7990b 100644 --- a/plugins/PluginUpdater/src/version.h +++ b/plugins/PluginUpdater/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 -#define __MINOR_VERSION 1 -#define __RELEASE_NUM 2 -#define __BUILD_NUM 5 +#define __MINOR_VERSION 2 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 #include -- cgit v1.2.3