fix for 64-bit issues & warnings

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

6 files changed, 9 insertions, 9 deletions

diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp
index af010d17b8..b23255df43 100644
--- a/plugins/TabSRMM/src/TSButton.cpp
+++ b/plugins/TabSRMM/src/TSButton.cpp
@@ -443,7 +443,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				bct->stateId = PBS_PRESSED;

 			else if (LOWORD(lParam) > rc.right - 12) {

 				if (GetDlgCtrlID(hwndDlg) == IDOK || bct->stateId != PBS_DISABLED) {

-					WORD w = (WORD)((int)bct->arrow & 0x0000ffff);

+					WORD w = (WORD)((INT_PTR)bct->arrow & 0x0000ffff);

 					SendMessage(GetParent(hwndDlg), WM_COMMAND, MAKELONG(w, BN_CLICKED), (LPARAM)hwndDlg);

 				}

 			}

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 235c38c5e0..d33f093eba 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -665,10 +665,10 @@ char GetIndicator(SESSION_INFO *si, LPCTSTR ptszNick, int *iNickIndex)
 	for (USERINFO *ui = si->pUsers; ui; ui = ui->next) {

 		if (!mir_tstrcmp(ui->pszNick, ptszNick)) {

 			STATUSINFO *ti = pci->TM_FindStatus(si->pStatuses, pci->TM_WordToString(si->pStatuses, ui->Status));

-			if (ti && (int)ti->hIcon < si->iStatusCount) {

+			if (ti && (INT_PTR)ti->hIcon < si->iStatusCount) {

 				if (iNickIndex)

-					*iNickIndex = (int)ti->hIcon; // color table's index is not zero-based

-				return szIndicators[(int)ti->hIcon];

+					*iNickIndex = (INT_PTR)ti->hIcon; // color table's index is not zero-based

+				return szIndicators[(INT_PTR)ti->hIcon];

 			}

 			break;

 		}

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 13168f2bf6..36b9de0126 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -979,7 +979,7 @@ void TSAPI DM_ScrollToBottom(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 static void LoadKLThread(LPVOID _param)
 {
 	DBVARIANT dbv;
-	if (!db_get_ts((MCONTACT)_param, SRMSGMOD_T, "locale", &dbv)) {
+	if (!db_get_ts((UINT_PTR)_param, SRMSGMOD_T, "locale", &dbv)) {
 		HKL hkl = LoadKeyboardLayout(dbv.ptszVal, 0);
 		PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_SETLOCALE, (WPARAM)_param, (LPARAM)hkl);
 		db_free(&dbv);
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 0ae4b867f5..161431984b 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -273,7 +273,7 @@ void CSendLater::processContacts()
 {

 	if (m_fAvail && m_sendLaterContactList.getCount() != 0) {

 		for (int i = 0; i < m_sendLaterContactList.getCount(); i++)

-			processSingleContact((MCONTACT)m_sendLaterContactList[i]);

+			processSingleContact((UINT_PTR)m_sendLaterContactList[i]);

 

 		m_sendLaterContactList.destroy();

 	}

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index ea7977b5c6..9824a8f5a8 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -119,7 +119,7 @@ entry_found:
 
 static void DoSplitSendA(LPVOID param)
 {
-	SendJob *job = sendQueue->getJobByIndex((int)param);
+	SendJob *job = sendQueue->getJobByIndex((INT_PTR)param);
 
 	size_t iLen = mir_strlen(job->szSendBuffer);
 	ptrA   szBegin((char*)mir_alloc(iLen + 1));
@@ -575,7 +575,7 @@ int SendQueue::ackMessage(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 	dbei.flags |= DBEF_UTF;
 	dbei.pBlob = (PBYTE)job.szSendBuffer;
 
-	MessageWindowEvent evt = { sizeof(evt), (int)job.hSendId, job.hContact, &dbei };
+	MessageWindowEvent evt = { sizeof(evt), (INT_PTR)job.hSendId, job.hContact, &dbei };
 	NotifyEventHooks(PluginConfig.m_event_WriteEvent, 0, (LPARAM)&evt);
 
 	job.szSendBuffer = (char*)dbei.pBlob;
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 7b46ddfd96..e5f6ba8cd7 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -1328,7 +1328,7 @@ INT_PTR CALLBACK CWarning::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		if (!(m_dwFlags & MB_YESNO || m_dwFlags & MB_YESNOCANCEL))

 			::ShowWindow(hwnd, SW_SHOWNORMAL);

 

-		WindowList_Add(hWindowList, hwnd, (MCONTACT)hwnd);

+		WindowList_Add(hWindowList, hwnd, (UINT_PTR)hwnd);

 	}

 	return TRUE;