From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 20 May 2018 15:08:48 +0300 Subject: CMPlugin to receive a reference to PLUGININFOEX --- plugins/Spamotron/src/bayes.cpp | 2 +- plugins/Spamotron/src/options.cpp | 4 ++-- plugins/Spamotron/src/popups.cpp | 4 ++-- plugins/Spamotron/src/spamotron.cpp | 24 ++++++++++++++---------- plugins/Spamotron/src/stdafx.h | 18 ++++++++---------- plugins/Spamotron/src/utils.cpp | 10 +++++----- 6 files changed, 32 insertions(+), 30 deletions(-) (limited to 'plugins/Spamotron/src') diff --git a/plugins/Spamotron/src/bayes.cpp b/plugins/Spamotron/src/bayes.cpp index c4fde0f693..f099109530 100644 --- a/plugins/Spamotron/src/bayes.cpp +++ b/plugins/Spamotron/src/bayes.cpp @@ -21,7 +21,7 @@ int CheckBayes() mir_free(tmp); if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) { - hBayesFolder = FoldersRegisterCustomPath(PLUGIN_NAME, Translate("Bayes database path"), bayesdb_tmp); + hBayesFolder = FoldersRegisterCustomPath(MODULENAME, Translate("Bayes database path"), bayesdb_tmp); } else hBayesFolder = nullptr; if (hBayesFolder) diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index dcaca0087b..6411a624ac 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -6,7 +6,7 @@ wchar_t* _getCOptS(wchar_t *buf, unsigned int buflen, MCONTACT hContact, const c { DBVARIANT dbv = {0}; wcsnset(buf, 0, buflen); - if (db_get_ws(hContact, PLUGIN_NAME, option, &dbv) != 0) + if (db_get_ws(hContact, MODULENAME, option, &dbv) != 0) wcsncpy(buf, def, min(buflen, mir_wstrlen(def)+1)); else if (dbv.type == DBVT_WCHAR) { wcsncpy(buf, dbv.ptszVal, min(buflen, mir_wstrlen(dbv.ptszVal)+1)); @@ -554,7 +554,7 @@ int OnOptInitialize(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_plugin.getInst(); odp.szGroup.a = LPGEN("Message sessions"); - odp.szTitle.a = PLUGIN_NAME; + odp.szTitle.a = MODULENAME; odp.flags = ODPF_BOLDGROUPS; odp.szTab.a = LPGEN("Settings"); diff --git a/plugins/Spamotron/src/popups.cpp b/plugins/Spamotron/src/popups.cpp index a5f6afde33..a58f62d27e 100644 --- a/plugins/Spamotron/src/popups.cpp +++ b/plugins/Spamotron/src/popups.cpp @@ -185,7 +185,7 @@ int ShowPopupPreview(HWND optDlg, BYTE popupType, wchar_t *line1, wchar_t *line2 ppdp.iSeconds = 0; ppdp.lchContact = NULL; - wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(PLUGIN_NAME)), _TRUNCATE); + wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(MODULENAME)), _TRUNCATE); if (line2) wcsncpy_s(ppdp.lptzText, line2, _TRUNCATE); return PUAddPopupT(&ppdp); @@ -234,7 +234,7 @@ int ShowPopup(MCONTACT hContact, BYTE popupType, wchar_t *line1, wchar_t *line2) ppdp.iSeconds = 0; ppdp.lchContact = hContact; - wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(PLUGIN_NAME)), _TRUNCATE); + wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(MODULENAME)), _TRUNCATE); if (line2) wcsncpy_s(ppdp.lptzText, line2, _TRUNCATE); return PUAddPopupT(&ppdp); diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp index b6c3936f9f..82589c92c8 100644 --- a/plugins/Spamotron/src/spamotron.cpp +++ b/plugins/Spamotron/src/spamotron.cpp @@ -8,7 +8,7 @@ CMPlugin g_plugin; ///////////////////////////////////////////////////////////////////////////////////////// -PLUGININFOEX pluginInfo = { +PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), @@ -21,9 +21,13 @@ PLUGININFOEX pluginInfo = { {0x14331048, 0x5a73, 0x4fdb, {0xb9, 0x09, 0x2d, 0x7e, 0x18, 0x25, 0xa0, 0x12}} }; +CMPlugin::CMPlugin() : + PLUGIN(MODULENAME, pluginInfoEx) +{} + extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - return &pluginInfo; + return &pluginInfoEx; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -235,7 +239,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) DBVARIANT _dbv; wchar_t AuthEventModule[100]; char* szAuthEventModule; - if (db_get(hContact, PLUGIN_NAME, "AuthEvent", &_dbv) == 0) { + if (db_get(hContact, MODULENAME, "AuthEvent", &_dbv) == 0) { DBEVENTINFO *_dbei = (DBEVENTINFO *)malloc(sizeof(DBEVENTINFO)); if (_dbei != nullptr) { memcpy(&_dbei->cbBlob, _dbv.pbVal, sizeof(DWORD)); @@ -247,9 +251,9 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) _dbei->flags = 0; _dbei->pBlob = _dbv.pbVal + sizeof(DWORD); db_event_add(hContact,_dbei); - db_unset(hContact, PLUGIN_NAME, "AuthEvent"); - db_unset(hContact, PLUGIN_NAME, "AuthEventPending"); - db_unset(hContact, PLUGIN_NAME, "AuthEventModule"); + db_unset(hContact, MODULENAME, "AuthEvent"); + db_unset(hContact, MODULENAME, "AuthEventPending"); + db_unset(hContact, MODULENAME, "AuthEventModule"); mir_free(szAuthEventModule); free(_dbei); } @@ -441,7 +445,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) if (eventdata != nullptr && dbei->cbBlob > 0) { memcpy(eventdata, &dbei->cbBlob, sizeof(DWORD)); memcpy(eventdata + sizeof(DWORD), dbei->pBlob, dbei->cbBlob); - db_set_blob(hContact, PLUGIN_NAME, "AuthEvent", eventdata, sizeof(DWORD) + dbei->cbBlob); + db_set_blob(hContact, MODULENAME, "AuthEvent", eventdata, sizeof(DWORD) + dbei->cbBlob); _setCOptS(hContact, "AuthEventModule", dbei->szModule); _setCOptB(hContact, "AuthEventPending", TRUE); free(eventdata); @@ -454,7 +458,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) PBYTE eventdata = (PBYTE)malloc(dbei_size); PBYTE pos = eventdata; if (eventdata != nullptr && dbei->cbBlob > 0) { - if (db_get(hContact, PLUGIN_NAME, "LastMsgEvents", &_dbv) == 0) { + if (db_get(hContact, MODULENAME, "LastMsgEvents", &_dbv) == 0) { eventdata = (PBYTE)realloc(eventdata, dbei_size + _dbv.cpbVal); pos = eventdata; memcpy(eventdata, _dbv.pbVal, _dbv.cpbVal); @@ -467,7 +471,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 2, dbei->szModule, mir_strlen(dbei->szModule) + 1); memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 2 + mir_strlen(dbei->szModule) + 1, &dbei->cbBlob, sizeof(DWORD)); memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 3 + mir_strlen(dbei->szModule) + 1, dbei->pBlob, dbei->cbBlob); - db_set_blob(hContact, PLUGIN_NAME, "LastMsgEvents", eventdata, (pos - eventdata) + dbei_size); + db_set_blob(hContact, MODULENAME, "LastMsgEvents", eventdata, (pos - eventdata) + dbei_size); free(eventdata); } @@ -505,7 +509,7 @@ void RemoveNotOnListSettings() extern "C" __declspec(dllexport) int Load() { - mir_getLP(&pluginInfo); + mir_getLP(&pluginInfoEx); srand((unsigned)time(0)); bayesdb = nullptr; diff --git a/plugins/Spamotron/src/stdafx.h b/plugins/Spamotron/src/stdafx.h index 57abf24758..66578f6329 100644 --- a/plugins/Spamotron/src/stdafx.h +++ b/plugins/Spamotron/src/stdafx.h @@ -24,7 +24,7 @@ #include "resource.h" #include "version.h" -#define PLUGIN_NAME "Spam-o-tron" +#define MODULENAME "Spam-o-tron" #define SPAMOTRON_MODE_PLAIN 0 #define SPAMOTRON_MODE_MATH 1 @@ -33,10 +33,10 @@ #define MAX_BUFFER_LENGTH 1024 -#define _getCOptB(a,b,c) db_get_b(a, PLUGIN_NAME, b, c) -#define _setCOptB(a,b,c) db_set_b(a, PLUGIN_NAME, b, c) -#define _getCOptD(a,b,c) db_get_dw(a, PLUGIN_NAME, b, c) -#define _setCOptD(a,b,c) db_set_dw(a, PLUGIN_NAME, b, c) +#define _getCOptB(a,b,c) db_get_b(a, MODULENAME, b, c) +#define _setCOptB(a,b,c) db_set_b(a, MODULENAME, b, c) +#define _getCOptD(a,b,c) db_get_dw(a, MODULENAME, b, c) +#define _setCOptD(a,b,c) db_set_dw(a, MODULENAME, b, c) #define _getOptB(a,b) _getCOptB(NULL, a, b) #define _setOptB(a,b) _setCOptB(NULL, a, b) #define _getOptD(a,b) _getCOptD(NULL, a, b) @@ -44,8 +44,8 @@ wchar_t* _getCOptS(wchar_t *buf, unsigned int buflen, MCONTACT hContact, const char* option, const wchar_t *def); #define _getOptS(a,b,c,d) _getCOptS(a, b, NULL, c, d) -#define _setCOptTS(a,b,c) db_set_ws(a, PLUGIN_NAME, b, c) -#define _setCOptS(a,b,c) db_set_s(a, PLUGIN_NAME, b, c) +#define _setCOptTS(a,b,c) db_set_ws(a, MODULENAME, b, c) +#define _setCOptS(a,b,c) db_set_s(a, MODULENAME, b, c) #define _setOptTS(a,b) _setCOptTS(NULL, a, b) #define defaultMode SPAMOTRON_MODE_PLAIN @@ -151,9 +151,7 @@ void dequeue_messages(); struct CMPlugin : public PLUGIN { - CMPlugin() : - PLUGIN(PLUGIN_NAME) - {} + CMPlugin(); }; #ifdef _DEBUG diff --git a/plugins/Spamotron/src/utils.cpp b/plugins/Spamotron/src/utils.cpp index be49f90879..6ae1ca6d84 100644 --- a/plugins/Spamotron/src/utils.cpp +++ b/plugins/Spamotron/src/utils.cpp @@ -464,12 +464,12 @@ int LogToSystemHistory(char *message, char *origmessage) DBEVENTINFO dbei = {}; dbei.timestamp = time(&tm); - dbei.szModule = PLUGIN_NAME; + dbei.szModule = MODULENAME; dbei.pBlob = (PBYTE)msg; if (origmessage) - dbei.cbBlob = (1 + mir_snprintf(msg, "%s: %s%s %s: %s", PLUGIN_NAME, message, DOT(message), Translate("Their message was"), origmessage)); + dbei.cbBlob = (1 + mir_snprintf(msg, "%s: %s%s %s: %s", MODULENAME, message, DOT(message), Translate("Their message was"), origmessage)); else - dbei.cbBlob = (1 + mir_snprintf(msg, "%s: %s%s", PLUGIN_NAME, message, DOT(message))); + dbei.cbBlob = (1 + mir_snprintf(msg, "%s: %s%s", MODULENAME, message, DOT(message))); dbei.eventType = EVENTTYPE_MESSAGE; dbei.flags = DBEF_READ; db_event_add(NULL, &dbei); @@ -485,7 +485,7 @@ void MarkUnread(MCONTACT hContact) if (hContact == NULL) return; - if (db_get(hContact, PLUGIN_NAME, "LastMsgEvents", &_dbv) == 0) { + if (db_get(hContact, MODULENAME, "LastMsgEvents", &_dbv) == 0) { pos = _dbv.pbVal; while (pos - _dbv.pbVal < _dbv.cpbVal) { DBEVENTINFO _dbei = {}; @@ -505,6 +505,6 @@ void MarkUnread(MCONTACT hContact) db_event_add(hContact,&_dbei); } db_free(&_dbv); - db_unset(hContact, PLUGIN_NAME, "LastMsgEvents"); + db_unset(hContact, MODULENAME, "LastMsgEvents"); } } -- cgit v1.2.3