From 3f350883e214aaa6c2941ade516468ed7bf1f449 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 6 May 2016 22:59:15 +0000 Subject: SimpleStatusMsg: -some cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@16810 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SimpleStatusMsg/src/options.cpp | 224 +++++++++++++++----------------- 1 file changed, 103 insertions(+), 121 deletions(-) (limited to 'plugins/SimpleStatusMsg/src/options.cpp') diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index de55dcabb2..22658d55d8 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -291,9 +291,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l case CBN_SELCHANGE: case CBN_SELENDOK: { - int i, j, l, k, status_modes = 0, newindex = 0; + int l, k, status_modes = 0, newindex = 0; - i = SendMessage((HWND)lParam, CB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0), 0); + int i = SendMessage((HWND)lParam, CB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0), 0); if (i == 0) { @@ -379,9 +379,12 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l status_modes = CallProtoService(accounts->pa[k]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0); } else + { + k = 0; status_modes = accounts->statusMsgFlags; + } - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_RESETCONTENT, 0, 0); for (l=ID_STATUS_ONLINE; l<=ID_STATUS_OUTTOLUNCH; l++) @@ -438,8 +441,6 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l } else if (data->status_msg[i].flags[j] & STATUS_LAST_MSG) { - DBVARIANT dbv, dbv2; - char setting[80]; if (i) mir_snprintf(setting, "Last%sMsg", accounts->pa[k]->szModuleName); @@ -447,19 +448,18 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l mir_snprintf(setting, "LastMsg"); SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); - if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv)) + char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting); + if (szSetting) { - if (dbv.pszVal) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SimpleStatusMsg", szSetting); + if (tszStatusMsg && mir_tstrlen(tszStatusMsg)) { - if (!db_get_ts(NULL, "SimpleStatusMsg", dbv.pszVal, &dbv2) && mir_strlen(dbv.pszVal)) - { - if ((dbv2.ptszVal) && (mir_tstrlen(dbv2.ptszVal))) - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv2.ptszVal); + if (tszStatusMsg && mir_tstrlen(tszStatusMsg)) + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); - db_free(&dbv2); - } + mir_free(tszStatusMsg); } - db_free(&dbv); + mir_free(szSetting); } EnableWindow(GetDlgItem(hwndDlg, IDC_OPTEDIT1), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_VARSHELP), FALSE); @@ -483,17 +483,17 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (data->status_msg[i].flags[j] & STATUS_LAST_STATUS_MSG) { char setting[80]; - DBVARIANT dbv; if (i) mir_snprintf(setting, "%sMsg", accounts->pa[k]->szModuleName); else mir_snprintf(setting, "Msg"); - if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting), &dbv)) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting)); + if (tszStatusMsg) { - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv.ptszVal); - db_free(&dbv); + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } else SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); @@ -515,10 +515,8 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l switch (HIWORD(wParam)) { case BN_CLICKED: { - int i, j; - - i = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); data->proto_msg[i].flags = 0; @@ -594,7 +592,6 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (data->status_msg[i].flags[j] & STATUS_LAST_MSG) { char setting[80]; - DBVARIANT dbv, dbv2; if (i) mir_snprintf(setting, "Last%sMsg", accounts->pa[i-1]->szModuleName); @@ -602,18 +599,17 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l mir_snprintf(setting, "LastMsg"); SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); - if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv)) + char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting); + if (szSetting != NULL) { - if (dbv.pszVal) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SimpleStatusMsg", szSetting); + if (tszStatusMsg) { - if (!db_get_ts(NULL, "SimpleStatusMsg", dbv.pszVal, &dbv2) && mir_strlen(dbv.pszVal)) - { - if (dbv2.ptszVal && mir_tstrlen(dbv2.ptszVal)) - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv2.ptszVal); - db_free(&dbv2); - } + if (tszStatusMsg[0]) + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } - db_free(&dbv); + mir_free(szSetting); } EnableWindow(GetDlgItem(hwndDlg, IDC_OPTEDIT1), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_VARSHELP), FALSE); @@ -637,17 +633,17 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (data->status_msg[i].flags[j] & STATUS_LAST_STATUS_MSG) { char setting[80]; - DBVARIANT dbv; if (i) mir_snprintf(setting, "%sMsg", accounts->pa[i-1]->szModuleName); else mir_snprintf(setting, "Msg"); - if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting), &dbv)) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting)); + if (tszStatusMsg != NULL) { - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv.ptszVal); - db_free(&dbv); + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } else SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); @@ -667,10 +663,8 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l case CBN_SELCHANGE: case CBN_SELENDOK: { - int i, j; - - i = SendMessage((HWND)lParam, CB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0), 0); - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int i = SendMessage((HWND)lParam, CB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); if (data->status_msg[j].flags[i] & STATUS_SHOW_DLG) CheckDlgButton(hwndDlg, IDC_COPTMSG1, BST_CHECKED); @@ -694,26 +688,23 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (data->status_msg[j].flags[i] & STATUS_LAST_MSG) { char setting[80]; - DBVARIANT dbv,dbv2; - if (j) mir_snprintf(setting, "Last%sMsg", accounts->pa[j-1]->szModuleName); else mir_snprintf(setting, "LastMsg"); SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); - if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv)) + char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting); + if (szSetting != NULL) { - if (dbv.pszVal) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SimpleStatusMsg", szSetting); + if (tszStatusMsg) { - if (!db_get_ts(NULL, "SimpleStatusMsg", dbv.pszVal, &dbv2) && mir_strlen(dbv.pszVal)) - { - if (dbv2.ptszVal && mir_tstrlen(dbv2.ptszVal)) - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv2.ptszVal); - db_free(&dbv2); - } + if (tszStatusMsg[0]) + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } - db_free(&dbv); + mir_free(szSetting); } EnableWindow(GetDlgItem(hwndDlg, IDC_OPTEDIT1), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_VARSHELP), FALSE); @@ -729,17 +720,17 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (data->status_msg[j].flags[i] & STATUS_LAST_STATUS_MSG) { char setting[80]; - DBVARIANT dbv; if (j) mir_snprintf(setting, "%sMsg", accounts->pa[j-1]->szModuleName); else mir_snprintf(setting, "Msg"); - if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(i + ID_STATUS_ONLINE, setting), &dbv)) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting)); + if (tszStatusMsg != NULL) { - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv.ptszVal); - db_free(&dbv); + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } else SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); @@ -757,10 +748,8 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l switch (HIWORD(wParam)) { case BN_CLICKED: { - int i, j; - - i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); if (IsDlgButtonChecked(hwndDlg, IDC_COPTMSG1) == BST_CHECKED) data->status_msg[j].flags[i] |= STATUS_SHOW_DLG; else @@ -778,10 +767,8 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l switch (HIWORD(wParam)) { case BN_CLICKED: { - int i, j; - - i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); if (LOWORD(wParam) == IDC_ROPTMSG4 && data->proto_msg[j].flags & PROTO_THIS_MSG) break; @@ -808,7 +795,6 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (LOWORD(wParam) == IDC_ROPTMSG3) { char setting[80]; - DBVARIANT dbv, dbv2; if (j) mir_snprintf(setting, "Last%sMsg", accounts->pa[j-1]->szModuleName); @@ -816,19 +802,21 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l mir_snprintf(setting, "LastMsg"); SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); - if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv)) + + + char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting); + if (szSetting != NULL) { - if (dbv.pszVal) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SimpleStatusMsg", szSetting); + if (tszStatusMsg) { - if (!db_get_ts(NULL, "SimpleStatusMsg", dbv.pszVal, &dbv2) && mir_strlen(dbv.pszVal)) - { - if (dbv2.ptszVal && mir_tstrlen(dbv2.ptszVal)) - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv2.ptszVal); - db_free(&dbv2); - } + if (tszStatusMsg[0]) + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } - db_free(&dbv); + mir_free(szSetting); } + EnableWindow(GetDlgItem(hwndDlg, IDC_OPTEDIT1), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_VARSHELP), FALSE); data->status_msg[j].flags[i] |= STATUS_LAST_MSG; @@ -843,17 +831,17 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l else if (LOWORD(wParam) == IDC_ROPTMSG5) { char setting[80]; - DBVARIANT dbv; if (j) mir_snprintf(setting, "%sMsg", accounts->pa[j-1]->szModuleName); else mir_snprintf(setting, "Msg"); - if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(i+ID_STATUS_ONLINE, setting), &dbv)) + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i + ID_STATUS_ONLINE, setting)); + if (tszStatusMsg != NULL) { - SetDlgItemText(hwndDlg, IDC_OPTEDIT1, dbv.ptszVal); - db_free(&dbv); + SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg); + mir_free(tszStatusMsg); } else SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T("")); @@ -913,12 +901,11 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l case IDC_BOPTPROTO: { - int i, j, k; - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); if (j) { - for (i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) + for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { if (accounts->statusMsgFlags & Proto_Status2Flag(i)) { @@ -929,7 +916,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l } } - for (k = 0; k < accounts->count; k++) + for (int k = 0; k < accounts->count; k++) { if (!Proto_IsAccountEnabled(accounts->pa[k]) || !CallProtoService(accounts->pa[k]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0) || !(CallProtoService(accounts->pa[k]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND)) continue; @@ -964,7 +951,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l } else if (data->proto_msg[j].flags & PROTO_POPUPDLG) { - for (i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) + for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { if (CallProtoService(accounts->pa[k]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(i)) { @@ -981,17 +968,16 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l case IDC_BOPTSTATUS: { - int status_modes, i, j, k; - - i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); - j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0); + int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0); + int status_modes; if (j) status_modes = CallProtoService(accounts->pa[j-1]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0); else status_modes = accounts->statusMsgFlags; - for (k = ID_STATUS_ONLINE; k <= ID_STATUS_OUTTOLUNCH; k++) + for (int k = ID_STATUS_ONLINE; k <= ID_STATUS_OUTTOLUNCH; k++) { if (k - ID_STATUS_ONLINE != i && status_modes & Proto_Status2Flag(k)) { @@ -1009,9 +995,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY) { char szSetting[80]; - int i; - - for (i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) + for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { if (accounts->statusMsgFlags & Proto_Status2Flag(i)) { @@ -1044,7 +1028,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l { db_set_b(NULL, "SimpleStatusMsg", "ProtoFlags", (BYTE)data->proto_msg[0].flags); - for (i = 0; i < accounts->count; i++) + for (int i = 0; i < accounts->count; i++) { if (!Proto_IsAccountEnabled(accounts->pa[i])) continue; @@ -1189,24 +1173,24 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM return FALSE; } -static BOOL IsHistoryMsgsFound(HWND, int histMax) +static bool IsHistoryMsgsFound(HWND, int histMax) { char szSetting[16]; - DBVARIANT dbv; int j = db_get_w(NULL, "SimpleStatusMsg", "LMMsg", 1); for (int i = 1; i <= histMax; ++i, --j) { if (j < 1) j = histMax; mir_snprintf(szSetting, "SMsg%d", j); - if (!db_get_ts(NULL, "SimpleStatusMsg", szSetting, &dbv)) { - if (dbv.ptszVal != NULL && *dbv.ptszVal != '\0') { - db_free(&dbv); - return TRUE; + TCHAR *tszStatusMsg = db_get_tsa(NULL, "SimpleStatusMsg", szSetting); + if (tszStatusMsg != NULL) { + if (*tszStatusMsg != '\0') { + mir_free(tszStatusMsg); + return true; } - db_free(&dbv); + mir_free(tszStatusMsg); } } - return FALSE; + return false; } static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -1338,19 +1322,20 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w case IDC_BOPTHIST: if (MessageBox(NULL, TranslateT("Are you sure you want to clear status message history?"), TranslateT("Confirm clearing history"), MB_ICONQUESTION | MB_YESNO) == IDYES) { - int i, max_hist_msgs; - char text[8], setting[80]; if (hwndSAMsgDialog) DestroyWindow(hwndSAMsgDialog); - max_hist_msgs = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10); - for (i = 1; i <= max_hist_msgs; i++) { + int max_hist_msgs = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10); + for (int i = 1; i <= max_hist_msgs; i++) { + char text[8]; mir_snprintf(text, "SMsg%d", i); db_set_ts(NULL, "SimpleStatusMsg", text, _T("")); } + db_set_s(NULL, "SimpleStatusMsg", "LastMsg", ""); - for (i = 0; i < accounts->count; i++) { + + for (int i = 0; i < accounts->count; i++) { if (!Proto_IsAccountEnabled(accounts->pa[i])) continue; @@ -1360,6 +1345,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w if (!(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND)) continue; + char setting[80]; mir_snprintf(setting, "Last%sMsg", accounts->pa[i]->szModuleName); db_set_s(NULL, "SimpleStatusMsg", setting, ""); } @@ -1371,14 +1357,12 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w case IDC_BOPTDEF: if (MessageBox(NULL, TranslateT("Are you sure you want to clear predefined status messages?"), TranslateT("Confirm clearing predefined"), MB_ICONQUESTION | MB_YESNO) == IDYES) { - char szSetting[16]; - int nDefMSgCount; - if (hwndSAMsgDialog) DestroyWindow(hwndSAMsgDialog); - nDefMSgCount = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0); + int nDefMSgCount = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0); for (int i = 1; i <= nDefMSgCount; i++) { + char szSetting[16]; mir_snprintf(szSetting, "DefMsg%d", i); db_unset(NULL, "SimpleStatusMsg", szSetting); } @@ -1440,8 +1424,6 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa switch (uMsg) { case WM_INITDIALOG: { - int index, i; - TranslateDialogDefault(hwndDlg); data = (struct StatusOptDlgData *)mir_alloc(sizeof(struct StatusOptDlgData)); @@ -1449,12 +1431,12 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa data->status = (int *)mir_alloc(sizeof(int) * accounts->count); data->setdelay = (int *)mir_alloc(sizeof(int) * accounts->count); - for (i = 0; i < accounts->count; ++i) + for (int i = 0; i < accounts->count; ++i) { if (!Proto_IsAccountEnabled(accounts->pa[i]) || !(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) &~ CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0))) continue; - index = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_ADDSTRING, 0, (LPARAM)accounts->pa[i]->tszAccountName); + int index = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_ADDSTRING, 0, (LPARAM)accounts->pa[i]->tszAccountName); if (index != LB_ERR && index != LB_ERRSPACE) { char setting[80]; @@ -1477,7 +1459,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa if (!db_get_b(NULL, "SimpleStatusMsg", "GlobalStatusDelay", 1)) { CheckDlgButton(hwndDlg, IDC_SPECSET, BST_CHECKED); - i = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETCURSEL, 0, 0), 0); SetDlgItemInt(hwndDlg, IDC_ESETSTATUS, data->setdelay[i], FALSE); } else @@ -1503,7 +1485,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa { EnableWindow(GetDlgItem(hwndDlg, IDC_SPECSET), FALSE); CheckDlgButton(hwndDlg, IDC_SPECSET, BST_UNCHECKED); //should work like when checked, but should not be checked - i = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETCURSEL, 0, 0), 0); + int i = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETCURSEL, 0, 0), 0); SetDlgItemInt(hwndDlg, IDC_ESETSTATUS, data->setdelay[i], FALSE); } @@ -1580,17 +1562,17 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa switch (HIWORD(wParam)) { case LBN_SELCHANGE: { - int status_modes, i, l, index, newindex = 0; + int newindex = 0; - i = SendMessage((HWND)lParam, LB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0), 0); - status_modes = CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) & ~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0); + int i = SendMessage((HWND)lParam, LB_GETITEMDATA, (WPARAM)SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0), 0); + int status_modes = CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) & ~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0); SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_RESETCONTENT, 0, 0); - for (l = ID_STATUS_OFFLINE; l <= ID_STATUS_OUTTOLUNCH; l++) + for (int l = ID_STATUS_OFFLINE; l <= ID_STATUS_OUTTOLUNCH; l++) { if (status_modes & Proto_Status2Flag(l) || l == ID_STATUS_OFFLINE) { - index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(l, 0)); + int index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(l, 0)); if (index != LB_ERR && index != LB_ERRSPACE) { SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_SETITEMDATA, (WPARAM)index, (LPARAM)l - ID_STATUS_OFFLINE); @@ -1600,7 +1582,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa } } - index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)TranslateT("")); + int index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)TranslateT("")); if (index != LB_ERR && index != LB_ERRSPACE) { SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_SETITEMDATA, (WPARAM)index, (LPARAM)ID_STATUS_CURRENT - ID_STATUS_OFFLINE); @@ -1634,12 +1616,12 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa case WM_NOTIFY: if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY) { - char szSetting[80]; for (int i = 0; i < accounts->count; i++) { if (!Proto_IsAccountEnabled(accounts->pa[i]) || !(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0))) continue; + char szSetting[80]; mir_snprintf(szSetting, "Startup%sStatus", accounts->pa[i]->szModuleName); db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->status[i]); -- cgit v1.2.3