final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 34 insertions, 34 deletions

diff --git a/plugins/TabSRMM/src/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index 8e095e1585..5abfc4b384 100644
--- a/plugins/TabSRMM/src/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -291,10 +291,10 @@ BOOL CList_AddEvent(HANDLE hContact, HICON Icon, HANDLE event, int type, const T
 	cle.pszService = "GChat/DblClickEvent" ;

 	cle.ptszTooltip = TranslateTS(szBuf);

 	if (type) {

-		if (!CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0))

+		if (!CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

 			CallService(MS_CLIST_ADDEVENT, (WPARAM) hContact, (LPARAM) &cle);

 	} else {

-		if (CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0))

+		if (CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

 			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"chaticon");

 		CallService(MS_CLIST_ADDEVENT, (WPARAM) hContact, (LPARAM) &cle);

 	}

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index 7c8062c1d5..48886bf0ba 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -1030,7 +1030,7 @@ void Log_StreamInEvent(HWND hwndDlg,  LOGINFO* lin, SESSION_INFO* si, BOOL bRedr
 		SendMessage(hwndRich, EM_STREAMIN, wp, (LPARAM) & stream);

 

 

-		//SendMessage(hwndRich, EM_EXGETSEL, (WPARAM)0, (LPARAM)&newsel);

+		//SendMessage(hwndRich, EM_EXGETSEL, 0, (LPARAM)&newsel);

 		/*

 		* for new added events, only replace in message or action events.

 		* no need to replace smileys or math formulas elsewhere

diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index 0dfa59a470..e8a203a470 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -392,7 +392,7 @@ BOOL SM_RemoveUser(const TCHAR* pszID, const char* pszModule, const TCHAR* pszUI
 				dw = UM_RemoveUser(&pTemp->pUsers, pszUID);

 

 				if (pTemp->hWnd)

-					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, 0, 0);

 

 				if (pszID)

 					return TRUE;

@@ -457,7 +457,7 @@ BOOL SM_GiveStatus(const TCHAR* pszID, const char* pszModule, const TCHAR* pszUI
 			if (ui) {

 				SM_MoveUser(pTemp->ptszID, pTemp->pszModule, ui->pszUID);

 				if (pTemp->hWnd)

-					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, 0, 0);

 			}

 			return TRUE;

 		}

@@ -481,7 +481,7 @@ BOOL SM_SetContactStatus(const TCHAR* pszID, const char* pszModule, const TCHAR*
 			if (ui) {

 				SM_MoveUser(pTemp->ptszID, pTemp->pszModule, ui->pszUID);

 				if (pTemp->hWnd)

-					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, 0, 0);

 			}

 			return TRUE;

 		}

@@ -505,7 +505,7 @@ BOOL SM_TakeStatus(const TCHAR* pszID, const char* pszModule, const TCHAR* pszUI
 			if (ui) {

 				SM_MoveUser(pTemp->ptszID, pTemp->pszModule, ui->pszUID);

 				if (pTemp->hWnd)

-					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+					SendMessage(pTemp->hWnd, GC_UPDATENICKLIST, 0, 0);

 			}

 			return TRUE;

 		}

@@ -640,7 +640,7 @@ BOOL SM_SendUserMessage(const TCHAR* pszID, const char* pszModule, const TCHAR*
 	while (pTemp != NULL) {

 		if ((!pszID || !lstrcmpi(pTemp->ptszID, pszID)) && !lstrcmpiA(pTemp->pszModule, pszModule)) {

 			if (pTemp->iType == GCW_CHATROOM)

-				DoEventHook(pTemp->ptszID, pTemp->pszModule, GC_USER_MESSAGE, NULL, pszText, (LPARAM)NULL);

+				DoEventHook(pTemp->ptszID, pTemp->pszModule, GC_USER_MESSAGE, NULL, pszText, 0);

 			if (pszID)

 				return TRUE;

 		}

diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index 7b05b5b81b..f4eee6ae06 100644
--- a/plugins/TabSRMM/src/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -314,7 +314,7 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				return 0;

 

 			::SendMessage(hwndDlg, WM_USER + 100, 0, 0);

-			if (lParam != (LPARAM)NULL)

+			if (lParam != 0)

 				::SendMessage(::GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

 

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 9d2fec8b48..765272fdd2 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -497,7 +497,7 @@ HICON LoadIconEx(int iIndex, char * pszIcoLibName, int iX, int iY)
 {

 	char szTemp[256];

 	mir_snprintf(szTemp, sizeof(szTemp), "chat_%s", pszIcoLibName);

-	return (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM)szTemp);

+	return Skin_GetIcon(szTemp);

 }

 

 static void InitSetting(TCHAR** ppPointer, char* pszSetting, TCHAR* pszDefault)

@@ -582,7 +582,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			if ((LOWORD(wParam) == IDC_GROUP)

 					&& (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))	return 0;

 

-			if (lParam != (LPARAM)NULL)

+			if (lParam != 0)

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

 

@@ -1086,7 +1086,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					break;

 			}

 

-			if (lParam != (LPARAM)NULL)

+			if (lParam != 0)

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

 

@@ -1266,7 +1266,7 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			break;

 		}

 		case WM_COMMAND:

-			if (lParam != (LPARAM)NULL)

+			if (lParam != 0)

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

 

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index edd9f25d79..52664447a3 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -418,7 +418,7 @@ static void AddUser(GCEVENT * gce)
 			ui->Status |= si->pStatuses->Status;

 

 			if (si->hWnd) {

-				SendMessage(si->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+				SendMessage(si->hWnd, GC_UPDATENICKLIST, 0, 0);

 				if (si->dat)

 					GetMyNick(si->dat);

 			}

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 170c320299..89848ea829 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -158,7 +158,7 @@ static void TSAPI Chat_OpenPopup(SESSION_INFO* si, HWND hwndPopup)
 static void TSAPI Chat_DismissPopup(const SESSION_INFO* si, HWND hwndPopup)

 {

 	if (si->hContact)

-		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, (LPARAM)0))

+		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

 

 	if (si->hWnd && KillTimer(si->hWnd, TIMERID_FLASHWND))

@@ -172,7 +172,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 	switch (message) {

 		case WM_COMMAND:

 			if (HIWORD(wParam) == STN_CLICKED) {

-				SESSION_INFO* si = (SESSION_INFO*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)0);;

+				SESSION_INFO* si = (SESSION_INFO*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, 0);;

 

 				if (si) {

 					if (nen_options.maskActL & MASK_OPEN)

@@ -184,7 +184,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 			}

 			break;

 		case WM_CONTEXTMENU: {

-			SESSION_INFO* si = (SESSION_INFO*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)0);

+			SESSION_INFO* si = (SESSION_INFO*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, 0);

 

 			if (si && si->hContact) {

 				if (nen_options.maskActR & MASK_OPEN)

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 93173b8fb9..bcf331f15c 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -298,7 +298,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 	if (dat->iTabID >= 0) {

 		if (DBGetContactSettingWord(si->hContact, si->pszModule , "ApparentMode", 0) != 0)

 			DBWriteContactSettingWord(si->hContact, si->pszModule , "ApparentMode", (LPARAM) 0);

-		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, (LPARAM)0))

+		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

 

 		SendMessage(hwndDlg, GC_UPDATETITLE, 0, 1);

@@ -886,7 +886,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 				BOOL 		isRoom = FALSE;

 				wchar_t*	pszText = NULL;

 				GETTEXTEX	gt = {0};

-				LRESULT		lResult = (LRESULT)SendMessage(hwnd, EM_GETSEL, (WPARAM)NULL, (LPARAM)NULL);

+				LRESULT		lResult = (LRESULT)SendMessage(hwnd, EM_GETSEL, 0, 0);

 				bool		fCompleted = false;

 

 				SendMessage(hwnd, WM_SETREDRAW, FALSE, 0);

@@ -897,7 +897,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 				gt.codepage = 1200;

 				gt.flags = GTL_DEFAULT | GTL_PRECISE;

 

-				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, (LPARAM)0);

+				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0);

 				if (iLen > 0) {

 					wchar_t*	pszName = NULL;

 					pszText = reinterpret_cast<wchar_t*>(Utils::safeMirCalloc((iLen + 10) * sizeof(wchar_t)));

@@ -1017,7 +1017,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 				gtl.flags = GTL_PRECISE;

 				gtl.codepage = CP_ACP;

-				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) & gtl, (LPARAM)NULL);

+				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) & gtl, 0);

 				SendMessage(hwnd, EM_SCROLLCARET, 0, 0);

 				SendMessage(hwnd, WM_SETREDRAW, TRUE, 0);

 				RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE);

@@ -1043,7 +1043,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 				gtl.flags = GTL_PRECISE;

 				gtl.codepage = CP_ACP;

-				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) & gtl, (LPARAM)NULL);

+				iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) & gtl, 0);

 				SendMessage(hwnd, EM_SCROLLCARET, 0, 0);

 				SendMessage(hwnd, WM_SETREDRAW, TRUE, 0);

 				RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE);

@@ -1768,7 +1768,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 					}

 

 					case ID_MESS:

-						DoEventHookAsync(GetParent(hwnd), parentdat->ptszID, parentdat->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, (LPARAM)NULL);

+						DoEventHookAsync(GetParent(hwnd), parentdat->ptszID, parentdat->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, 0);

 						break;

 

 					default: {

@@ -2435,7 +2435,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 						if (g_Settings.ShowContactStatus && g_Settings.ContactStatusFirst && ui->ContactStatus) {

 							HICON hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);

 							DrawIconEx(dis->hDC, x_offset, dis->rcItem.top + offset - 8, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-							CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+							Skin_ReleaseIcon(hIcon);

 							x_offset += 18;

 						}

 

@@ -2458,7 +2458,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 						if (g_Settings.ShowContactStatus && !g_Settings.ContactStatusFirst && ui->ContactStatus) {

 							HICON hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);

 							DrawIconEx(dis->hDC, x_offset, dis->rcItem.top + offset - 8, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-							CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+							Skin_ReleaseIcon(hIcon);

 							x_offset += 18;

 						}

 

@@ -2504,7 +2504,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			switch (wParam) {

 				case SESSION_OFFLINE:

 					SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);

-					SendMessage(si->hWnd, GC_UPDATENICKLIST, (WPARAM)0, (LPARAM)0);

+					SendMessage(si->hWnd, GC_UPDATENICKLIST, 0, 0);

 					return TRUE;

 

 				case SESSION_ONLINE:

@@ -2520,7 +2520,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					return TRUE;

 

 				case SESSION_TERMINATE:

-					if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, (LPARAM)0))

+					if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 						CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

 

 					si->wState &= ~STATE_TALK;

@@ -2766,7 +2766,7 @@ LABEL_SHOWWINDOW:
 								return(_dlgReturn(hwndDlg, 1));

 							case TABSRMM_HK_MUC_SHOWSERVER:

 								if (si->iType != GCW_SERVER)

-									DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, L"/servershow", (LPARAM)NULL);

+									DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, L"/servershow", 0);

 								return(_dlgReturn(hwndDlg, 1));

 							default:

 								break;

@@ -2998,7 +2998,7 @@ LABEL_SHOWWINDOW:
 														break;

 

 													case ID_MESS:

-														DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, (LPARAM)NULL);

+														DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, 0);

 														break;

 

 													default:

@@ -3126,7 +3126,7 @@ LABEL_SHOWWINDOW:
 						//ui = SM_GetUserFromIndex(si->pszID, si->pszModule, item);

 						if (ui) {

 							if (g_Settings.DoubleClick4Privat ? GetKeyState(VK_SHIFT) & 0x8000 : !(GetKeyState(VK_SHIFT) & 0x8000)) {

-								LRESULT lResult = (LRESULT)SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_GETSEL, (WPARAM)NULL, (LPARAM)NULL);

+								LRESULT lResult = (LRESULT)SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_GETSEL, 0, 0);

 								int start = LOWORD(lResult);

 								TCHAR* pszName = (TCHAR*)alloca(sizeof(TCHAR) * (lstrlen(ui->pszUID) + 3));

 								if (start == 0)

@@ -3137,7 +3137,7 @@ LABEL_SHOWWINDOW:
 								SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_REPLACESEL, FALSE, (LPARAM) pszName);

 								PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);

 								SetFocus(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE));

-							} else DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, (LPARAM)NULL);

+							} else DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_PRIVMESS, ui->pszUID, NULL, 0);

 						}

 

 						return TRUE;

@@ -3178,7 +3178,7 @@ LABEL_SHOWWINDOW:
 

 					if (ptszText[0] == '/' || si->iType == GCW_SERVER)

 						fSound = false;

-					DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, ptszText, (LPARAM)NULL);

+					DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, ptszText, 0);

 					mi->idleTimeStamp = time(0);

 					mi->lastIdleCheck = 0;

 					SM_BroadcastMessage(si->pszModule, GC_UPDATESTATUSBAR, 0, 1, TRUE);

@@ -3268,7 +3268,7 @@ LABEL_SHOWWINDOW:
 				case IDC_CHANMGR:

 					if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHANMGR)))

 						break;

-					DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_CHANMGR, NULL, NULL, (LPARAM)NULL);

+					DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_CHANMGR, NULL, NULL, 0);

 					break;

 

 				case IDC_FILTER:

@@ -3770,7 +3770,7 @@ LABEL_SHOWWINDOW:
 		case WM_DESTROY: {

 			int i;

 

-			if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, (LPARAM)0))

+			if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

 			si->wState &= ~STATE_TALK;

 			si->hWnd = NULL;