diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-12 12:17:43 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-12 12:17:43 +0000 |
| commit | 5aca7788f891521104f8bed712672af236465cc1 (patch) | |
| tree | 9ea8115598e2d73f563e2503d0544af62f0d782c /protocols | |
| parent | d8d1baa7d5c286c907d18d278738331debc0aabd (diff) | |
SetWindowLongPtr() and GetWindowLongPtr() multiple fixes for x64
git-svn-id: http://svn.miranda-ng.org/main/trunk@8571 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/AimOscar/src/ui.cpp | 2 | ||||
| -rw-r--r-- | protocols/Gadu-Gadu/src/image.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_xstatus.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_captcha.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/ui_utils.cpp | 2 | ||||
| -rw-r--r-- | protocols/MRA/src/MraSelectEMail.cpp | 2 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_captcha.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index 5e5a4fd7f5..a802460379 100644 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -202,7 +202,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L if (((LPNMHDR)lParam)->code == PSN_PARAMCHANGED)
{
ppro = (CAimProto*)((PSHNOTIFY*)lParam)->lParam;
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, LPARAM(ppro));
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)ppro);
DBVARIANT dbv;
if (!db_get_utf(NULL, ppro->m_szModuleName, AIM_KEY_PR, &dbv))
diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 951ca3bbf0..cc2228bf27 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -641,7 +641,7 @@ static INT_PTR CALLBACK gg_img_dlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP gg->gg_LeaveCriticalSection(&gg->sess_mutex, "gg_img_dlgproc", 59, 1, "sess_mutex", 1);
// Protect dat from releasing
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)0);
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
EndDialog(hwndDlg, 0);
}
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 07490019c1..e797ebc6df 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -762,7 +762,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara }
if (dat->hEvent) UnhookEvent(dat->hEvent);
SAFE_FREE(&dat->okButtonFormat);
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, NULL);
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
SAFE_FREE((void**)&dat);
break;
diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp index 31704b3769..c9a0c50860 100644 --- a/protocols/JabberG/src/jabber_captcha.cpp +++ b/protocols/JabberG/src/jabber_captcha.cpp @@ -52,7 +52,7 @@ INT_PTR CALLBACK JabberCaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, if (hint == NULL)
hint = TranslateT("Enter the text you see");
SetDlgItemText(hwndDlg, IDC_INSTRUCTION, TranslateTS(hint));
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG)params);
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)params);
return TRUE;
}
diff --git a/protocols/JabberG/src/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp index 6847c8be3b..4a5e052d84 100644 --- a/protocols/JabberG/src/ui_utils.cpp +++ b/protocols/JabberG/src/ui_utils.cpp @@ -2166,7 +2166,7 @@ void CCtrlBase::Unsubclass() {
if (m_wndproc) {
SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR)m_wndproc);
- SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)0);
+ SetWindowLongPtr(m_hwnd, GWLP_USERDATA, 0);
m_wndproc = 0;
} }
diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp index bfe205f2e0..645ee14475 100644 --- a/protocols/MRA/src/MraSelectEMail.cpp +++ b/protocols/MRA/src/MraSelectEMail.cpp @@ -78,7 +78,7 @@ INT_PTR CALLBACK MraSelectEMailDlgProc(HWND hWndDlg, UINT message, WPARAM wParam break;
case WM_DESTROY:
- SetWindowLongPtr(hWndDlg, GWLP_USERDATA, (LONG_PTR)0);
+ SetWindowLongPtr(hWndDlg, GWLP_USERDATA, 0);
mir_free(dat);
EndDialog(hWndDlg, NO_ERROR);
break;
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 70be23b167..7e08b7f918 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -1179,7 +1179,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w break;
case WM_DESTROY:
- SetWindowLongPtr(hWndDlg, GWLP_USERDATA, (LONG_PTR)0);
+ SetWindowLongPtr(hWndDlg, GWLP_USERDATA, 0);
mir_free(dat);
EndDialog(hWndDlg, NO_ERROR);
break;
diff --git a/protocols/VKontakte/src/vk_captcha.cpp b/protocols/VKontakte/src/vk_captcha.cpp index 040003160c..20981ae51d 100644 --- a/protocols/VKontakte/src/vk_captcha.cpp +++ b/protocols/VKontakte/src/vk_captcha.cpp @@ -39,7 +39,7 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam params = (CAPTCHA_FORM_PARAMS*)lParam;
SetDlgItemText(hwndDlg, IDC_INSTRUCTION, TranslateT("Enter the text you see"));
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG)params);
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)params);
return TRUE;
}
|