From 2548065ebc5da2a8778cd4f49343b847773ee174 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 15:39:23 +0000 Subject: 'unreferenced formal parameter' warnings fixed git-svn-id: http://svn.miranda-ng.org/main/trunk@14913 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SimpleAR/src/Options.cpp | 211 ++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 113 deletions(-) (limited to 'plugins/SimpleAR/src/Options.cpp') diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp index 23c41e10ca..75516552a2 100644 --- a/plugins/SimpleAR/src/Options.cpp +++ b/plugins/SimpleAR/src/Options.cpp @@ -5,150 +5,135 @@ INT lastIndex=-1; INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) - { - case WM_INITDIALOG: + switch (msg) { + case WM_INITDIALOG: + TranslateDialogDefault(hwndDlg); { - DBVARIANT dbv; - TranslateDialogDefault(hwndDlg); - TCHAR* pszStatus; - char tszStatus[6]={0}; + char tszStatus[6] = { 0 }; - CheckDlgButton(hwndDlg,IDC_ENABLEREPLIER,db_get_b(NULL,protocolname,KEY_ENABLED,1)==1 ? BST_CHECKED : BST_UNCHECKED); - SetDlgItemInt(hwndDlg,IDC_INTERVAL,db_get_w(NULL,protocolname,KEY_REPEATINTERVAL,300)/60,FALSE); + CheckDlgButton(hwndDlg, IDC_ENABLEREPLIER, db_get_b(NULL, protocolname, KEY_ENABLED, 1) == 1 ? BST_CHECKED : BST_UNCHECKED); + SetDlgItemInt(hwndDlg, IDC_INTERVAL, db_get_w(NULL, protocolname, KEY_REPEATINTERVAL, 300) / 60, FALSE); - if (!db_get_ts(NULL,protocolname,KEY_HEADING,&dbv)) - { - SetDlgItemText(hwndDlg,IDC_HEADING,dbv.ptszVal); + DBVARIANT dbv; + if (!db_get_ts(NULL, protocolname, KEY_HEADING, &dbv)) { + SetDlgItemText(hwndDlg, IDC_HEADING, dbv.ptszVal); db_free(&dbv); } - for (INT c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++) - { + for (INT c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++) { mir_snprintf(tszStatus, _countof(tszStatus), "%d", c); - pszStatus = pcli->pfnGetStatusModeDescription(c, 0); + TCHAR *pszStatus = pcli->pfnGetStatusModeDescription(c, 0); if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE) continue; - else - { - SendDlgItemMessage(hwndDlg,IDC_STATUSMODE,CB_ADDSTRING,0,(LPARAM)pszStatus); + else { + SendDlgItemMessage(hwndDlg, IDC_STATUSMODE, CB_ADDSTRING, 0, (LPARAM)pszStatus); - if (!db_get_ts(NULL, protocolname, tszStatus, &dbv)) - { + if (!db_get_ts(NULL, protocolname, tszStatus, &dbv)) { if (c < ID_STATUS_FREECHAT) - ptszMessage[c-ID_STATUS_ONLINE-1] = _tcsdup(dbv.ptszVal); + ptszMessage[c - ID_STATUS_ONLINE - 1] = _tcsdup(dbv.ptszVal); else if (c > ID_STATUS_INVISIBLE) - ptszMessage[c-ID_STATUS_ONLINE-3] = _tcsdup(dbv.ptszVal); + ptszMessage[c - ID_STATUS_ONLINE - 3] = _tcsdup(dbv.ptszVal); db_free(&dbv); } } } - SendDlgItemMessage(hwndDlg,IDC_STATUSMODE,CB_SETCURSEL,0,0); + SendDlgItemMessage(hwndDlg, IDC_STATUSMODE, CB_SETCURSEL, 0, 0); - lastIndex=0; - SetDlgItemText(hwndDlg,IDC_MESSAGE,ptszMessage[lastIndex]); - - return TRUE; + lastIndex = 0; + SetDlgItemText(hwndDlg, IDC_MESSAGE, ptszMessage[lastIndex]); } + return TRUE; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_ENABLEREPLIER: - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - case IDC_STATUSMODE: - // First, save last, then load current - if (lastIndex>-1) - { - int size=SendDlgItemMessage(hwndDlg,IDC_MESSAGE,WM_GETTEXTLENGTH,0,0)+1; - GetDlgItemText(hwndDlg,IDC_MESSAGE,ptszMessage[lastIndex],size); - } - lastIndex=SendDlgItemMessage(hwndDlg,IDC_STATUSMODE,CB_GETCURSEL,0,0); - SetDlgItemText(hwndDlg,IDC_MESSAGE,ptszMessage[lastIndex]); - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - case IDC_DEFAULT: - SetDlgItemText(hwndDlg,IDC_MESSAGE,TranslateTS(ptszDefaultMsg[lastIndex])); - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - case IDC_INTERVAL: - case IDC_HEADING: - case IDC_MESSAGE: - if ((HIWORD(wParam) == BN_CLICKED || HIWORD(wParam) == EN_CHANGE) && (HWND)lParam == GetFocus()) - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - } + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDC_ENABLEREPLIER: + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; - - case WM_NOTIFY: - switch (((LPNMHDR)lParam)->code) - { - case PSN_APPLY: - { - TCHAR ptszText[1024]; - BOOL translated; - - BOOL fEnabled = IsDlgButtonChecked(hwndDlg, IDC_ENABLEREPLIER) == 1; - db_set_b(NULL, protocolname, KEY_ENABLED, (BYTE)fEnabled); - - if (fEnabled) - Menu_ModifyItem(hEnableMenu, LPGENT("Disable Auto&reply"), iconList[0].hIcolib); - else - Menu_ModifyItem(hEnableMenu, LPGENT("Enable Auto&reply"), iconList[1].hIcolib); - - GetDlgItemText(hwndDlg, IDC_HEADING, ptszText, _countof(ptszText)); - db_set_ts(NULL, protocolname, KEY_HEADING, ptszText); - - INT size = GetDlgItemInt(hwndDlg, IDC_INTERVAL, &translated, FALSE); - if (translated) - interval=size*60; - db_set_w(NULL,protocolname,KEY_REPEATINTERVAL,interval); - - size=SendDlgItemMessage(hwndDlg,IDC_MESSAGE,WM_GETTEXTLENGTH,0,0)+1; - GetDlgItemText(hwndDlg,IDC_MESSAGE,ptszMessage[lastIndex],size); - - for (int c=ID_STATUS_ONLINE; cID_STATUS_INVISIBLE && ptszMessage[c-ID_STATUS_ONLINE-3]) - db_set_ts(NULL,protocolname,szStatus,ptszMessage[c-ID_STATUS_ONLINE-3]); - else - db_unset(NULL,protocolname,szStatus); - } - } - return TRUE; - } + case IDC_STATUSMODE: + // First, save last, then load current + if (lastIndex > -1) { + int size = SendDlgItemMessage(hwndDlg, IDC_MESSAGE, WM_GETTEXTLENGTH, 0, 0) + 1; + GetDlgItemText(hwndDlg, IDC_MESSAGE, ptszMessage[lastIndex], size); } + lastIndex = SendDlgItemMessage(hwndDlg, IDC_STATUSMODE, CB_GETCURSEL, 0, 0); + SetDlgItemText(hwndDlg, IDC_MESSAGE, ptszMessage[lastIndex]); + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + break; + case IDC_DEFAULT: + SetDlgItemText(hwndDlg, IDC_MESSAGE, TranslateTS(ptszDefaultMsg[lastIndex])); + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; - case WM_DESTROY: - for (int c=ID_STATUS_ONLINE; ccode) { + case PSN_APPLY: + TCHAR ptszText[1024]; + BOOL translated; + + BOOL fEnabled = IsDlgButtonChecked(hwndDlg, IDC_ENABLEREPLIER) == 1; + db_set_b(NULL, protocolname, KEY_ENABLED, (BYTE)fEnabled); + + if (fEnabled) + Menu_ModifyItem(hEnableMenu, LPGENT("Disable Auto&reply"), iconList[0].hIcolib); + else + Menu_ModifyItem(hEnableMenu, LPGENT("Enable Auto&reply"), iconList[1].hIcolib); + + GetDlgItemText(hwndDlg, IDC_HEADING, ptszText, _countof(ptszText)); + db_set_ts(NULL, protocolname, KEY_HEADING, ptszText); + + INT size = GetDlgItemInt(hwndDlg, IDC_INTERVAL, &translated, FALSE); + if (translated) + interval = size * 60; + db_set_w(NULL, protocolname, KEY_REPEATINTERVAL, interval); + + size = SendDlgItemMessage(hwndDlg, IDC_MESSAGE, WM_GETTEXTLENGTH, 0, 0) + 1; + GetDlgItemText(hwndDlg, IDC_MESSAGE, ptszMessage[lastIndex], size); + + for (int c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++) { if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE) continue; - else - { - if (cID_STATUS_INVISIBLE) - ptszMessage[c-ID_STATUS_ONLINE-3]=NULL; + else { + char szStatus[6] = { 0 }; + mir_snprintf(szStatus, _countof(szStatus), "%d", c); + + if (cID_STATUS_INVISIBLE && ptszMessage[c - ID_STATUS_ONLINE - 3]) + db_set_ts(NULL, protocolname, szStatus, ptszMessage[c - ID_STATUS_ONLINE - 3]); + else + db_unset(NULL, protocolname, szStatus); } } - break; + return TRUE; + } + break; + + case WM_DESTROY: + for (int c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++) { + if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE) + continue; + else { + if (cID_STATUS_INVISIBLE) + ptszMessage[c - ID_STATUS_ONLINE - 3] = NULL; + } + } + break; } return FALSE; } -INT OptInit(WPARAM wParam,LPARAM lParam) +INT OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -790000000; -- cgit v1.2.3