diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 15:15:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 15:15:33 +0000 |
| commit | d6eee2018898f2442883a0aa77ad095b75572cfb (patch) | |
| tree | 8fbfe32690b9b32e5d47b1958a02f6f6a5fbf000 /protocols/IcqOscarJ | |
| parent | 2d37d969153b5fad810984182f747755c1cbc616 (diff) | |
fix for 64-bit issues & warnings
git-svn-id: http://svn.miranda-ng.org/main/trunk@15043 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_direct.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_uploadui.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_xstatus.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/userinfotab.cpp | 6 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 5 |
5 files changed, 8 insertions, 9 deletions
diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp index 5c837b352a..7131dc5b70 100644 --- a/protocols/IcqOscarJ/src/icq_direct.cpp +++ b/protocols/IcqOscarJ/src/icq_direct.cpp @@ -243,7 +243,7 @@ void __cdecl CIcqProto::icq_directThread(directthreadstartinfo *dtsi) dwReqMsgID1 = pCookie->dwMsgID1;
dwReqMsgID2 = pCookie->dwMsgID2;
- dc.dwReqId = (DWORD)pCookie->ft;
+ dc.dwReqId = (UINT_PTR)pCookie->ft;
SAFE_FREE((void**)&pCookie);
}
}
diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp index edb1b0075d..51b58641c9 100644 --- a/protocols/IcqOscarJ/src/icq_uploadui.cpp +++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp @@ -309,7 +309,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa if (ack->type != ICQACKTYPE_SERVERCLIST)
break;
- if ((int)ack->hProcess != currentSequence)
+ if ((INT_PTR)ack->hProcess != currentSequence)
break;
lastAckResult = ack->result == ACKRESULT_SUCCESS ? 0 : 1;
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 455c83ada1..e663d4ee38 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -610,7 +610,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara ACKDATA *ack = (ACKDATA*)lParam;
if (ack->type != ICQACKTYPE_XSTATUS_RESPONSE) break;
if (ack->hContact != dat->hContact) break;
- if ((DWORD)ack->hProcess != dat->iEvent) break;
+ if ((UINT_PTR)ack->hProcess != dat->iEvent) break;
ShowDlgItem(hwndDlg, IDC_RETRXSTATUS, SW_HIDE);
ShowDlgItem(hwndDlg, IDC_XMSG, SW_SHOW);
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index 1b475a068b..75d2c8c054 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -51,10 +51,10 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, MCONTACT hContac dbv.type = DBVT_DELETED;
- if ((hContact == NULL) && ((int)szModule < 0x100)) {
+ if ((hContact == NULL) && ((INT_PTR)szModule < 0x100)) {
dbv.type = (BYTE)szModule;
- switch ((int)szModule) {
+ switch ((INT_PTR)szModule) {
case DBVT_BYTE:
dbv.cVal = (BYTE)szSetting;
break;
@@ -62,7 +62,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, MCONTACT hContac dbv.wVal = (WORD)szSetting;
break;
case DBVT_DWORD:
- dbv.dVal = (DWORD)szSetting;
+ dbv.dVal = (UINT_PTR)szSetting;
break;
case DBVT_ASCIIZ:
dbv.pszVal = pstr = szSetting;
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 3fa2e718c1..6ad5193126 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -978,8 +978,7 @@ int CIcqProto::IsMetaInfoChanged(MCONTACT hContact) res = 3; // threshold exceeded
}
}
- else
- res = 4; // no timestamp found
+ else res = 4; // no timestamp found
}
return res;
@@ -989,7 +988,7 @@ int CIcqProto::IsMetaInfoChanged(MCONTACT hContact) void __cdecl CIcqProto::SetStatusNoteThread(void *pDelay)
{
if (pDelay)
- SleepEx((DWORD)pDelay, TRUE);
+ SleepEx((UINT_PTR)pDelay, TRUE);
mir_cslockfull l(cookieMutex);
|