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/BuddyPounce/src/dialog.cpp | 96 +++++++++++++++++++------------------- plugins/BuddyPounce/src/main.cpp | 67 +++++++++++++------------- plugins/BuddyPounce/src/stdafx.h | 10 ++-- 3 files changed, 86 insertions(+), 87 deletions(-) (limited to 'plugins/BuddyPounce/src') diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index 714a392324..727d9107d1 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -28,7 +28,7 @@ void populateContacts(MCONTACT BPhContact, HWND hwnd2CB) void saveLastSetting(MCONTACT hContact, HWND hwnd) { wchar_t number[8];//, string[1024];//for sending file name - switch (db_get_b(hContact, modname, "LastSetting", 2)) { // nothing to do + switch (db_get_b(hContact, MODULENAME, "LastSetting", 2)) { // nothing to do case 0: // Send If My Status Is... break; case 1: // Send If They Change status to @@ -38,18 +38,18 @@ void saveLastSetting(MCONTACT hContact, HWND hwnd) break; case 3: // Reuse Pounce GetDlgItemText(hwnd, IDC_SETTINGNUMBER, number, _countof(number)); - db_set_b(hContact, modname, "Reuse", (BYTE)_wtoi(number)); + db_set_b(hContact, MODULENAME, "Reuse", (BYTE)_wtoi(number)); break; case 4: // Give Up delay GetDlgItemText(hwnd, IDC_SETTINGNUMBER, number, _countof(number)); - db_set_b(hContact, modname, "GiveUpDays", (BYTE)_wtoi(number)); + db_set_b(hContact, MODULENAME, "GiveUpDays", (BYTE)_wtoi(number)); { - db_set_dw(hContact, modname, "GiveUpDate", (DWORD)(_wtoi(number)*SECONDSINADAY)); + db_set_dw(hContact, MODULENAME, "GiveUpDate", (DWORD)(_wtoi(number)*SECONDSINADAY)); } break; case 5: // confirm window GetDlgItemText(hwnd, IDC_SETTINGNUMBER, number, _countof(number)); - db_set_w(hContact, modname, "ConfirmTimeout", (WORD)_wtoi(number)); + db_set_w(hContact, MODULENAME, "ConfirmTimeout", (WORD)_wtoi(number)); break; } } @@ -65,11 +65,11 @@ void hideAll(HWND hwnd) void getDefaultMessage(HWND hwnd, UINT control, MCONTACT hContact) { DBVARIANT dbv; - if (!db_get_ws(hContact, modname, "PounceMsg", &dbv)) { + if (!db_get_ws(hContact, MODULENAME, "PounceMsg", &dbv)) { SetDlgItemText(hwnd, control, dbv.ptszVal); db_free(&dbv); } - else if (!db_get_ws(NULL, modname, "PounceMsg", &dbv)) { + else if (!db_get_ws(NULL, MODULENAME, "PounceMsg", &dbv)) { SetDlgItemText(hwnd, control, dbv.ptszVal); db_free(&dbv); } @@ -104,12 +104,12 @@ INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l if (!mir_wstrcmp(type, L"Any")) { if (LOWORD(wParam) == IDOK) - db_set_w(wi->hContact, modname, "SendIfMyStatusIsFLAG", flag); + db_set_w(wi->hContact, MODULENAME, "SendIfMyStatusIsFLAG", flag); wi->SendIfMy = nullptr; } else { if (LOWORD(wParam) == IDOK) - db_set_w(wi->hContact, modname, "SendIfTheirStatusIsFLAG", flag); + db_set_w(wi->hContact, MODULENAME, "SendIfTheirStatusIsFLAG", flag); wi->SendWhenThey = nullptr; } DestroyWindow(hwnd); @@ -130,7 +130,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta } else { hwnd = wi->SendIfMy = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_STATUSMODES), nullptr, StatusModesDlgProc, (LPARAM)wi); - statusFlag = db_get_w(wi->hContact, modname, "SendIfMyStatusIsFLAG", 0); + statusFlag = db_get_w(wi->hContact, MODULENAME, "SendIfMyStatusIsFLAG", 0); SetWindowText(hwnd, TranslateT("Send If My Status Is")); SetDlgItemText(hwnd, IDC_CHECK1, TranslateT("Any")); SetDlgItemText(hwnd, IDC_CHECK2, TranslateT("Online")); @@ -151,7 +151,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta } else { hwnd = wi->SendWhenThey = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_STATUSMODES), nullptr, StatusModesDlgProc, (LPARAM)wi); - statusFlag = db_get_w(wi->hContact, modname, "SendIfTheirStatusIsFLAG", 0); + statusFlag = db_get_w(wi->hContact, MODULENAME, "SendIfTheirStatusIsFLAG", 0); SetWindowText(hwnd, TranslateT("Send If Their Status changes")); SetDlgItemText(hwnd, IDC_CHECK1, TranslateT("From Offline")); SetDlgItemText(hwnd, IDC_CHECK2, TranslateT("To Online")); @@ -179,14 +179,14 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta void deletePounce(MCONTACT hContact) { - db_unset(hContact, modname, "PounceMsg"); - db_unset(hContact, modname, "SendIfMyStatusIsFLAG"); - db_unset(hContact, modname, "SendIfTheirStatusIsFLAG"); - db_unset(hContact, modname, "Reuse"); - db_unset(hContact, modname, "GiveUpDays"); - db_unset(hContact, modname, "GiveUpDate"); - db_unset(hContact, modname, "ConfirmTimeout"); - db_unset(hContact, modname, "FileToSend"); + db_unset(hContact, MODULENAME, "PounceMsg"); + db_unset(hContact, MODULENAME, "SendIfMyStatusIsFLAG"); + db_unset(hContact, MODULENAME, "SendIfTheirStatusIsFLAG"); + db_unset(hContact, MODULENAME, "Reuse"); + db_unset(hContact, MODULENAME, "GiveUpDays"); + db_unset(hContact, MODULENAME, "GiveUpDate"); + db_unset(hContact, MODULENAME, "ConfirmTimeout"); + db_unset(hContact, MODULENAME, "FileToSend"); } INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -224,9 +224,9 @@ INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L if (length > 1) { wchar_t *text = (wchar_t*)_alloca(length * sizeof(wchar_t)); GetDlgItemText(hwnd, IDC_MESSAGE, text, length); - db_set_ws(hContact, modname, "PounceMsg", text); + db_set_ws(hContact, MODULENAME, "PounceMsg", text); } - else db_unset(hContact, modname, "PounceMsg"); + else db_unset(hContact, MODULENAME, "PounceMsg"); } // fall through case IDCANCEL: @@ -264,7 +264,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM populateSettingsList(GetDlgItem(hwnd, IDC_SETTINGS)); populateContacts(wi->hContact, GetDlgItem(hwnd, IDC_CONTACTS)); SendDlgItemMessage(hwnd, IDC_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG((short)1024, (short)0)); - db_set_b(wi->hContact, modname, "LastSetting", 0); + db_set_b(wi->hContact, MODULENAME, "LastSetting", 0); return FALSE; case WM_COMMAND: @@ -289,10 +289,10 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM break; } GetDlgItemText(hwnd, IDC_MESSAGE, text, length); - db_set_ws(hContact, modname, "PounceMsg", text); + db_set_ws(hContact, MODULENAME, "PounceMsg", text); mir_free(text); } - else db_unset(hContact, modname, "PounceMsg"); + else db_unset(hContact, MODULENAME, "PounceMsg"); saveLastSetting(hContact, hwnd); } // fall through if (LOWORD(wParam) == IDC_SIMPLE) @@ -318,12 +318,12 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM mir_snwprintf(msg, TranslateT("The Message (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE))); SetDlgItemText(hwnd, GRP_MSG, msg); - db_set_w(wi->hContact, modname, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfMyStatusIsFLAG", 0)); - db_set_w(wi->hContact, modname, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfTheirStatusIsFLAG", 0)); - db_set_b(wi->hContact, modname, "Reuse", (BYTE)db_get_b(NULL, modname, "Reuse", 0)); - db_set_b(wi->hContact, modname, "GiveUpDays", (BYTE)db_get_b(NULL, modname, "GiveUpDays", 0)); - db_set_dw(wi->hContact, modname, "GiveUpDate", (DWORD)db_get_dw(NULL, modname, "GiveUpDate", 0)); - db_set_w(wi->hContact, modname, "ConfirmTimeout", (WORD)db_get_w(NULL, modname, "ConfirmTimeout", 0)); + db_set_w(wi->hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfMyStatusIsFLAG", 0)); + db_set_w(wi->hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfTheirStatusIsFLAG", 0)); + db_set_b(wi->hContact, MODULENAME, "Reuse", (BYTE)db_get_b(NULL, MODULENAME, "Reuse", 0)); + db_set_b(wi->hContact, MODULENAME, "GiveUpDays", (BYTE)db_get_b(NULL, MODULENAME, "GiveUpDays", 0)); + db_set_dw(wi->hContact, MODULENAME, "GiveUpDate", (DWORD)db_get_dw(NULL, MODULENAME, "GiveUpDate", 0)); + db_set_w(wi->hContact, MODULENAME, "ConfirmTimeout", (WORD)db_get_w(NULL, MODULENAME, "ConfirmTimeout", 0)); break; case IDC_SETTINGS: @@ -344,7 +344,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Reuse this message? (0 to use it once)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Times")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, modname, "Reuse", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, MODULENAME, "Reuse", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; @@ -353,7 +353,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Give up after... (0 to not give up)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Days")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, modname, "GiveUpDays", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, MODULENAME, "GiveUpDays", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; @@ -362,12 +362,12 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Show confirmation window? (0 to not Show)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Seconds to wait before sending")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_w(wi->hContact, modname, "ConfirmTimeout", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_w(wi->hContact, MODULENAME, "ConfirmTimeout", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; } - db_set_b(wi->hContact, modname, "LastSetting", (BYTE)item); + db_set_b(wi->hContact, MODULENAME, "LastSetting", (BYTE)item); } } break; @@ -394,9 +394,9 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, SetDlgItemText(hwnd, GRP_MSG, msg); populateSettingsList(GetDlgItem(hwnd, IDC_SETTINGS)); SendDlgItemMessage(hwnd, IDC_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG((short)1024, (short)0)); - CheckDlgButton(hwnd, IDC_USEADVANCED, db_get_b(NULL, modname, "UseAdvanced", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_SHOWDELIVERYMSGS, db_get_b(NULL, modname, "ShowDeliveryMessages", 1) ? BST_CHECKED : BST_UNCHECKED); - db_set_b(wi->hContact, modname, "LastSetting", 0); + CheckDlgButton(hwnd, IDC_USEADVANCED, db_get_b(NULL, MODULENAME, "UseAdvanced", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_SHOWDELIVERYMSGS, db_get_b(NULL, MODULENAME, "ShowDeliveryMessages", 1) ? BST_CHECKED : BST_UNCHECKED); + db_set_b(wi->hContact, MODULENAME, "LastSetting", 0); } return FALSE; @@ -415,12 +415,12 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; } GetDlgItemText(hwnd, IDC_MESSAGE, text, length); - db_set_ws(hContact, modname, "PounceMsg", text); + db_set_ws(hContact, MODULENAME, "PounceMsg", text); mir_free(text); } - else db_unset(hContact, modname, "PounceMsg"); - db_set_b(NULL, modname, "UseAdvanced", (BYTE)IsDlgButtonChecked(hwnd, IDC_USEADVANCED)); - db_set_b(NULL, modname, "ShowDeliveryMessages", (BYTE)IsDlgButtonChecked(hwnd, IDC_SHOWDELIVERYMSGS)); + else db_unset(hContact, MODULENAME, "PounceMsg"); + db_set_b(NULL, MODULENAME, "UseAdvanced", (BYTE)IsDlgButtonChecked(hwnd, IDC_USEADVANCED)); + db_set_b(NULL, MODULENAME, "ShowDeliveryMessages", (BYTE)IsDlgButtonChecked(hwnd, IDC_SHOWDELIVERYMSGS)); if (wi->SendIfMy) DestroyWindow(wi->SendIfMy); if (wi->SendWhenThey) DestroyWindow(wi->SendWhenThey); @@ -464,7 +464,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Reuse this message? (0 to use it once)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Times")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, modname, "Reuse", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, MODULENAME, "Reuse", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; @@ -473,7 +473,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Give up after... (0 to not give up)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Days")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, modname, "GiveUpDays", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_b(wi->hContact, MODULENAME, "GiveUpDays", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; @@ -482,12 +482,12 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Show confirmation window? (0 to not Show)")); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_SHOW); SetDlgItemText(hwnd, IDC_SETTINGMSG2, TranslateT("Seconds to wait before sending")); - SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_w(wi->hContact, modname, "ConfirmTimeout", 0), temp, 10)); + SetDlgItemText(hwnd, IDC_SETTINGNUMBER, _itow(db_get_w(wi->hContact, MODULENAME, "ConfirmTimeout", 0), temp, 10)); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; } - db_set_b(wi->hContact, modname, "LastSetting", (BYTE)item); + db_set_b(wi->hContact, MODULENAME, "LastSetting", (BYTE)item); } } break; @@ -506,11 +506,11 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP if (!spdps) DestroyWindow(hwnd); - spdps->timer = db_get_w(spdps->hContact, modname, "ConfirmTimeout", 0); + spdps->timer = db_get_w(spdps->hContact, MODULENAME, "ConfirmTimeout", 0); SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)spdps); { DBVARIANT dbv; - if (db_get_ws(spdps->hContact, modname, "PounceMsg", &dbv)) + if (db_get_ws(spdps->hContact, MODULENAME, "PounceMsg", &dbv)) DestroyWindow(hwnd); else { SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal); @@ -567,7 +567,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP hContact = lParam; { DBVARIANT dbv; - if (db_get_ws(hContact, modname, "PounceMsg", &dbv)) + if (db_get_ws(hContact, MODULENAME, "PounceMsg", &dbv)) DestroyWindow(hwnd); else { SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal); diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index d7365f0f5a..8719d919b2 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -4,7 +4,9 @@ CMPlugin g_plugin; int &hLangpack(g_plugin.m_hLang); MWindowList hWindowList; -PLUGININFOEX pluginInfo = { +///////////////////////////////////////////////////////////////////////////////////////// + +PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), @@ -17,19 +19,17 @@ PLUGININFOEX pluginInfo = { {0xa9e9c114, 0x84b9, 0x434b, {0xa3, 0xd5, 0x89, 0x92, 0x1d, 0x39, 0xdd, 0xff}} }; -//======================== -// MirandaPluginInfo -//======================== - +CMPlugin::CMPlugin() : + PLUGIN(MODULENAME, pluginInfoEx) +{} extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - return &pluginInfo; + return &pluginInfoEx; } -//=================== +///////////////////////////////////////////////////////////////////////////////////////// // MainInit -//=================== int MainInit(WPARAM, LPARAM) { @@ -49,14 +49,14 @@ int MsgAck(WPARAM, LPARAM lParam) if (ack && ack->type == ACKTYPE_MESSAGE) { if (ack->hProcess == (HANDLE)WindowList_Find(hWindowList, ack->hContact)) { - if (db_get_b(NULL, modname, "ShowDeliveryMessages", 1)) + if (db_get_b(NULL, MODULENAME, "ShowDeliveryMessages", 1)) CreateMessageAcknowlegedWindow(ack->hContact, ack->result == ACKRESULT_SUCCESS); if (ack->result == ACKRESULT_SUCCESS) { // wrtie it to the DB DBEVENTINFO dbei = {}; DBVARIANT dbv; - int reuse = db_get_b(ack->hContact, modname, "Reuse", 0); - if (!db_get_ws(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) { + int reuse = db_get_b(ack->hContact, MODULENAME, "Reuse", 0); + if (!db_get_ws(ack->hContact, MODULENAME, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) { T2Utf pszUtf(dbv.ptszVal); dbei.eventType = EVENTTYPE_MESSAGE; dbei.flags = DBEF_UTF | DBEF_SENT; @@ -68,10 +68,10 @@ int MsgAck(WPARAM, LPARAM lParam) } // check to reuse if (reuse > 1) - db_set_b(ack->hContact, modname, "Reuse", (BYTE)(reuse - 1)); + db_set_b(ack->hContact, MODULENAME, "Reuse", (BYTE)(reuse - 1)); else { - db_set_b(ack->hContact, modname, "Reuse", 0); - db_set_ws(ack->hContact, modname, "PounceMsg", L""); + db_set_b(ack->hContact, MODULENAME, "Reuse", 0); + db_set_ws(ack->hContact, MODULENAME, "PounceMsg", L""); } } WindowList_Remove(hWindowList, (HWND)ack->hProcess); @@ -123,9 +123,9 @@ int statusCheck(int statusFlag, int status) int CheckDate(MCONTACT hContact) { time_t curtime = time(nullptr); - if (!db_get_b(hContact, modname, "GiveUpDays", 0)) + if (!db_get_b(hContact, MODULENAME, "GiveUpDays", 0)) return 1; - if (db_get_b(hContact, modname, "GiveUpDays", 0) && (abs((time_t)db_get_dw(hContact, modname, "GiveUpDate", 0)) > curtime)) + if (db_get_b(hContact, MODULENAME, "GiveUpDays", 0) && (abs((time_t)db_get_dw(hContact, MODULENAME, "GiveUpDate", 0)) > curtime)) return 1; return 0; } @@ -148,14 +148,14 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) if (newStatus != oldStatus && hContact != NULL && newStatus != ID_STATUS_OFFLINE) { DBVARIANT dbv; - if (!db_get_ws(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) { + if (!db_get_ws(hContact, MODULENAME, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) { // check my status - if (statusCheck(db_get_w(hContact, modname, "SendIfMyStatusIsFLAG", 0), Proto_GetStatus(szProto)) + if (statusCheck(db_get_w(hContact, MODULENAME, "SendIfMyStatusIsFLAG", 0), Proto_GetStatus(szProto)) // check the contacts status - && statusCheck(db_get_w(hContact, modname, "SendIfTheirStatusIsFLAG", 0), newStatus)) { + && statusCheck(db_get_w(hContact, MODULENAME, "SendIfTheirStatusIsFLAG", 0), newStatus)) { // check if we r giving up after x days if (CheckDate(hContact)) { - if (db_get_w(hContact, modname, "ConfirmTimeout", 0)) { + if (db_get_w(hContact, MODULENAME, "ConfirmTimeout", 0)) { SendPounceDlgProcStruct *spdps = (SendPounceDlgProcStruct *)mir_alloc(sizeof(SendPounceDlgProcStruct)); wchar_t *message = mir_wstrdup(dbv.ptszVal); // will get free()ed in the send confirm window proc spdps->hContact = hContact; @@ -176,7 +176,7 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) INT_PTR BuddyPounceMenuCommand(WPARAM hContact, LPARAM) { - if (db_get_b(NULL, modname, "UseAdvanced", 0) || db_get_b(hContact, modname, "UseAdvanced", 0)) + if (db_get_b(NULL, MODULENAME, "UseAdvanced", 0) || db_get_b(hContact, MODULENAME, "UseAdvanced", 0)) CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_POUNCE), nullptr, BuddyPounceDlgProc, hContact); else CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_POUNCE_SIMPLE), nullptr, BuddyPounceSimpleDlgProc, hContact); @@ -187,12 +187,12 @@ INT_PTR AddSimpleMessage(WPARAM wParam, LPARAM lParam) { MCONTACT hContact = wParam; wchar_t* message = (wchar_t*)lParam; - db_set_ws(hContact, modname, "PounceMsg", message); - db_set_w(hContact, modname, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfMyStatusIsFLAG", 1)); - db_set_w(hContact, modname, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfTheirStatusIsFLAG", 1)); - db_set_b(hContact, modname, "Reuse", (BYTE)db_get_b(NULL, modname, "Reuse", 0)); - db_set_b(hContact, modname, "GiveUpDays", (BYTE)db_get_b(NULL, modname, "GiveUpDays", 0)); - db_set_dw(hContact, modname, "GiveUpDate", (DWORD)(db_get_b(hContact, modname, "GiveUpDays", 0)*SECONDSINADAY)); + db_set_ws(hContact, MODULENAME, "PounceMsg", message); + db_set_w(hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfMyStatusIsFLAG", 1)); + db_set_w(hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfTheirStatusIsFLAG", 1)); + db_set_b(hContact, MODULENAME, "Reuse", (BYTE)db_get_b(NULL, MODULENAME, "Reuse", 0)); + db_set_b(hContact, MODULENAME, "GiveUpDays", (BYTE)db_get_b(NULL, MODULENAME, "GiveUpDays", 0)); + db_set_dw(hContact, MODULENAME, "GiveUpDate", (DWORD)(db_get_b(hContact, MODULENAME, "GiveUpDays", 0)*SECONDSINADAY)); return 0; } @@ -201,13 +201,13 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam) MCONTACT hContact = wParam; wchar_t* message = (wchar_t*)lParam; DBVARIANT dbv; - if (!db_get_ws(hContact, modname, "PounceMsg", &dbv)) + if (!db_get_ws(hContact, MODULENAME, "PounceMsg", &dbv)) { wchar_t* newPounce = (wchar_t*)mir_alloc(mir_wstrlen(dbv.ptszVal) + mir_wstrlen(message) + 1); if (!newPounce) return 1; mir_wstrcpy(newPounce, dbv.ptszVal); mir_wstrcat(newPounce, message); - db_set_ws(hContact, modname, "PounceMsg", newPounce); + db_set_ws(hContact, MODULENAME, "PounceMsg", newPounce); mir_free(newPounce); db_free(&dbv); } @@ -215,12 +215,12 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam) return 0; } -//=========================== +///////////////////////////////////////////////////////////////////////////////////////// // Load (hook ModulesLoaded) -//=========================== + extern "C" __declspec(dllexport) int Load(void) { - mir_getLP(&pluginInfo); + mir_getLP(&pluginInfoEx); HookEvent(ME_SYSTEM_MODULESLOADED, MainInit); HookEvent(ME_DB_CONTACT_SETTINGCHANGED, UserOnlineSettingChanged); @@ -231,12 +231,13 @@ extern "C" __declspec(dllexport) int Load(void) hWindowList = WindowList_Create(); - /* service funcitons for other devs... */ + // service funcitons for other devs... */ CreateServiceFunction("BuddyPounce/AddSimplePounce", AddSimpleMessage); // add a simple pounce to a contact CreateServiceFunction("BuddyPounce/AddToPounce", AddToPounce); // add to the exsisitng pounce, if there isnt 1 then add a new simple pounce. return 0; } +///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) int Unload(void) { diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h index 50f8e76057..c72a0f832b 100644 --- a/plugins/BuddyPounce/src/stdafx.h +++ b/plugins/BuddyPounce/src/stdafx.h @@ -23,15 +23,13 @@ //======================================================= // Definitions //======================================================= -#define modname "BuddyPounce" -#define modFullname "Buddy Pounce" -#define msg(a,b) MessageBox(0,a,b,MB_OK) +#define MODULENAME "BuddyPounce" +#define modFullname "Buddy Pounce" +#define msg(a,b) MessageBox(0,a,b,MB_OK) struct CMPlugin : public PLUGIN { - CMPlugin() : - PLUGIN(modname) - {} + CMPlugin(); }; #define SECONDSINADAY 86400 -- cgit v1.2.3