diff options
Diffstat (limited to 'plugins/UserInfoEx/src')
29 files changed, 61 insertions, 80 deletions
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index 98c2b9744a..d52a7dd44f 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -41,7 +41,7 @@ static LIST<MsgWndData> gMsgWndList(10, NumericKeySortT); * service functions
***********************************************************************************************************/
-static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)
+static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM)
{
WORD countryNumber;
char *pszProto = GetContactProto(wParam);
@@ -124,7 +124,7 @@ void UpdateStatusIcons() }
//hookProc ME_MSG_WINDOWEVENT
-static int OnMsgWndEvent(WPARAM wParam, LPARAM lParam)
+static int OnMsgWndEvent(WPARAM, LPARAM lParam)
{
MsgWndData *msgwnd;
MessageWindowEventData *msgwe = (MessageWindowEventData*)lParam;
@@ -153,7 +153,7 @@ static int OnMsgWndEvent(WPARAM wParam, LPARAM lParam) }
// hookProc ME_SKIN2_ICONSCHANGED
-static int OnStatusIconsChanged(WPARAM wParam, LPARAM lParam)
+static int OnStatusIconsChanged(WPARAM, LPARAM)
{
UpdateStatusIcons();
return 0;
@@ -215,7 +215,6 @@ void SvcFlagsLoadModule() // get local langID for descIcon (try to use user local Flag as icon)
DWORD langid = 0;
- int r = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ICOUNTRY | LOCALE_RETURN_NUMBER, (LPTSTR)&langid, sizeof(langid) / sizeof(TCHAR));
if (!CallService(MS_UTILS_GETCOUNTRYBYNUMBER, langid, 0))
langid = 1;
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp index 6ab6a0644b..6663f4a275 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.cpp +++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp @@ -524,7 +524,7 @@ int MAnnivDate::DBGetBirthDate(MCONTACT hContact, LPSTR pszProto) * return: 0 on success, 1 otherwise
**/
-int MAnnivDate::DBMoveBirthDate(MCONTACT hContact, BYTE bOld, BYTE bNew)
+int MAnnivDate::DBMoveBirthDate(MCONTACT hContact, BYTE bOld, BYTE)
{
Clear();
switch(bOld) {
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index 890af51d6c..b05f8961ab 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -837,12 +837,11 @@ void CPsTree::OnIconsChanged() BYTE CPsTree::OnInfoChanged() { PSHNOTIFY pshn; - int i; BYTE bChanged = 0; pshn.hdr.idFrom = 0; pshn.hdr.code = PSN_INFOCHANGED; - for (i = 0; i < _numItems; i++) { + for (int i = 0; i < _numItems; i++) { pshn.hdr.hwndFrom = _pItems[i]->Wnd(); if (pshn.hdr.hwndFrom != NULL) { pshn.lParam = (LPARAM)_pItems[i]->hContact(); @@ -922,11 +921,9 @@ void CPsTree::OnSelChanged(LPNMTREEVIEW lpnmtv) void CPsTree::OnCancel() { PSHNOTIFY pshn; - int i; - pshn.hdr.idFrom = 0; pshn.hdr.code = PSN_RESET; - for (i = 0; i < _numItems; i++) { + for (int i = 0; i < _numItems; i++) { pshn.hdr.hwndFrom = _pItems[i]->Wnd(); if (pshn.hdr.hwndFrom && (_pItems[i]->Flags() & PSPF_CHANGED)) { pshn.lParam = (LPARAM)_pItems[i]->hContact(); @@ -945,12 +942,10 @@ void CPsTree::OnCancel() int CPsTree::OnApply() { CPsTreeItem *pti = CurrentItem(); - PSHNOTIFY pshn; - int i; - if (pti == NULL) return 1; + PSHNOTIFY pshn; pshn.hdr.idFrom = 0; pshn.hdr.code = PSN_KILLACTIVE; pshn.hdr.hwndFrom = pti->Wnd(); @@ -958,12 +953,11 @@ int CPsTree::OnApply() return 1; // save everything to database pshn.hdr.code = PSN_APPLY; - for (i = 0; i < _numItems; i++) { + for (int i = 0; i < _numItems; i++) { if (_pItems[i] && _pItems[i]->Wnd() && _pItems[i]->Flags() & PSPF_CHANGED) { pshn.lParam = (LPARAM)_pItems[i]->hContact(); pshn.hdr.hwndFrom = _pItems[i]->Wnd(); if (SendMessage(pshn.hdr.hwndFrom, WM_NOTIFY, 0, (LPARAM)&pshn) == PSNRET_INVALID_NOCHANGEPAGE) { - CPsTreeItem *pti; if (pti = CurrentItem()) ShowWindow(pti->Wnd(), SW_HIDE); _curItem = i; diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp index c13a17dbd6..ec8361576f 100644 --- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp +++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp @@ -615,7 +615,7 @@ BOOL CAnnivEditCtrl::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) return bChanged;
}
-void CAnnivEditCtrl::OnApply(MCONTACT hContact, LPCSTR pszProto)
+void CAnnivEditCtrl::OnApply(MCONTACT hContact, LPCSTR)
{
DBWriteBirthDay(hContact);
DBWriteAnniversaries(hContact);
diff --git a/plugins/UserInfoEx/src/ctrl_base.h b/plugins/UserInfoEx/src/ctrl_base.h index 28a8b5cf83..bb90bd691f 100644 --- a/plugins/UserInfoEx/src/ctrl_base.h +++ b/plugins/UserInfoEx/src/ctrl_base.h @@ -163,7 +163,7 @@ public: * @retval TRUE - the content was updated
* @retval FALSE - content not updated
**/
- virtual BOOL OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) { return 0; }
+ virtual BOOL OnInfoChanged(MCONTACT, LPCSTR) { return 0; }
/**
* This is a pure virtual method, which is the common interface
@@ -174,7 +174,7 @@ public: *
* @return nothing
**/
- virtual void OnApply(MCONTACT hContact, LPCSTR pszProto) { }
+ virtual void OnApply(MCONTACT, LPCSTR) { }
/**
* This is a pure virtual method, which is called to set the
@@ -185,11 +185,11 @@ public: *
* @return nothing
**/
- virtual void OnChangedByUser(WORD wChangedMsg) { }
+ virtual void OnChangedByUser(WORD) { }
virtual void OnReset() { }
- INT_PTR OnSetTextColour(HDC hdc);
+ INT_PTR OnSetTextColour(HDC);
};
/***********************************************************************************************************
diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp index 12a84556ad..e8eb9a4387 100644 --- a/plugins/UserInfoEx/src/ctrl_combo.cpp +++ b/plugins/UserInfoEx/src/ctrl_combo.cpp @@ -153,7 +153,6 @@ BOOL CCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) if (!_Flags.B.hasChanged && _pList != NULL)
{
DBVARIANT dbv;
- LPIDSTRLIST pItem = NULL;
int iVal = CB_ERR;
_Flags.B.hasCustom = _Flags.B.hasProto = _Flags.B.hasMeta = 0;
diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index b89767a117..20d64d6b23 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -340,7 +340,7 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam if (noRecursion) break;
noRecursion = 1;
{
- TCHAR szText[MAXDATASIZE], *pText, *pArea, *pNumber;
+ TCHAR szText[MAXDATASIZE], *pText = 0, *pArea, *pNumber;
bool isValid = true;
GetDlgItemText(hDlg, EDIT_PHONE, szText, _countof(szText));
if (szText[0] != '+')
@@ -1180,7 +1180,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L cbex->bLocked = 1;
if ((BYTE)lParam == TRUE) {
- int i = (int)wParam;
+ i = (int)wParam;
cbex->iSelectedItem = (int)wParam;
while (i < cbex->numItems) {
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp index 5192cde19c..768f863a28 100644 --- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp +++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-static INT_PTR EnumNamesProc(CTimeZone *pTimeZone, int index, LPARAM lParam)
+static INT_PTR EnumNamesProc(CTimeZone *pTimeZone, int, LPARAM lParam)
{
if (pTimeZone && pTimeZone->ptszDisplay)
{
@@ -144,7 +144,7 @@ void CTzCombo::Release() *
* @return _Flags.B.hasChanged member
**/
-BOOL CTzCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto)
+BOOL CTzCombo::OnInfoChanged(MCONTACT hContact, LPCSTR)
{
if (!_Flags.B.hasChanged) {
LPTIME_ZONE_INFORMATION pTimeZone;
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 2d1d7761a5..f12f53c485 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -289,7 +289,6 @@ class CAnnivList switch (uMsg) {
case WM_INITDIALOG:
{
- int i = 0;
HWND hCtrl;
HICON hIcon;
RECT rc;
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index dec690cae0..8022802c2f 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -482,7 +482,7 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l * this set call function in wait stait and do not freece miranda main thread
* the window is outside the desktop
*/
-static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM, LPARAM lParam)
{
switch (uMsg) {
case WM_INITDIALOG:
@@ -587,7 +587,7 @@ static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP *
* @return TRUE, FALSE, IDOK, IDYES, IDALL, IDNO or IDCANCEL
**/
-static LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg) {
case UM_POPUPACTION:
@@ -635,7 +635,7 @@ static LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP * @return The function returns the ID of the clicked button (IDOK, IDCANCEL, ...)
* or -1 on error.
**/
-INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam)
+INT_PTR MsgBoxService(WPARAM, LPARAM lParam)
{
LPMSGBOX pMsgBox = (LPMSGBOX)lParam;
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index b0f9a2999e..4cb4dc7abc 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -241,7 +241,7 @@ static int SortProc(CPsTreeItem **item1, CPsTreeItem **item2) * @retval 0 on success
* @retval 1 on failure
**/
-static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
+static INT_PTR ShowDialog(WPARAM wParam, LPARAM)
{
// update some cached settings
myGlobals.ShowPropsheetColours = db_get_b(NULL, MODNAME, SET_PROPSHEET_SHOWCOLOURS, TRUE);
@@ -397,7 +397,7 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam) *
* @return 0
**/
-static int OnDeleteContact(WPARAM wParam, LPARAM lParam)
+static int OnDeleteContact(WPARAM wParam, LPARAM)
{
HWND hWnd = WindowList_Find(g_hWindowList, wParam);
if (hWnd != NULL)
@@ -411,7 +411,7 @@ static int OnDeleteContact(WPARAM wParam, LPARAM lParam) *
* @return 0
**/
-static int OnShutdown(WPARAM wParam, LPARAM lParam)
+static int OnShutdown(WPARAM, LPARAM)
{
WindowList_BroadcastAsync(g_hWindowList, WM_DESTROY, 0, 0);
return 0;
@@ -1187,7 +1187,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar case HM_PROTOACK:
{
ACKDATA *ack = (ACKDATA *)lParam;
- int i, iSubContact;
+ int i, iSubContact = 0;
if (!ack->hContact && ack->type == ACKTYPE_STATUS)
return DlgProc(hDlg, M_CHECKONLINE, NULL, NULL);
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 22bb4cea5f..456c704ad8 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -283,7 +283,6 @@ void CExImContactBase::toIni(FILE* file, int modCount) { // getting dbeditor++ NickFromHContact(hContact) static char name[512] = ""; - char* ret = 0; if (_hContact){ int loaded = _pszUIDKey ? 1 : 0; diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index fcdd7b15c4..a53afbe1b6 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -398,7 +398,7 @@ BYTE CExImContactXML::ExportEvents() if (dwNumEvents == 0)
return FALSE;
- DWORD cbEventBuf = 0, dwNumEventsAdded = 0;
+ DWORD dwNumEventsAdded = 0;
// read out all events for the current contact
for (MEVENT hDbEvent = db_event_first(_hContact); hDbEvent != NULL; hDbEvent = db_event_next(_hContact, hDbEvent)) {
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index 449b84cace..870f536389 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -166,7 +166,7 @@ static LRESULT CALLBACK PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wPara * lParam - message dependend parameter
* return: depends on message
**/
-static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM, LPARAM lParam)
{
switch (uMsg) {
case WM_NOTIFY:
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp index 2491f58242..a3010a90c5 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp @@ -293,7 +293,7 @@ static DWORD ImportreadLine(FILE* file, LPSTR &str) * cchBuf - character count of the buffer * return: handle to the contact that matches the information or NULL if no match **/ -static MCONTACT ImportFindContact(MCONTACT hContact, LPSTR &strBuf, BYTE bCanCreate) +static MCONTACT ImportFindContact(MCONTACT, LPSTR &strBuf, BYTE bCanCreate) { CExImContactBase vcc; @@ -321,7 +321,6 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine) { DBVARIANT dbv; LPSTR end, value; - size_t numLines = 0; size_t brk; LPSTR pszLine = strLine; diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 2d9e69541f..61ff1f1521 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -670,10 +670,7 @@ CVCardFileVCF::CVCardFileVCF() **/
size_t CVCardFileVCF::packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew)
{
- UINT i;
- WORD wAdd = 0;
-
- for (i = 0; i < nList; i++) {
+ for (UINT i = 0; i < nList; i++) {
if (pList[i].nID == iID) {
return (_clVal + pList[i].ptszTranslated);
}
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index fa5139c530..36383cf771 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -208,7 +208,7 @@ if (ExImContact->Typ == EXIM_ACCOUNT || /*********************************
* Ex/import All (MainMenu)
*********************************/
-INT_PTR svcExIm_MainExport_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_MainExport_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
@@ -217,7 +217,7 @@ INT_PTR svcExIm_MainExport_Service(WPARAM wParam, LPARAM lParam) return SvcExImport_Export(&ExIm, (HWND)lParam);
}
-INT_PTR svcExIm_MainImport_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_MainImport_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
@@ -262,7 +262,7 @@ INT_PTR svcExIm_ContactImport_Service(WPARAM hContact, LPARAM lParam) *
* @return always 0
**/
-INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
{
ExImParam ExIm;
INT_PTR hItem = 0, hRoot = 0, hParent = 0;
@@ -328,7 +328,7 @@ typedef struct * @return always 0
**/
-INT_PTR svcExIm_Account_Service(WPARAM wParam, LPARAM lParam)
+INT_PTR svcExIm_Account_Service(WPARAM, LPARAM lParam)
{
ExImParam ExIm;
memset(&ExIm, 0, sizeof(ExIm));
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.h b/plugins/UserInfoEx/src/ex_import/tinyxml.h index 536fabef74..b40797c079 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxml.h +++ b/plugins/UserInfoEx/src/ex_import/tinyxml.h @@ -788,7 +788,7 @@ public: virtual void Print(FILE* cfile, int depth) const; virtual void StreamOut(TIXML_OSTREAM * out) const; - virtual void FormattedStreamOut(TIXML_OSTREAM * stream, int depth) const {} + virtual void FormattedStreamOut(TIXML_OSTREAM *, int) const {} // [internal use] // Set the document pointer so the attribute can report errors. diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index a674881ea7..d082e3e430 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -226,7 +226,7 @@ extern "C" int __declspec(dllexport) Load(void) *
* @return TRUE
**/
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID)
{
if (fdwReason == DLL_PROCESS_ATTACH)
ghInst = hinst;
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.h b/plugins/UserInfoEx/src/mir_contactqueue.h index efd9fbd1dd..59a47a0f4c 100644 --- a/plugins/UserInfoEx/src/mir_contactqueue.h +++ b/plugins/UserInfoEx/src/mir_contactqueue.h @@ -63,7 +63,7 @@ public: void RemoveAll(MCONTACT hContact);
// This function removes all queue items for the hContact considering the correct parameter.
- void RemoveAllConsiderParam(MCONTACT hContact, PVOID param);
+ void RemoveAllConsiderParam(MCONTACT hContact, void *param);
/**
* This method adds the desired new item.
@@ -75,7 +75,7 @@ public: * @retval TRUE - The item is added to the queue successfully.
* @retval FALSE - The item is not added to the queue.
**/
- BOOL Add(int waitTime, MCONTACT hContact, PVOID param = NULL);
+ BOOL Add(int waitTime, MCONTACT hContact, void *param = NULL);
/**
* This method adds the desired new item only, if the queue does not yet contain
@@ -88,7 +88,7 @@ public: * @retval TRUE - The item is added to the queue successfully.
* @retval FALSE - The item is not added to the queue.
**/
- BOOL AddIfDontHave(int waitTime, MCONTACT hContact, PVOID param = NULL);
+ BOOL AddIfDontHave(int waitTime, MCONTACT hContact, void *param = NULL);
/**
* This method removes all existing queue items for the contact and adds a new queue item
@@ -101,7 +101,7 @@ public: *
* @return nothing
**/
- BOOL AddUnique(int waitTime, MCONTACT hContact, PVOID param = NULL);
+ BOOL AddUnique(int waitTime, MCONTACT hContact, void *param = NULL);
/**
* This method removes all existing queue items for the contact with the same parameter as @e param
@@ -114,7 +114,7 @@ public: *
* @return nothing
**/
- BOOL AddUniqueConsiderParam (int waitTime, MCONTACT hContact, PVOID param = NULL);
+ BOOL AddUniqueConsiderParam (int waitTime, MCONTACT hContact, void *param = NULL);
// This method resumes the worker thread and immitiatly goes on with the next entry.
void ContinueWithNext();
@@ -162,7 +162,7 @@ private: * @retval TRUE - The item is added to the queue successfully.
* @retval FALSE - The item is not added to the queue.
**/
- BOOL InternalAdd(int waitTime, MCONTACT hContact, PVOID param);
+ BOOL InternalAdd(int waitTime, MCONTACT hContact, void *param);
void Remove(int idx);
};
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index 689e364cc7..2898d3980a 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -61,7 +61,7 @@ BYTE Delete(MCONTACT hContact) /**
* This function trys to guess, when an ICQ contact was added to database.
**/
-DWORD WhenAdded(DWORD dwUIN, LPCSTR pszProto)
+DWORD WhenAdded(DWORD dwUIN, LPCSTR)
{
DBEVENTINFO dbei = { sizeof(dbei) };
for (MEVENT edbe = db_event_first(NULL); edbe != NULL; edbe = db_event_next(NULL, edbe)) {
@@ -106,7 +106,7 @@ void Delete(MCONTACT hContact, LPCSTR pszModule) * @retval TRUE - always true
**/
-static int IsEmptyEnumProc(LPCSTR pszSetting, LPARAM lParam)
+static int IsEmptyEnumProc(LPCSTR, LPARAM)
{
return 1;
}
@@ -700,7 +700,7 @@ bool Exists(MCONTACT hContact, MEVENT& hDbExistingEvent, DBEVENTINFO *dbei) } /* namespace Events */
-int CEnumList::EnumProc(LPCSTR pszName, DWORD ofsModuleName, LPARAM lParam)
+int CEnumList::EnumProc(LPCSTR pszName, DWORD, LPARAM lParam)
{
if (pszName)
((CEnumList*)lParam)->Insert(pszName);
diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp index bf72501961..3f87c2e539 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.cpp +++ b/plugins/UserInfoEx/src/mir_menuitems.cpp @@ -65,8 +65,6 @@ INT_PTR RemoveMenuItems(HGENMENU *pItems, int Count) **/
void RebuildContact()
{
- BYTE item = 0;
-
HGENMENU mhRoot = NULL;
HGENMENU mhExIm = NULL;
static HGENMENU hMenuItem[4] = { NULL, NULL, NULL, NULL };
@@ -302,7 +300,6 @@ void RebuildGroup() CMenuItem mi;
mi.pszService = text;
- char* tDest = text + mir_strlen(text);
switch (flag) {
case 3:
@@ -459,7 +456,7 @@ void RebuildSubGroup() *
* @return always 0
**/
-INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam)
+INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
{
const BYTE mItems = 3; // menuitems to create
BYTE item = 0;
diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp index eef460bcbc..d08b8ec07b 100644 --- a/plugins/UserInfoEx/src/psp_contact.cpp +++ b/plugins/UserInfoEx/src/psp_contact.cpp @@ -39,7 +39,6 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM CCtrlList *pCtrlList = CCtrlList::CreateObj(hDlg);
if (pCtrlList) {
TCHAR szAddr[MAX_PATH];
- MCONTACT hContact = lParam;
LPIDSTRLIST pList;
UINT nList;
@@ -186,7 +185,6 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM if (pCtrlList)
{
TCHAR szAddr[MAX_PATH];
- MCONTACT hContact = lParam;
LPIDSTRLIST pList;
UINT nList;
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 27df42185d..287b0bbdec 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -459,7 +459,7 @@ static INT_PTR CALLBACK DlgProc_AdvancedOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (!Settings.EnumSettings(NULL, "SkinIcons"))
for (int i = 0; i < Settings.getCount(); i++) {
LPSTR s = Settings[i];
- if (!mir_strnicmp(s, "UserInfoEx", 10))
+ if (mir_strnicmp(s, "UserInfoEx", 10) == 0)
db_unset(NULL, "SkinIcons", s);
}
@@ -1025,7 +1025,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR * @retval MIR_OK
**/
-static int OnInitOptions(WPARAM wParam, LPARAM lParam)
+static int OnInitOptions(WPARAM wParam, LPARAM)
{
DlgContactInfoInitTreeIcons();
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp index d359f18298..b20b4cbb4b 100644 --- a/plugins/UserInfoEx/src/psp_profile.cpp +++ b/plugins/UserInfoEx/src/psp_profile.cpp @@ -1372,7 +1372,7 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
{
- HFONT hoFont = (HFONT)SelectObject(cd->nmcd.hdc, pList->hFont);
+// HFONT hoFont = (HFONT)SelectObject(cd->nmcd.hdc, pList->hFont);
ListView_GetSubItemRect(cd->nmcd.hdr.hwndFrom, cd->nmcd.dwItemSpec, cd->iSubItem, LVIR_BOUNDS, &rc);
if (cd->iSubItem == 0) {
diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index 5b1ffd38a4..7f2c14d4ed 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -79,7 +79,7 @@ static LPSTR Get(MCONTACT hContact) static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam)
{
- int result;
+ int result = 0;
LPSTR val = NULL;
__try
@@ -124,7 +124,7 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam) * @param lParam - not used
**/
-static int OnCListApplyIcons(WPARAM wParam, LPARAM lParam)
+static int OnCListApplyIcons(WPARAM wParam, LPARAM)
{
LPSTR val = Get(wParam);
ExtraIcon_SetIconByName(ghExtraIconSvc, wParam, (val) ? ICO_BTN_EMAIL : 0);
@@ -161,7 +161,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb * @return always 0
**/
-static int OnPreBuildMenu(WPARAM wParam, LPARAM lParam)
+static int OnPreBuildMenu(WPARAM wParam, LPARAM)
{
LPSTR val = Get(wParam);
Menu_ShowItem(ghMenuItem, val != NULL);
diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index 1afc7c46ab..65deaddc1c 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -125,7 +125,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb * @return always 0
**/
-static int OnPreBuildMenu(WPARAM wParam, LPARAM lParam)
+static int OnPreBuildMenu(WPARAM wParam, LPARAM)
{
LPSTR val = Get(wParam);
Menu_ShowItem(ghMenuItem, val != 0);
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index 9d430eaf48..ad21ac36f9 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define HM_PROTOACK (WM_USER+100)
-typedef INT_PTR (*PUpdCallback) (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, PVOID UserData);
+typedef INT_PTR (*PUpdCallback) (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, void *UserData);
/***********************************************************************************************************
* class CUpdProgress
@@ -206,7 +206,7 @@ public: *
*
**/
- CUpdProgress(PVOID data)
+ CUpdProgress(void *data)
{
_hWnd = NULL;
_pFnCallBack = NULL;
@@ -276,7 +276,7 @@ public: *
*
**/
- CDlgUpdProgress(PVOID data)
+ CDlgUpdProgress(void *data)
: CUpdProgress(data)
{
}
@@ -393,7 +393,7 @@ public: *
*
**/
- CPopupUpdProgress(PVOID data)
+ CPopupUpdProgress(void *data)
: CUpdProgress(data)
{
_szText = NULL;
@@ -504,7 +504,7 @@ class CContactUpdater : public CContactQueue *
* @return This method returns 0.
**/
- static int DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, CContactUpdater* u)
+ static int DlgProc(HWND, UINT uMsg, WPARAM wParam, LPARAM, CContactUpdater* u)
{
switch (uMsg)
{
@@ -546,7 +546,7 @@ class CContactUpdater : public CContactQueue *
* @return nothing
**/
- int __cdecl OnProtoAck(WPARAM wParam, ACKDATA *ack)
+ int __cdecl OnProtoAck(WPARAM, ACKDATA *ack)
{
if (ack && ack->cbSize == sizeof(ACKDATA) && ack->hContact == _hContact && ack->type == ACKTYPE_GETINFO)
{
@@ -621,7 +621,7 @@ class CContactUpdater : public CContactQueue *
* @return nothing
**/
- virtual void Callback(MCONTACT hContact, PVOID param)
+ virtual void Callback(MCONTACT hContact, PVOID)
{
LPSTR pszProto = Proto_GetBaseAccountName(hContact);
@@ -777,7 +777,7 @@ static BOOL IsMirandaOnline() *
* @return This service function always returns 0.
**/
-static INT_PTR RefreshService(WPARAM wParam, LPARAM lParam)
+static INT_PTR RefreshService(WPARAM, LPARAM)
{
try
{
@@ -818,7 +818,7 @@ static INT_PTR RefreshService(WPARAM wParam, LPARAM lParam) *
*
**/
-static int OnContactAdded(WPARAM hContact, LPARAM lParam)
+static int OnContactAdded(WPARAM hContact, LPARAM)
{
try
{
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index b0b9f6e23d..f30b9ba1a4 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -372,7 +372,7 @@ static BYTE NotifyWithSound(const CEvent &evt) static BYTE CheckAnniversaries(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNotify)
{
int numAnniversaries = 0;
- int Diff;
+ int Diff = 0;
MAnnivDate mta;
CMString tszMsg;
|