HCONTACT, part 3

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

4 files changed, 14 insertions, 16 deletions

diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp
index 7c367b78d1..d66941dd31 100644
--- a/src/core/stdauth/authdialogs.cpp
+++ b/src/core/stdauth/authdialogs.cpp
@@ -96,7 +96,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA, (LONG_PTR)hContact);

 

-			if (hContact == INVALID_HANDLE_VALUE || !db_get_b(hContact, "CList", "NotOnList", 0))

+			if (hContact == (HCONTACT)INVALID_HANDLE_VALUE || !db_get_b(hContact, "CList", "NotOnList", 0))

 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 		}

 		return TRUE;

@@ -106,14 +106,14 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		case IDC_ADD:

 		{

 			ADDCONTACTSTRUCT acs = {0};

-			acs.handle = hDbEvent;

+			acs.hDbEvent = hDbEvent;

 			acs.handleType = HANDLE_EVENT;

 			acs.szProto = "";

 			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

 

 			HCONTACT hContact = (HCONTACT)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

-               if ((hContact == INVALID_HANDLE_VALUE) || !db_get_b(hContact, "CList", "NotOnList", 0))

-                  ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

+			if ((hContact == (HCONTACT)INVALID_HANDLE_VALUE) || !db_get_b(hContact, "CList", "NotOnList", 0))

+				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 			break;

 		}

 		case IDC_DETAILS:

@@ -126,7 +126,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		case IDOK:

 		{

 			ADDCONTACTSTRUCT acs = {0};

-			acs.handle = hDbEvent;

+			acs.hDbEvent = hDbEvent;

 			acs.handleType = HANDLE_EVENT;

 			acs.szProto = "";

 			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

@@ -214,7 +214,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			SetDlgItemText(hwndDlg, IDC_HEADERBAR, hdr);

 			SetDlgItemText(hwndDlg, IDC_REASON, reasonT);

 

-			if (hContact == INVALID_HANDLE_VALUE || !db_get_b(hContact, "CList", "NotOnList", 0))

+			if (hContact == (HCONTACT)INVALID_HANDLE_VALUE || !db_get_b(hContact, "CList", "NotOnList", 0))

 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 

 			SendDlgItemMessage(hwndDlg, IDC_DENYREASON, EM_LIMITTEXT, 255, 0);

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

 				if (IsDlgButtonChecked(hwndDlg, IDC_ADDCHECK)) {

 					ADDCONTACTSTRUCT acs = {0};

-					acs.handle = hDbEvent;

+					acs.hDbEvent = hDbEvent;

 					acs.handleType = HANDLE_EVENT;

 					acs.szProto = "";

 					CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp
index ca00c0f642..b98aa94ea6 100644
--- a/src/core/stdfile/filerecvdlg.cpp
+++ b/src/core/stdfile/filerecvdlg.cpp
@@ -395,9 +395,9 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			break;

 

 		case IDC_ADD:

-			{	ADDCONTACTSTRUCT acs = {0};

-

-				acs.handle = dat->hContact;

+			{	

+				ADDCONTACTSTRUCT acs = {0};

+				acs.hContact = dat->hContact;

 				acs.handleType = HANDLE_CONTACT;

 				acs.szProto = "";

 				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 47b867c439..1861bf13af 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 ((HANDLE)wParam == dat->hContact) {

+		if ((HCONTACT)wParam == dat->hContact) {

 			HANDLE hDbEvent = (HANDLE)lParam;

 			if (dat->hDbEventFirst == NULL)

 				dat->hDbEventFirst = hDbEvent;

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

 			{

 				ADDCONTACTSTRUCT acs = { 0 };

-				acs.handle = dat->hContact;

+				acs.hContact = dat->hContact;

 				acs.handleType = HANDLE_CONTACT;

 				acs.szProto = 0;

 				CallService(MS_ADDCONTACT_SHOW, (WPARAM) hwndDlg, (LPARAM) & acs);

diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index a82ef7510c..9a654fa9ff 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -212,10 +212,8 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		case IDC_ADD:

 			{

 				ADDCONTACTSTRUCT acs = {0};

-

-				acs.handle = dat->hContact;

+				acs.hContact = dat->hContact;

 				acs.handleType = HANDLE_CONTACT;

-				acs.szProto = 0;

 				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

 			}

 			if ( !db_get_b(dat->hContact, "CList", "NotOnList", 0)) {

@@ -608,7 +606,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 		case IDC_ADD:

 			ADDCONTACTSTRUCT acs = {0};

-			acs.handle = dat->hContact;

+			acs.hContact = dat->hContact;

 			acs.handleType = HANDLE_CONTACT;

 			acs.szProto = 0;

 			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);