From 5aca7788f891521104f8bed712672af236465cc1 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Wed, 12 Mar 2014 12:17:43 +0000 Subject: SetWindowLongPtr() and GetWindowLongPtr() multiple fixes for x64 git-svn-id: http://svn.miranda-ng.org/main/trunk@8571 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WebView/src/webview_datawnd.cpp | 4 ++-- plugins/WebView/src/webview_opts.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/WebView') diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index e928b21d6a..084215923a 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -37,7 +37,7 @@ INT_PTR CALLBACK DlgProcFind(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - SetWindowLong(hwndDlg, GWLP_USERDATA, lParam); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); SetWindowText(hwndDlg, TranslateT("Find")); SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(hInst, MAKEINTRESOURCE(IDI_FIND))); return TRUE; @@ -157,7 +157,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA { MCONTACT hContact2 = lParam; - SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG) hContact2); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) hContact2); WindowList_Add(hWindowList, hwndDlg, hContact2); url[0] = '\0'; diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp index d15e771219..f49ca27613 100644 --- a/plugins/WebView/src/webview_opts.cpp +++ b/plugins/WebView/src/webview_opts.cpp @@ -287,7 +287,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l TranslateDialogDefault(hwndDlg); hContact = lParam; - SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG) hContact); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) hContact); SetWindowText(hwndDlg, TranslateT("Alert options")); @@ -509,7 +509,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l break; case IDC_ENABLE_ALERTS: - hContact = (MCONTACT)GetWindowLong(hwndDlg, GWLP_USERDATA); + hContact = (MCONTACT)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); EnableWindow(GetDlgItem(hwndDlg, IDC_ADD_DATE_NAME), (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS))); if ( IsDlgButtonChecked(hwndDlg, IDC_ADD_DATE_NAME)) { @@ -631,7 +631,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_ALERT_TYPE: if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) { - hContact = (MCONTACT) GetWindowLong(hwndDlg, GWLP_USERDATA); + hContact = (MCONTACT) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); int alertIndex = SendDlgItemMessage(hwndDlg, IDC_ALERT_TYPE, CB_GETCURSEL, 0, 0); if (HIWORD(wParam) == CBN_SELCHANGE) { @@ -678,7 +678,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_EVENT_TYPE: if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) { - MCONTACT hContact = (MCONTACT) GetWindowLong(hwndDlg, GWLP_USERDATA); + MCONTACT hContact = (MCONTACT) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); int eventIndex = SendDlgItemMessage(hwndDlg, IDC_EVENT_TYPE, CB_GETCURSEL, 0, 0); if (HIWORD(wParam) == CBN_SELCHANGE) { @@ -709,7 +709,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_ALERT_APPLY: case IDC_OK2: { - hContact = (MCONTACT) GetWindowLong(hwndDlg, GWLP_USERDATA); + hContact = (MCONTACT) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); TCHAR buf[MAX_PATH]; eventIndex = db_get_b(hContact, MODULENAME, EVNT_INDEX_KEY, 0); @@ -826,7 +826,7 @@ INT_PTR CALLBACK DlgProcContactOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM test = 0; test2 = 0; - SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG) hContact); + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) hContact); WindowList_Add(hWindowList, hwndDlg, hContact); SetWindowText(hwndDlg, TranslateT("Contact options")); @@ -927,7 +927,7 @@ INT_PTR CALLBACK DlgProcContactOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case IDC_CPY_STRINGS: { TCHAR string[128]; - hContact = (MCONTACT) GetWindowLong(hwndDlg, GWLP_USERDATA); + hContact = (MCONTACT) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); GetDlgItemText(hwndDlg, IDC_START, string, SIZEOF(string)); db_set_ts(hContact, MODULENAME, ALRT_S_STRING_KEY, string); @@ -1022,7 +1022,7 @@ INT_PTR CALLBACK DlgProcContactOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break; } - hContact = (MCONTACT) GetWindowLong(hwndDlg, GWLP_USERDATA); + hContact = (MCONTACT) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); GetDlgItemText(hwndDlg, IDC_URL, url, SIZEOF(url)); db_set_ts(hContact, MODULENAME, URL_KEY, url); -- cgit v1.2.3