From 24a39515399e9555dd0e4ad72b7a22f9152b0adf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 19 May 2015 12:50:25 +0000
Subject: end of zoo with WM_CONTEXTMENU's lParam

git-svn-id: http://svn.miranda-ng.org/main/trunk@13693 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clc.cpp           | 2 +-
 src/modules/clist/clui.cpp          | 4 +---
 src/modules/findadd/findadd.cpp     | 2 +-
 src/modules/protocols/protoopts.cpp | 4 ++--
 src/modules/skin/hotkey_opts.cpp    | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index 044e579b1a..6e10794f1e 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -1234,7 +1234,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		if (!dat->filterSearch)
 			dat->szQuickSearch[0] = 0;
 		{
-			POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) };
+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 			if (pt.x == -1 && pt.y == -1) {
 				dat->selection = cli.pfnGetRowByIndex(dat, dat->selection, &contact, NULL);
 				if (dat->selection != -1)
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index c330fdc95f..50a3b3f8d6 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -921,9 +921,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	case WM_CONTEXTMENU:
 		{
 			// x/y might be -1 if it was generated by a kb click
-			POINT pt;
-			pt.x = (short) LOWORD(lParam);
-			pt.y = (short) HIWORD(lParam);
+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 
 			RECT rc;
 			GetWindowRect(cli.hwndContactTree, &rc);
diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 9ac78eee80..f031259d37 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -801,7 +801,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 	case WM_CONTEXTMENU:
 		{
-			POINT pt = { LOWORD(lParam), HIWORD(lParam) };
+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 
 			LVHITTESTINFO lvhti;
 			lvhti.pt = pt;
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index 7e1c34b770..10968a73b2 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -688,10 +688,10 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 
 	case WM_CONTEXTMENU:
 		if (GetWindowLongPtr((HWND)wParam, GWL_ID) == IDC_ACCLIST) {
-			POINT pt = { (signed short)LOWORD(lParam), (signed short)HIWORD(lParam) };
+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 			int iItem = ListBox_GetCurSel(hwndList);
 
-			if ((pt.x == -1) && (pt.y == -1)) {
+			if (pt.x == -1 && pt.y == -1) {
 				if (iItem != LB_ERR) {
 					RECT rc;
 					ListBox_GetItemRect(hwndList, iItem, &rc);
diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp
index 6a71702630..4c04405e09 100644
--- a/src/modules/skin/hotkey_opts.cpp
+++ b/src/modules/skin/hotkey_opts.cpp
@@ -664,7 +664,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 	case WM_CONTEXTMENU:
 		if (GetWindowLongPtr((HWND)wParam, GWL_ID) == IDC_LV_HOTKEYS) {
 			HWND hwndList = (HWND)wParam;
-			POINT pt = { (signed short)LOWORD(lParam), (signed short)HIWORD(lParam) };
+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 			LVITEM lvi = {0};
 			THotkeyItem *item = NULL;
 
-- 
cgit v1.2.3