SendMessage(GetDlgItem -> SendDlgItemMessage

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

3 files changed, 21 insertions, 21 deletions

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index baa47093a2..2eed55adbf 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -317,7 +317,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 	case WM_MOUSEWHEEL:

 		if ((GetWindowLongPtr(hwnd, GWL_STYLE) & WS_VSCROLL) == 0)

-			SendMessage(GetDlgItem(GetParent(hwnd), IDC_CHAT_LOG), WM_MOUSEWHEEL, wParam, lParam);

+			SendDlgItemMessage(GetParent(hwnd), IDC_CHAT_LOG, WM_MOUSEWHEEL, wParam, lParam);

 

 		dat->lastEnterTime = 0;

 		return TRUE;

@@ -750,7 +750,7 @@ static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 

 	case WM_CHAR:

 		SetFocus(GetDlgItem(GetParent(hwnd), IDC_CHAT_MESSAGE));

-		SendMessage(GetDlgItem(GetParent(hwnd), IDC_CHAT_MESSAGE), WM_CHAR, wParam, lParam);

+		SendDlgItemMessage(GetParent(hwnd), IDC_CHAT_MESSAGE, WM_CHAR, wParam, lParam);

 		break;

 	}

 

@@ -1119,7 +1119,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHAT_SMILEY), TRUE);

 

-			SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), EM_HIDESELECTION, TRUE, 0);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_HIDESELECTION, TRUE, 0);

 

 			SendMessage(hwndDlg, GC_SETWNDPROPS, 0, 0);

 			SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);

@@ -1139,7 +1139,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		SendMessage(hwndDlg, DM_UPDATETITLEBAR, 0, 0);

 		SendMessage(hwndDlg, GC_FIXTABICONS, 0, 0);

 

-		SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), EM_SETBKGNDCOLOR, 0, g_Settings.crLogBackground);

+		SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETBKGNDCOLOR, 0, g_Settings.crLogBackground);

 		{

 			// messagebox

 			COLORREF crFore;

@@ -1151,7 +1151,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			cf.dwEffects = 0;

 			cf.crTextColor = crFore;

 			cf.crBackColor = db_get_dw(NULL, SRMMMOD, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR);

-			SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_SETBKGNDCOLOR, 0, db_get_dw(NULL, SRMMMOD, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR));

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETBKGNDCOLOR, 0, db_get_dw(NULL, SRMMMOD, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR));

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, WM_SETFONT, (WPARAM)g_Settings.MessageBoxFont, MAKELPARAM(TRUE, 0));

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETCHARFORMAT, (WPARAM)SCF_ALL, (LPARAM)&cf);

 		

@@ -1164,7 +1164,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			if (db_get_b(NULL, CHAT_MODULE, "ShowContactStatus", 0))

 				font = font > 16 ? font : 16;

 

-			SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_SETITEMHEIGHT, 0, (LPARAM)height > font ? height : font);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_SETITEMHEIGHT, 0, (LPARAM)height > font ? height : font);

 			InvalidateRect(GetDlgItem(hwndDlg, IDC_CHAT_LIST), NULL, TRUE);

 		}

 		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_REQUESTRESIZE, 0, 0);

@@ -1449,7 +1449,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 	case GC_UPDATENICKLIST:

 		SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, WM_SETREDRAW, FALSE, 0);

-		SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_RESETCONTENT, 0, 0);

+		SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_RESETCONTENT, 0, 0);

 		for (int index = 0; index < si->nUsersInNicklist; index++) {

 			USERINFO *ui = pci->SM_GetUserFromIndex(si->ptszID, si->pszModule, index);

 			if (ui) {

@@ -1457,9 +1457,9 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 				if (szIndicator > '\0') {

 					static TCHAR ptszBuf[128];

 					mir_sntprintf(ptszBuf, SIZEOF(ptszBuf), _T("%c%s"), szIndicator, ui->pszNick);

-					SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_ADDSTRING, 0, (LPARAM)ptszBuf);

+					SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ADDSTRING, 0, (LPARAM)ptszBuf);

 				}

-				else SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_ADDSTRING, 0, (LPARAM)ui->pszNick);

+				else SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ADDSTRING, 0, (LPARAM)ui->pszNick);

 			}

 		}

 		SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, WM_SETREDRAW, TRUE, 0);

@@ -1592,7 +1592,7 @@ LABEL_SHOWWINDOW:
 

 			CHARRANGE sel;

 			sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOG), CP_ACP, FALSE);

-			SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), EM_EXSETSEL, 0, (LPARAM)&sel);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_EXSETSEL, 0, (LPARAM)&sel);

 			PostMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

 		}

 		break;

@@ -1663,7 +1663,7 @@ LABEL_SHOWWINDOW:
 					POINT p;

 					GetCursorPos(&p);

 					ScreenToClient(GetDlgItem(hwndDlg, IDC_CHAT_LIST), &p);

-					int item = LOWORD(SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)));

