From ee68ac82d5aabb596e8bd0f2b9286827ca2ce545 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 21:37:41 +0000 Subject: these conversions aren't needed either git-svn-id: http://svn.miranda-ng.org/main/trunk@8088 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdaway/awaymsg.cpp | 12 +++---- src/core/stdclist/src/clistopts.cpp | 2 +- src/core/stdemail/email.cpp | 12 +++---- src/core/stdfile/file.cpp | 14 ++++---- src/core/stdmsg/src/globals.cpp | 4 +-- src/core/stdmsg/src/msgdialog.cpp | 2 +- src/core/stdmsg/src/msgs.cpp | 30 ++++++++--------- src/core/stdmsg/src/statusicon.cpp | 2 +- src/core/stduihist/history.cpp | 6 ++-- src/core/stdurl/url.cpp | 10 +++--- src/core/stdurl/urldialogs.cpp | 2 +- src/core/stduserinfo/stdinfo.cpp | 6 ++-- src/core/stduserinfo/userinfo.cpp | 4 +-- src/core/stduseronline/useronline.cpp | 14 ++++---- src/modules/chat/clist.cpp | 8 ++--- src/modules/clist/clc.cpp | 48 ++++++++++++++-------------- src/modules/clist/clcmsgs.cpp | 4 +-- src/modules/clist/clistevents.cpp | 10 +++--- src/modules/clist/clistmenus.cpp | 2 +- src/modules/clist/clistmod.cpp | 8 ++--- src/modules/clist/clistsettings.cpp | 10 +++--- src/modules/clist/clui.cpp | 10 +++--- src/modules/clist/contact.cpp | 6 ++-- src/modules/clist/movetogroup.cpp | 2 +- src/modules/database/dbintf.cpp | 2 +- src/modules/extraicons/DefaultExtraIcons.cpp | 6 ++-- src/modules/extraicons/extraicons.cpp | 4 +-- src/modules/ignore/ignore.cpp | 10 +++--- src/modules/protocols/protoaccs.cpp | 6 ++-- src/modules/protocols/protochains.cpp | 10 +++--- src/modules/protocols/protocols.cpp | 12 +++---- src/modules/srmm/statusicon.cpp | 2 +- 32 files changed, 140 insertions(+), 140 deletions(-) (limited to 'src') diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index c7df74e5a8..e52709a35f 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.cpp @@ -46,7 +46,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP dat = (AwayMsgDlgData*)mir_alloc(sizeof(AwayMsgDlgData)); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat); - dat->hContact = (MCONTACT)lParam; + dat->hContact = lParam; dat->hAwayMsgEvent = HookEventMessage(ME_PROTO_ACK, hwndDlg, HM_AWAYMSG); dat->hSeq = (HANDLE)CallContactService(dat->hContact, PSS_GETAWAYMSG, 0, 0); WindowList_Add(hWindowList, hwndDlg, dat->hContact); @@ -77,7 +77,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP ack.result = ACKRESULT_SUCCESS; SendMessage(hwndDlg, HM_AWAYMSG, 0, (LPARAM)&ack); } - Utils_RestoreWindowPosition(hwndDlg, (MCONTACT)lParam, "SRAway", "AwayMsgDlg"); + Utils_RestoreWindowPosition(hwndDlg, lParam, "SRAway", "AwayMsgDlg"); return TRUE; case HM_AWAYMSG: @@ -123,7 +123,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM) { HWND hwnd; - if (hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam)) { + if (hwnd = WindowList_Find(hWindowList, wParam)) { SetForegroundWindow(hwnd); SetFocus(hwnd); } @@ -134,15 +134,15 @@ static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM) static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM) { TCHAR str[128]; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_TCHAR; if (szProto != NULL) { - int chatRoom = szProto ? db_get_b((MCONTACT)wParam, szProto, "ChatRoom", 0) : 0; + int chatRoom = szProto ? db_get_b(wParam, szProto, "ChatRoom", 0) : 0; if ( !chatRoom) { - int status = db_get_w((MCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE); + int status = db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE); mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(status, 0)); mi.ptszName = str; if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) { diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index ee90165e6c..65a3b8cb61 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -28,7 +28,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP switch (msg) { case WM_USER + 1: { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *) lParam; if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL && lstrcmpiA(ws->szModule, "CList") == 0 && lstrcmpiA(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg)) diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 9c8f1eeafe..9cd254783d 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -35,9 +35,9 @@ void SendEmailThread(void *szUrl) static INT_PTR SendEMailCommand(WPARAM wParam, LPARAM lParam) { DBVARIANT dbv; - char *szProto = GetContactProto((MCONTACT)wParam); - if (szProto == NULL || db_get_s((MCONTACT)wParam, szProto, "e-mail", &dbv)) { - if (db_get_s((MCONTACT)wParam, "UserInfo", "Mye-mail0", &dbv)) { + char *szProto = GetContactProto(wParam); + if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv)) { + if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv)) { MessageBox((HWND)lParam, TranslateT("User has not registered an e-mail address"), TranslateT("Send e-mail"), MB_OK); return 1; } @@ -54,9 +54,9 @@ static int EMailPreBuildMenu(WPARAM wParam, LPARAM) { bool bEnabled = true; DBVARIANT dbv = { 0 }; - char *szProto = GetContactProto((MCONTACT)wParam); - if (szProto == NULL || db_get_s((MCONTACT)wParam, szProto, "e-mail", &dbv)) - if (db_get_s((MCONTACT)wParam, "UserInfo", "Mye-mail0", &dbv)) + char *szProto = GetContactProto(wParam); + if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv)) + if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv)) bEnabled = false; Menu_ShowItem(hEMailMenuItem, bEnabled); diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index 9bc353b73d..19dcf2f27c 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.cpp @@ -62,7 +62,7 @@ TCHAR *GetContactID(MCONTACT hContact) static INT_PTR SendFileCommand(WPARAM wParam, LPARAM) { struct FileSendData fsd; - fsd.hContact = (MCONTACT)wParam; + fsd.hContact = wParam; fsd.ppFiles = NULL; CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILESEND), NULL, DlgProcSendFile, (LPARAM)&fsd); return 0; @@ -71,7 +71,7 @@ static INT_PTR SendFileCommand(WPARAM wParam, LPARAM) static INT_PTR SendSpecificFiles(WPARAM wParam, LPARAM lParam) { FileSendData fsd; - fsd.hContact = (MCONTACT)wParam; + fsd.hContact = wParam; char** ppFiles = (char**)lParam; int count = 0; @@ -92,7 +92,7 @@ static INT_PTR SendSpecificFiles(WPARAM wParam, LPARAM lParam) static INT_PTR SendSpecificFilesT(WPARAM wParam, LPARAM lParam) { FileSendData fsd; - fsd.hContact = (MCONTACT)wParam; + fsd.hContact = wParam; fsd.ppFiles = (const TCHAR**)lParam; CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILESEND), NULL, DlgProcSendFile, (LPARAM)&fsd); return 0; @@ -101,7 +101,7 @@ static INT_PTR SendSpecificFilesT(WPARAM wParam, LPARAM lParam) static INT_PTR GetReceivedFilesFolder(WPARAM wParam, LPARAM lParam) { TCHAR buf[MAX_PATH]; - GetContactReceivedFilesDir((MCONTACT)wParam, buf, MAX_PATH, TRUE); + GetContactReceivedFilesDir(wParam, buf, MAX_PATH, TRUE); char* dir = mir_t2a(buf); lstrcpynA((char*)lParam, dir, MAX_PATH); mir_free(dir); @@ -148,7 +148,7 @@ static int FileEventAdded(WPARAM wParam, LPARAM lParam) if (dbei.flags & (DBEF_SENT|DBEF_READ) || dbei.eventType != EVENTTYPE_FILE || dwSignature == 0) return 0; - PushFileEvent((MCONTACT)wParam, (HANDLE)lParam, 0); + PushFileEvent(wParam, (HANDLE)lParam, 0); return 0; } @@ -303,12 +303,12 @@ static void RemoveUnreadFileEvents(void) static int SRFilePreBuildMenu(WPARAM wParam, LPARAM) { bool bEnabled = false; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto != NULL) { if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND) { if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_OFFLINEFILES) bEnabled = true; - else if (db_get_w((MCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) + else if (db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) bEnabled = true; } } diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 71af89163b..fb90ce71ff 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -121,7 +121,7 @@ void ReloadGlobals() static int dbaddedevent(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact); if (h) @@ -144,7 +144,7 @@ static int ackevent(WPARAM wParam, LPARAM lParam) int AvatarChanged(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact); if (h) SendMessage(h, HM_AVATARACK, wParam, lParam); return 0; diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 23a16cc783..7c84d5239e 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1308,7 +1308,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case HM_DBEVENTADDED: - if ((MCONTACT)wParam == dat->hContact) { + if (wParam == dat->hContact) { HANDLE hDbEvent = (HANDLE)lParam; if (dat->hDbEventFirst == NULL) dat->hDbEventFirst = hDbEvent; diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index c448ec70f5..83312cb914 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -59,7 +59,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1); /* does a window for the contact exist? */ - HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam); if (hwnd) { if (!db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS)) { ShowWindow(hwnd, SW_RESTORE); @@ -78,10 +78,10 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) /* new message */ SkinPlaySound("AlertMsg"); - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) { NewMessageWindowLParam newData = { 0 }; - newData.hContact = (MCONTACT)wParam; + newData.hContact = wParam; newData.noActivate = db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS); CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSG), NULL, DlgProcMessage, (LPARAM)&newData); return 0; @@ -89,12 +89,12 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) TCHAR toolTip[256], *contactName; CLISTEVENT cle = { sizeof(cle) }; - cle.hContact = (MCONTACT)wParam; + cle.hContact = wParam; cle.hDbEvent = (HANDLE)lParam; cle.flags = CLEF_TCHAR; cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); cle.pszService = "SRMsg/ReadMessage"; - contactName = pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0); + contactName = pcli->pfnGetContactDisplayName(wParam, 0); mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), contactName); cle.ptszTooltip = toolTip; CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle); @@ -135,12 +135,12 @@ INT_PTR SendMessageCmd(MCONTACT hContact, char* msg, int isWchar) static INT_PTR SendMessageCommand_W(WPARAM wParam, LPARAM lParam) { - return SendMessageCmd((MCONTACT)wParam, (char*)lParam, TRUE); + return SendMessageCmd(wParam, (char*)lParam, TRUE); } static INT_PTR SendMessageCommand(WPARAM wParam, LPARAM lParam) { - return SendMessageCmd((MCONTACT)wParam, (char*)lParam, FALSE); + return SendMessageCmd(wParam, (char*)lParam, FALSE); } static INT_PTR ReadMessageCommand(WPARAM wParam, LPARAM lParam) @@ -159,12 +159,12 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam) SkinPlaySound((lParam) ? "TNStart" : "TNStop"); - HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam); if (hwnd) SendMessage(hwnd, DM_TYPING, 0, lParam); else if (lParam && (g_dat.flags & SMF_SHOWTYPINGTRAY)) { TCHAR szTip[256]; - mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0)); + mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(wParam, 0)); if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY) && !(g_dat.flags&SMF_SHOWTYPINGCLIST)) { MIRANDASYSTRAYNOTIFY tn = { sizeof(tn) }; @@ -177,7 +177,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam) } else { CLISTEVENT cle = { sizeof(cle) }; - cle.hContact = (MCONTACT)wParam; + cle.hContact = wParam; cle.hDbEvent = (HANDLE)1; cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR; cle.hIcon = LoadSkinnedIcon( SKINICON_OTHER_TYPING ); @@ -194,7 +194,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam) static int MessageSettingChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam; - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (cws->szModule == NULL) return 0; @@ -204,7 +204,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam) if (cws->szSetting && !strcmp(cws->szSetting, "Timezone")) WindowList_Broadcast(g_dat.hMessageWindowList, DM_NEWTIMEZONE, (WPARAM) cws, 0); else { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto && !strcmp(cws->szModule, szProto)) WindowList_Broadcast(g_dat.hMessageWindowList, DM_UPDATETITLE, (WPARAM) cws, 0); } @@ -215,7 +215,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam) static int ContactDeleted(WPARAM wParam, LPARAM lParam) { HWND hwnd; - if (hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam)) + if (hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam)) SendMessage(hwnd, WM_CLOSE, 0, 0); return 0; @@ -315,7 +315,7 @@ static int IconsChanged(WPARAM, LPARAM) static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { bool bEnabled = false; char *szProto = GetContactProto(hContact); @@ -346,7 +346,7 @@ static INT_PTR GetWindowClass(WPARAM wParam, LPARAM lParam) static INT_PTR SetStatusText(WPARAM wParam, LPARAM lParam) { - HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam); if (hwnd == NULL) return 1; diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index e969085c22..bd813201cf 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -26,7 +26,7 @@ HANDLE hHookIconPressedEvt; static int OnSrmmIconChanged(WPARAM wParam, LPARAM) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) WindowList_Broadcast(g_dat.hMessageWindowList, DM_STATUSICONCHANGE, 0, 0); else { diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp index 6f88f3200d..13c08b692a 100644 --- a/src/core/stduihist/history.cpp +++ b/src/core/stduihist/history.cpp @@ -206,7 +206,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam); - hContact = (MCONTACT)lParam; + hContact = lParam; WindowList_Add(hWindowList, hwndDlg, hContact); Utils_RestoreWindowPosition(hwndDlg, hContact, "History", ""); { @@ -376,7 +376,7 @@ static INT_PTR CALLBACK DlgProcHistoryFind(HWND hwndDlg, UINT msg, WPARAM wParam static INT_PTR UserHistoryCommand(WPARAM wParam, LPARAM) { - HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(hWindowList, wParam); if (hwnd) { SetForegroundWindow(hwnd); SetFocus(hwnd); @@ -388,7 +388,7 @@ static INT_PTR UserHistoryCommand(WPARAM wParam, LPARAM) static int HistoryContactDelete(WPARAM wParam, LPARAM) { - HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(hWindowList, wParam); if (hwnd != NULL) DestroyWindow(hwnd); return 0; diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index 4fbd2bbf6c..5473c6a596 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -49,11 +49,11 @@ static int UrlEventAdded(WPARAM wParam, LPARAM lParam) SkinPlaySound("RecvUrl"); TCHAR szTooltip[256]; - mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0)); + mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName(wParam, 0)); CLISTEVENT cle = { sizeof(cle) }; cle.flags = CLEF_TCHAR; - cle.hContact = (MCONTACT)wParam; + cle.hContact = wParam; cle.hDbEvent = (HANDLE)lParam; cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL); cle.pszService = "SRUrl/ReadUrl"; @@ -97,7 +97,7 @@ static void RestoreUnreadUrlAlerts(void) static int ContactSettingChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (lstrcmpA(cws->szModule, "CList") && (szProto == NULL || lstrcmpA(cws->szModule, szProto))) return 0; @@ -108,7 +108,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam) static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM) { bool bEnabled = false; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto != NULL) if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND) bEnabled = true; @@ -147,7 +147,7 @@ static int SRUrlShutdown(WPARAM, LPARAM) int UrlContactDeleted(WPARAM wParam, LPARAM) { - HWND h = WindowList_Find(hUrlWindowList, (MCONTACT)wParam); + HWND h = WindowList_Find(hUrlWindowList, wParam); if (h) SendMessage(h, WM_CLOSE, 0, 0); diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index c541825d9f..89ea13b76b 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -467,7 +467,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_LIMITTEXT, 450, 0); dat = (struct UrlSendData*)mir_alloc(sizeof(struct UrlSendData)); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat); - dat->hContact = (MCONTACT)lParam; + dat->hContact = lParam; dat->hAckEvent = NULL; dat->hSendId = NULL; dat->sendBuffer = NULL; diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index 4e65815d98..218d58a0ca 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.cpp @@ -244,7 +244,7 @@ static INT_PTR CALLBACK LocationDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L TranslateDialogDefault(hwndDlg); SetTimer(hwndDlg, 1, 1000, NULL); - tmi.prepareList((MCONTACT)lParam, GetDlgItem(hwndDlg, IDC_TIMEZONESELECT), TZF_PLF_CB); + tmi.prepareList(lParam, GetDlgItem(hwndDlg, IDC_TIMEZONESELECT), TZF_PLF_CB); SendMessage(hwndDlg, WM_TIMER, 0, 0); break; @@ -522,7 +522,7 @@ static INT_PTR CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR hFont = CreateFontIndirect(&lf); SendDlgItemMessage(hwndDlg, IDC_ABOUT, WM_SETFONT, (WPARAM) hFont, MAKELPARAM(TRUE, 0)); - if (!db_get_s((MCONTACT)lParam, "UserInfo", "MyNotes", &dbv)) { + if (!db_get_s(lParam, "UserInfo", "MyNotes", &dbv)) { SetDlgItemTextA(hwndDlg, IDC_MYNOTES, dbv.pszVal); db_free(&dbv); } @@ -579,7 +579,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam) if (lParam == NULL) return 0; - if (GetContactProto((MCONTACT)lParam) == 0) + if (GetContactProto(lParam) == 0) return 0; OPTIONSDIALOGPAGE odp = { sizeof(odp) }; diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index 61248a0751..04b3353627 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.cpp @@ -95,7 +95,7 @@ static int PageSortProc(OPTIONSDIALOGPAGE *item1, OPTIONSDIALOGPAGE *item2) static INT_PTR ShowDetailsDialogCommand(WPARAM wParam, LPARAM) { HWND hwnd; - if (hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam)) { + if (hwnd = WindowList_Find(hWindowList, wParam)) { SetForegroundWindow(hwnd); SetFocus(hwnd); return 0; @@ -222,7 +222,7 @@ static void CreateDetailsPageWindow(HWND hwndDlg, DetailsData *dat, DetailsPageD static int UserInfoContactDelete(WPARAM wParam, LPARAM) { - HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam); + HWND hwnd = WindowList_Find(hWindowList, wParam); if (hwnd != NULL) DestroyWindow(hwnd); return 0; diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp index 188999dcfe..1093f380db 100644 --- a/src/core/stduseronline/useronline.cpp +++ b/src/core/stduseronline/useronline.cpp @@ -38,17 +38,17 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) return 0; int newStatus = cws->value.wVal; - int oldStatus = db_get_w((MCONTACT)wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); - db_set_w((MCONTACT)wParam, "UserOnline", "OldStatus", (WORD)newStatus); + int oldStatus = db_get_w(wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); + db_set_w(wParam, "UserOnline", "OldStatus", (WORD)newStatus); if (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE)) return 0; - if (db_get_b((MCONTACT)wParam, "CList", "Hidden", 0)) return 0; + if (db_get_b(wParam, "CList", "Hidden", 0)) return 0; if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) { // Remove the event from the queue if it exists since they are now offline - int lastEvent = (int)db_get_dw((MCONTACT)wParam, "UserOnline", "LastEvent", 0); + int lastEvent = (int)db_get_dw(wParam, "UserOnline", "LastEvent", 0); if (lastEvent) { CallService(MS_CLIST_REMOVEEVENT, wParam, (LPARAM)lastEvent); - db_set_dw((MCONTACT)wParam, "UserOnline", "LastEvent", 0); + db_set_dw(wParam, "UserOnline", "LastEvent", 0); } } if ((newStatus == ID_STATUS_ONLINE || newStatus == ID_STATUS_FREECHAT) && @@ -63,11 +63,11 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) ZeroMemory(&cle, sizeof(cle)); cle.cbSize = sizeof(cle); cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR; - cle.hContact = (MCONTACT)wParam; + cle.hContact = wParam; cle.hDbEvent = (HANDLE)(uniqueEventId++); cle.hIcon = LoadSkinIcon(SKINICON_OTHER_USERONLINE, false); cle.pszService = "UserOnline/Description"; - mir_sntprintf(tooltip, SIZEOF(tooltip), TranslateT("%s is online"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0)); + mir_sntprintf(tooltip, SIZEOF(tooltip), TranslateT("%s is online"), pcli->pfnGetContactDisplayName(wParam, 0)); cle.ptszTooltip = tooltip; CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle); IcoLib_ReleaseIcon(cle.hIcon, 0); diff --git a/src/modules/chat/clist.cpp b/src/modules/chat/clist.cpp index 5f47aa4c4b..1400bc8d07 100644 --- a/src/modules/chat/clist.cpp +++ b/src/modules/chat/clist.cpp @@ -103,7 +103,7 @@ BOOL SetAllOffline(BOOL bHide, const char *pszModule) int RoomDoubleclicked(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (!hContact) return 0; @@ -141,7 +141,7 @@ INT_PTR EventDoubleclicked(WPARAM wParam,LPARAM lParam) INT_PTR JoinChat(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { char *szProto = GetContactProto(hContact); if (szProto) { @@ -157,7 +157,7 @@ INT_PTR JoinChat(WPARAM wParam, LPARAM lParam) INT_PTR LeaveChat(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { char *szProto = GetContactProto(hContact); if (szProto) @@ -168,7 +168,7 @@ INT_PTR LeaveChat(WPARAM wParam, LPARAM lParam) int PrebuildContactMenu(WPARAM wParam, LPARAM) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) return 0; diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index b2f3bad3fb..1064255630 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -78,7 +78,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam) if (!strcmp(cws->szModule, "CList")) { if (!strcmp(cws->szSetting, "MyHandle")) { - cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)wParam); + cli.pfnInvalidateDisplayNameCacheEntry(wParam); cli.pfnClcBroadcast(INTM_NAMECHANGED, wParam, lParam); } else if (!strcmp(cws->szSetting, "Group")) @@ -93,7 +93,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam) cli.pfnClcBroadcast(INTM_NAMEORDERCHANGED, 0, 0); } else { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto != NULL) { if (!strcmp(cws->szModule, "Protocol") && !strcmp(cws->szSetting, "p")) cli.pfnClcBroadcast(INTM_PROTOCHANGED, wParam, lParam); @@ -443,13 +443,13 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, break; case INTM_CONTACTADDED: - cli.pfnAddContactToTree(hwnd, dat, (MCONTACT)wParam, 1, 1); - cli.pfnNotifyNewContact(hwnd, (MCONTACT)wParam); + cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); + cli.pfnNotifyNewContact(hwnd, wParam); SortClcByTimer(hwnd); break; case INTM_CONTACTDELETED: - cli.pfnDeleteItemFromTree(hwnd, (MCONTACT)wParam); + cli.pfnDeleteItemFromTree(hwnd, wParam); SortClcByTimer(hwnd); break; @@ -461,10 +461,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0) { if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, NULL, NULL, NULL)) break; - cli.pfnAddContactToTree(hwnd, dat, (MCONTACT)wParam, 1, 1); - cli.pfnNotifyNewContact(hwnd, (MCONTACT)wParam); + cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); + cli.pfnNotifyNewContact(hwnd, wParam); } - else cli.pfnDeleteItemFromTree(hwnd, (MCONTACT)wParam); + else cli.pfnDeleteItemFromTree(hwnd, wParam); dat->needsResort = 1; SortClcByTimer(hwnd); @@ -481,10 +481,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage)); flags = contact->flags; } - cli.pfnDeleteItemFromTree(hwnd, (MCONTACT)wParam); - if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b((MCONTACT)wParam, "CList", "Hidden", 0)) { + cli.pfnDeleteItemFromTree(hwnd, wParam); + if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) { NMCLISTCONTROL nm; - cli.pfnAddContactToTree(hwnd, dat, (MCONTACT)wParam, 1, 1); + cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) { memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage)); if (flags & CONTACTF_CHECKED) @@ -509,15 +509,15 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, MCONTACT hSelItem = NULL; ClcContact *selcontact = NULL; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto == NULL) status = ID_STATUS_OFFLINE; else - status = db_get_w((MCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE); + status = db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE); // this means an offline msg is flashing, so the contact should be shown DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); - shouldShow = (style & CLS_SHOWHIDDEN || !db_get_b((MCONTACT)wParam, "CList", "Hidden", 0)) + shouldShow = (style & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) && (!cli.pfnIsHiddenMode(dat, status) || CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != lParam); contact = NULL; @@ -526,12 +526,12 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) { if (dat->selection >= 0 && cli.pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1) hSelItem = (MCONTACT)cli.pfnContactToHItem(selcontact); - cli.pfnAddContactToTree(hwnd, dat, (MCONTACT)wParam, (style & CLS_CONTACTLIST) == 0, 0); + cli.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0); recalcScrollBar = 1; cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL); if (contact) { contact->iImage = (WORD) lParam; - cli.pfnNotifyNewContact(hwnd, (MCONTACT)wParam); + cli.pfnNotifyNewContact(hwnd, wParam); dat->needsResort = 1; } } @@ -569,7 +569,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) break; - lstrcpyn(contact->szText, cli.pfnGetContactDisplayName((MCONTACT)wParam, 0), SIZEOF(contact->szText)); + lstrcpyn(contact->szText, cli.pfnGetContactDisplayName(wParam, 0), SIZEOF(contact->szText)); dat->needsResort = 1; SortClcByTimer(hwnd); break; @@ -578,9 +578,9 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) break; - contact->proto = GetContactProto((MCONTACT)wParam); - cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)wParam); - lstrcpyn(contact->szText, cli.pfnGetContactDisplayName((MCONTACT)wParam, 0), SIZEOF(contact->szText)); + contact->proto = GetContactProto(wParam); + cli.pfnInvalidateDisplayNameCacheEntry(wParam); + lstrcpyn(contact->szText, cli.pfnGetContactDisplayName(wParam, 0), SIZEOF(contact->szText)); SortClcByTimer(hwnd); break; @@ -604,11 +604,11 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, case INTM_APPARENTMODECHANGED: if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto == NULL) break; - WORD apparentMode = db_get_w((MCONTACT)wParam, szProto, "ApparentMode", 0); + WORD apparentMode = db_get_w(wParam, szProto, "ApparentMode", 0); contact->flags &= ~(CONTACTF_INVISTO | CONTACTF_VISTO); if (apparentMode == ID_STATUS_OFFLINE) contact->flags |= CONTACTF_INVISTO; @@ -626,11 +626,11 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, case INTM_IDLECHANGED: if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto == NULL) break; contact->flags &= ~CONTACTF_IDLE; - if (db_get_dw((MCONTACT)wParam, szProto, "IdleTS", 0)) + if (db_get_dw(wParam, szProto, "IdleTS", 0)) contact->flags |= CONTACTF_IDLE; cli.pfnInvalidateRect(hwnd, NULL, FALSE); diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp index 2f839b934d..3b4e038170 100644 --- a/src/modules/clist/clcmsgs.cpp +++ b/src/modules/clist/clcmsgs.cpp @@ -31,7 +31,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR { switch (msg) { case CLM_ADDCONTACT: - cli.pfnAddContactToTree(hwnd, dat, (MCONTACT)wParam, 1, 0); + cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 0); cli.pfnRecalcScrollBar(hwnd, dat); cli.pfnSortCLC(hwnd, dat, 1); break; @@ -79,7 +79,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR break; case CLM_DELETEITEM: - cli.pfnDeleteItemFromTree(hwnd, (MCONTACT)wParam); + cli.pfnDeleteItemFromTree(hwnd, wParam); cli.pfnSortCLC(hwnd, dat, 1); cli.pfnRecalcScrollBar(hwnd, dat); break; diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp index 6a99a46180..afea5bcfc7 100644 --- a/src/modules/clist/clistevents.cpp +++ b/src/modules/clist/clistevents.cpp @@ -370,8 +370,8 @@ static int RemoveEventsForContact(WPARAM wParam, LPARAM) for (; cli.events.count > 0;) { for (hit = 0, j = 0; j < cli.events.count; j++) { - if (cli.events.items[j]->cle.hContact == (MCONTACT)wParam) { - cli.pfnRemoveEvent((MCONTACT)wParam, cli.events.items[j]->cle.hDbEvent); + if (cli.events.items[j]->cle.hContact == wParam) { + cli.pfnRemoveEvent(wParam, cli.events.items[j]->cle.hDbEvent); hit = 1; } } @@ -384,7 +384,7 @@ static int RemoveEventsForContact(WPARAM wParam, LPARAM) static int CListEventSettingsChanged(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; if (hContact == NULL && cws && cws->szModule && cws->szSetting && strcmp(cws->szModule, "CList") == 0) { if (strcmp(cws->szSetting, "DisableTrayFlash") == 0) @@ -399,8 +399,8 @@ static int CListEventSettingsChanged(WPARAM wParam, LPARAM lParam) INT_PTR AddEventSyncStub(WPARAM wParam, LPARAM lParam) { return CallServiceSync(MS_CLIST_ADDEVENT"_SYNC", wParam, lParam); } INT_PTR AddEventStub(WPARAM, LPARAM lParam) { return cli.pfnAddEvent((CLISTEVENT*)lParam) == NULL; } -INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent((MCONTACT)wParam, (HANDLE)lParam); } -INT_PTR GetEventStub(WPARAM wParam, LPARAM lParam) { return (INT_PTR)cli.pfnGetEvent((MCONTACT)wParam, (int)lParam); } +INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent(wParam, (HANDLE)lParam); } +INT_PTR GetEventStub(WPARAM wParam, LPARAM lParam) { return (INT_PTR)cli.pfnGetEvent(wParam, (int)lParam); } int InitCListEvents(void) { diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index 1adf39e438..dd5b278f86 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -320,7 +320,7 @@ static INT_PTR AddContactMenuItem(WPARAM, LPARAM lParam) static INT_PTR BuildContactMenu(WPARAM wParam, LPARAM) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; NotifyEventHooks(hPreBuildContactMenuEvent, (WPARAM)hContact, 0); char *szProto = GetContactProto(hContact); diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index 28f011e93c..2f845d065e 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -185,7 +185,7 @@ int fnGetContactIcon(MCONTACT hContact) static INT_PTR GetContactIcon(WPARAM wParam, LPARAM) { - return cli.pfnGetContactIcon((MCONTACT)wParam); + return cli.pfnGetContactIcon(wParam); } static void AddProtoIconIndex(PROTOACCOUNT* pa) @@ -245,7 +245,7 @@ static int ContactListAccountsChanged(WPARAM eventCode, LPARAM lParam) static INT_PTR ContactDoubleClicked(WPARAM wParam, LPARAM) { // Try to process event myself - if (cli.pfnEventsProcessContactDoubleClick((MCONTACT)wParam) == 0) + if (cli.pfnEventsProcessContactDoubleClick(wParam) == 0) return 0; // Allow third-party plugins to process a dblclick @@ -253,7 +253,7 @@ static INT_PTR ContactDoubleClicked(WPARAM wParam, LPARAM) return 0; // Otherwise try to execute the default action - TryProcessDoubleClick((MCONTACT)wParam); + TryProcessDoubleClick(wParam); return 0; } @@ -425,7 +425,7 @@ extern int sortByStatus, sortByProto; static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam) { - MCONTACT a = (MCONTACT)wParam, b = (MCONTACT)lParam; + MCONTACT a = wParam, b = lParam; TCHAR namea[128], *nameb; int statusa, statusb; char *szProto1, *szProto2; diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp index 90930e092a..81dc9c3008 100644 --- a/src/modules/clist/clistsettings.cpp +++ b/src/modules/clist/clistsettings.cpp @@ -160,7 +160,7 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam) { static char retVal[200]; ClcCacheEntry *cacheEntry = NULL; - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (lParam & GCDNF_UNICODE) return (INT_PTR)cli.pfnGetContactDisplayName(hContact, lParam & ~GCDNF_UNICODE); @@ -209,13 +209,13 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam) INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM) { - cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)wParam); + cli.pfnInvalidateDisplayNameCacheEntry(wParam); return 0; } int ContactAdded(WPARAM wParam, LPARAM) { - cli.pfnChangeContactIcon((MCONTACT)wParam, cli.pfnIconFromStatusMode(GetContactProto((MCONTACT)wParam), ID_STATUS_OFFLINE, NULL), 1); + cli.pfnChangeContactIcon(wParam, cli.pfnIconFromStatusMode(GetContactProto(wParam), ID_STATUS_OFFLINE, NULL), 1); cli.pfnSortContacts(); return 0; } @@ -230,7 +230,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam; DBVARIANT dbv; - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; // Early exit if (hContact == NULL) @@ -270,7 +270,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) if (!strcmp(cws->szModule, "CList")) { if (!strcmp(cws->szSetting, "Hidden")) { if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 1); } else diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index a5d760cfad..4242f183c8 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -134,7 +134,7 @@ static INT_PTR CALLBACK AskForConfirmationDlgProc(HWND hWnd, UINT msg, WPARAM wP TCHAR szFinal[256]; GetDlgItemText(hWnd, IDC_TOPLINE, szFormat, SIZEOF(szFormat)); - mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((MCONTACT)lParam, 0)); + mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName(lParam, 0)); SetDlgItemText(hWnd, IDC_TOPLINE, szFinal); } SetFocus( GetDlgItem(hWnd, IDNO)); @@ -185,7 +185,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) // Delete contact case IDYES: { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (szProto != NULL) { // Check if protocol uses server side lists DWORD caps; @@ -197,7 +197,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) status = CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0); if (status == ID_STATUS_OFFLINE || (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) { // Set a flag so we remember to delete the contact when the protocol goes online the next time - db_set_b((MCONTACT)wParam, "CList", "Delete", 1); + db_set_b(wParam, "CList", "Delete", 1); MessageBox(NULL, TranslateT("This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network."), TranslateT("Delete contact"), MB_ICONINFORMATION | MB_OK); @@ -212,7 +212,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) // Archive contact case IDC_HIDE: - db_set_b((MCONTACT)wParam, "CList", "Hidden", 1); + db_set_b(wParam, "CList", "Hidden", 1); break; } @@ -222,7 +222,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) static INT_PTR MenuItem_AddContactToList(WPARAM wParam, LPARAM) { ADDCONTACTSTRUCT acs = { 0 }; - acs.hContact = (MCONTACT)wParam; + acs.hContact = wParam; acs.handleType = HANDLE_CONTACT; acs.szProto = ""; CallService(MS_ADDCONTACT_SHOW, NULL, (LPARAM)&acs); diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index be856535aa..7931c1d7d1 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -144,13 +144,13 @@ INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam) CallService(MS_CLUI_CONTACTDELETED, wParam, 0); if ((HANDLE) lParam == NULL) - db_unset((MCONTACT)wParam, "CList", "Group"); + db_unset(wParam, "CList", "Group"); else { grpChg.pszNewName = cli.pfnGetGroupName(lParam, NULL); - db_set_ts((MCONTACT)wParam, "CList", "Group", grpChg.pszNewName); + db_set_ts(wParam, "CList", "Group", grpChg.pszNewName); } CallService(MS_CLUI_CONTACTADDED, wParam, - cli.pfnIconFromStatusMode(GetContactProto((MCONTACT)wParam), GetContactStatus((MCONTACT)wParam), (MCONTACT)wParam)); + cli.pfnIconFromStatusMode(GetContactProto(wParam), GetContactStatus(wParam), wParam)); NotifyEventHooks(hGroupChangeEvent, wParam, (LPARAM)&grpChg); return 0; diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index 3193dc6a20..2680c7e218 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -101,7 +101,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)lphGroupsItems[i], 0); lphGroupsItems.destroy(); - ptrT szContactGroup(db_get_tsa((MCONTACT)wParam, "CList", "Group")); + ptrT szContactGroup(db_get_tsa(wParam, "CList", "Group")); int pos = 1000; diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index 46719debed..322355f2c4 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -48,7 +48,7 @@ static INT_PTR srvGetContactCount(WPARAM, LPARAM) static INT_PTR srvDeleteContact(WPARAM wParam, LPARAM) { DBVARIANT dbv = {0}; - if (!db_get_ts((MCONTACT)wParam, "ContactPhoto", "File", &dbv)) { + if (!db_get_ts(wParam, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); db_free(&dbv); } diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp index 7b03c16c96..a47ce5e7a9 100644 --- a/src/modules/extraicons/DefaultExtraIcons.cpp +++ b/src/modules/extraicons/DefaultExtraIcons.cpp @@ -161,7 +161,7 @@ static void SetExtraIcons(MCONTACT hContact) static int SettingChanged(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) return 0; @@ -209,7 +209,7 @@ static int DefaultOnClick(WPARAM wParam, LPARAM lParam, LPARAM param) if (p == NULL) return 0; - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) return 0; @@ -279,7 +279,7 @@ static ProtoInfo* FindProto(const char *proto) static int ProtocolApplyIcon(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; char *proto = GetContactProto(hContact); if (IsEmpty(proto)) return 0; diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 8cb0acadac..7fae900021 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -248,7 +248,7 @@ int ClistExtraListRebuild(WPARAM wParam, LPARAM lParam) int ClistExtraImageApply(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) return 0; @@ -262,7 +262,7 @@ int ClistExtraImageApply(WPARAM wParam, LPARAM lParam) int ClistExtraClick(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) return 0; diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index f50384ae6a..75f79fbd57 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -338,7 +338,7 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM) static INT_PTR IsIgnored(WPARAM wParam, LPARAM lParam) { - DWORD mask = GetMask((MCONTACT)wParam); + DWORD mask = GetMask(wParam); if (lParam < 1 || lParam > IGNOREEVENT_MAX) return 1; return (mask >> (lParam-1))&1; @@ -346,20 +346,20 @@ static INT_PTR IsIgnored(WPARAM wParam, LPARAM lParam) static INT_PTR Ignore(WPARAM wParam, LPARAM lParam) { - DWORD mask = GetMask((MCONTACT)wParam); + DWORD mask = GetMask(wParam); if ((lParam < 1 || lParam > IGNOREEVENT_MAX) && lParam != IGNOREEVENT_ALL) return 1; if (lParam == IGNOREEVENT_ALL) mask = (1 << IGNOREEVENT_MAX)-1; else mask |= 1 << (lParam-1); - db_set_dw((MCONTACT)wParam, "Ignore", "Mask1", mask); + db_set_dw(wParam, "Ignore", "Mask1", mask); return 0; } static INT_PTR Unignore(WPARAM wParam, LPARAM lParam) { - DWORD mask = GetMask((MCONTACT)wParam); + DWORD mask = GetMask(wParam); if ((lParam < 1 || lParam > IGNOREEVENT_MAX) && lParam != IGNOREEVENT_ALL) return 1; @@ -367,7 +367,7 @@ static INT_PTR Unignore(WPARAM wParam, LPARAM lParam) mask = 0; else mask &= ~(1 << (lParam-1)); - db_set_dw((MCONTACT)wParam, "Ignore", "Mask1", mask); + db_set_dw(wParam, "Ignore", "Mask1", mask); return 0; } diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp index 2a0e2c4699..94a96366e4 100644 --- a/src/modules/protocols/protoaccs.cpp +++ b/src/modules/protocols/protoaccs.cpp @@ -199,7 +199,7 @@ void WriteDbAccounts() ///////////////////////////////////////////////////////////////////////////////////////// static int OnContactDeleted(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { PROTOACCOUNT* pa = Proto_GetAccount(hContact); if (Proto_IsAccountEnabled(pa) && pa->ppro) @@ -210,7 +210,7 @@ static int OnContactDeleted(WPARAM wParam, LPARAM lParam) static int OnDbSettingsChanged(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact) { PROTOACCOUNT* pa = Proto_GetAccount(hContact); if (Proto_IsAccountEnabled(pa) && pa->ppro) @@ -317,7 +317,7 @@ static INT_PTR stub11(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam) static INT_PTR stub12(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam) { - return (INT_PTR)ppi->GetCaps(wParam, (MCONTACT)lParam); + return (INT_PTR)ppi->GetCaps(wParam, lParam); } static INT_PTR stub13(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM) diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp index bf13ecd7d1..16bf1cb4db 100644 --- a/src/modules/protocols/protochains.cpp +++ b/src/modules/protocols/protochains.cpp @@ -175,13 +175,13 @@ PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact) static INT_PTR Proto_GetContactBaseProto(WPARAM wParam, LPARAM) { - PROTOACCOUNT *pa = Proto_GetAccount((MCONTACT)wParam); + PROTOACCOUNT *pa = Proto_GetAccount(wParam); return (INT_PTR)(Proto_IsAccountEnabled(pa) ? pa->szModuleName : NULL); } static INT_PTR Proto_GetContactBaseAccount(WPARAM wParam, LPARAM) { - PROTOACCOUNT *pa = Proto_GetAccount((MCONTACT)wParam); + PROTOACCOUNT *pa = Proto_GetAccount(wParam); return (INT_PTR)(pa ? pa->szModuleName : NULL); } @@ -210,14 +210,14 @@ static INT_PTR Proto_AddToContact(WPARAM wParam, LPARAM lParam) if (pd == NULL) { PROTOACCOUNT *pa = Proto_GetAccount(szProto); if (pa) { - db_set_s((MCONTACT)wParam, "Protocol", "p", szProto); + db_set_s(wParam, "Protocol", "p", szProto); return 0; } return 1; } if (pd->type == PROTOTYPE_PROTOCOL || pd->type == PROTOTYPE_VIRTUAL) - db_set_s((MCONTACT)wParam, "Protocol", "p", szProto); + db_set_s(wParam, "Protocol", "p", szProto); return 0; } @@ -228,7 +228,7 @@ static INT_PTR Proto_RemoveFromContact(WPARAM wParam, LPARAM lParam) case 0: return 1; case -1: - db_unset((MCONTACT)wParam, "Protocol", "p"); + db_unset(wParam, "Protocol", "p"); } return 0; diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 03ff01a69c..dfbbd9950f 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -214,11 +214,11 @@ static int Proto_ValidTypingContact(MCONTACT hContact, char *szProto) static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam) { if (lParam == PROTOTYPE_SELFTYPING_OFF || lParam == PROTOTYPE_SELFTYPING_ON) { - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (!szProto) return 0; - if (Proto_ValidTypingContact((MCONTACT)wParam, szProto)) + if (Proto_ValidTypingContact(wParam, szProto)) CallProtoServiceInt(NULL,szProto, PSS_USERISTYPING, wParam, lParam); } @@ -228,7 +228,7 @@ static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam) static INT_PTR Proto_ContactIsTyping(WPARAM wParam, LPARAM lParam) { int type = (int)lParam; - char *szProto = GetContactProto((MCONTACT)wParam); + char *szProto = GetContactProto(wParam); if (!szProto) return 0; @@ -238,7 +238,7 @@ static INT_PTR Proto_ContactIsTyping(WPARAM wParam, LPARAM lParam) if (type < PROTOTYPE_CONTACTTYPING_OFF) return 0; - if (Proto_ValidTypingContact((MCONTACT)wParam, szProto)) + if (Proto_ValidTypingContact(wParam, szProto)) NotifyEventHooks(hTypeEvent, wParam, lParam); return 0; @@ -442,7 +442,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char else return (INT_PTR)ppi->FileResume((HANDLE)wParam, &pfr->action, (const PROTOCHAR**)&pfr->szFilename); } - case 12: return (INT_PTR)ppi->GetCaps(wParam, (MCONTACT)lParam); + case 12: return (INT_PTR)ppi->GetCaps(wParam, lParam); case 13: return (INT_PTR)Proto_GetIcon(ppi, wParam); case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam); case 15: @@ -490,7 +490,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvT((char*)lParam)); else return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam); - case 34: return (INT_PTR)ppi->UserIsTyping((MCONTACT)wParam, lParam); + case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam); case 35: lstrcpynA((char*)lParam, ppi->m_szModuleName, wParam); return 0; case 36: return ppi->m_iStatus; diff --git a/src/modules/srmm/statusicon.cpp b/src/modules/srmm/statusicon.cpp index e1cc7bc0f0..677bcfa068 100644 --- a/src/modules/srmm/statusicon.cpp +++ b/src/modules/srmm/statusicon.cpp @@ -88,7 +88,7 @@ INT_PTR ModifyStatusIcon(WPARAM wParam, LPARAM lParam) if (p == NULL) return 1; - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; if (hContact == NULL) { mir_free(p->sid.szModule); mir_free(p->sid.szTooltip); -- cgit v1.2.3