+					int item = LOWORD(SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)));

 					USERINFO *ui = pci->SM_GetUserFromIndex(parentdat->ptszID, parentdat->pszModule, item);

 					if (ui != NULL) {

 						static TCHAR ptszBuf[1024];

@@ -1691,11 +1691,11 @@ LABEL_SHOWWINDOW:
 				hti.pt.y = (short)HIWORD(GetMessagePos());

 				ScreenToClient(GetDlgItem(hwndDlg, IDC_CHAT_LIST), &hti.pt);

 

-				int item = LOWORD(SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LIST), LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y)));

+				int item = LOWORD(SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y)));

 				USERINFO *ui = pci->SM_GetUserFromIndex(si->ptszID, si->pszModule, item);

 				if (ui) {

 					if (GetKeyState(VK_SHIFT) & 0x8000) {

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

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

 						int start = LOWORD(lResult);

 						size_t dwNameLenMax = (mir_tstrlen(ui->pszUID) + 4);

 						TCHAR* pszName = (TCHAR*)alloca(sizeof(TCHAR) * dwNameLenMax);

@@ -1704,7 +1704,7 @@ LABEL_SHOWWINDOW:
 						else

 							mir_sntprintf(pszName, dwNameLenMax, _T("%s "), ui->pszUID);

 

-						SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_REPLACESEL, FALSE, (LPARAM)pszName);

+						SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_REPLACESEL, FALSE, (LPARAM)pszName);

 						PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);

 					}

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

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index c0bc5bfa8c..256b10e7f4 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -425,7 +425,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar
 

 	case WM_MOUSEWHEEL:

 		if ((GetWindowLongPtr(hwnd, GWL_STYLE) & WS_VSCROLL) == 0)

-			SendMessage(GetDlgItem(GetParent(hwnd), IDC_LOG), WM_MOUSEWHEEL, wParam, lParam);

+			SendDlgItemMessage(GetParent(hwnd), IDC_LOG, WM_MOUSEWHEEL, wParam, lParam);

 		break;

 

 	case WM_LBUTTONDOWN:

@@ -1065,7 +1065,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				char idbuf[128], buf[128];

 				GetContactUniqueId(dat, idbuf, sizeof(idbuf));

 				mir_snprintf(buf, SIZEOF(buf), Translate("User Menu - %s"), idbuf);

-				SendMessage(GetDlgItem(hwndDlg, IDC_USERMENU), BUTTONADDTOOLTIP, (WPARAM)buf, 0);

+				SendDlgItemMessage(hwndDlg, IDC_USERMENU, BUTTONADDTOOLTIP, (WPARAM)buf, 0);

 

 				if (!cws || (!strcmp(cws->szModule, dat->szProto) && !strcmp(cws->szSetting, "Status")))

 					dat->wStatus = cws->value.wVal;

@@ -1751,7 +1751,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 				if (buffer != NULL) {

 					TCHAR *quotedBuffer = GetQuotedTextW(buffer);

-					SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);

+					SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);

 					mir_free(quotedBuffer);

 					mir_free(buffer);

 				}

@@ -1766,7 +1766,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						TCHAR *buffer = DbGetEventTextT(&dbei, CP_ACP);

 						if (buffer != NULL) {

 							TCHAR *quotedBuffer = GetQuotedTextW(buffer);

-							SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);

+							SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);

 							mir_free(quotedBuffer);

 							mir_free(buffer);

 						}

@@ -1825,7 +1825,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			case WM_CHAR:

 				if (!(GetKeyState(VK_CONTROL) & 0x8000)) {

 					SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));

-					SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), ((MSGFILTER *)lParam)->msg, ((MSGFILTER *)lParam)->wParam, ((MSGFILTER *)lParam)->lParam);

+					SendDlgItemMessage(hwndDlg, IDC_MESSAGE, ((MSGFILTER *)lParam)->msg, ((MSGFILTER *)lParam)->wParam, ((MSGFILTER *)lParam)->lParam);

 					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE);

 				}

 				return TRUE;

@@ -1896,7 +1896,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 	case WM_CHAR:

 		SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));

-		SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), msg, wParam, lParam);

+		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, msg, wParam, lParam);

 		break;

 

 	case WM_DESTROY:

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 7f982177e8..a1db3be6ff 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -153,7 +153,7 @@ static INT_PTR SendMessageCommandWorker(MCONTACT hContact, LPCSTR pszMsg, bool i
 	if (hwnd != NULL) {

 		if (pszMsg) {

 			HWND hEdit = GetDlgItem(hwnd, IDC_MESSAGE);

-			SendMessage(hEdit, EM_SETSEL, -1, SendMessage(hEdit, WM_GETTEXTLENGTH, 0, 0));

+			SendMessage(hEdit, EM_SETSEL, -1, GetWindowTextLength(hEdit));

 			if (isWchar)

 				SendMessageW(hEdit, EM_REPLACESEL, FALSE, (LPARAM)pszMsg);

 			else