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 /plugins/DbEditorPP | |
| 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 'plugins/DbEditorPP')
| -rw-r--r-- | plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 2 | ||||
| -rw-r--r-- | plugins/DbEditorPP/src/main_window.cpp | 2 | ||||
| -rw-r--r-- | plugins/DbEditorPP/src/moduletree.cpp | 2 | ||||
| -rw-r--r-- | plugins/DbEditorPP/src/settinglist.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp index 748e27cd2d..a9915afb74 100644 --- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp +++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp @@ -109,7 +109,7 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case WM_INITDIALOG:
{
char tmp[32];
- SetWindowLongPtr(hwnd,GWLP_USERDATA,(LPARAM)lParam);
+ SetWindowLongPtr(hwnd,GWLP_USERDATA,(LONG_PTR)lParam);
switch (((struct DBsetting*)lParam)->dbv.type)
{
case DBVT_BYTE:
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 0406d5fe11..2442178da5 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -198,7 +198,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) SetWindowText(hwnd, TranslateT("Database Editor++"));
// setup the splitter
- SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, (LPARAM)db_get_w(NULL, modname, "Splitter", 300));
+ SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, (LONG_PTR)db_get_w(NULL, modname, "Splitter", 300));
SendMessage(hwnd, GC_SPLITTERMOVED, 0, 0);
mir_subclassWindow(GetDlgItem(hwnd, IDC_SPLITTER), SplitterSubclassProc);
// module tree
diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp index 0d675682fe..4d5aa57a99 100644 --- a/plugins/DbEditorPP/src/moduletree.cpp +++ b/plugins/DbEditorPP/src/moduletree.cpp @@ -617,7 +617,7 @@ void moduleListWM_NOTIFY(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)// hw lvi.iImage = 6;
ClearListview(hwnd2Settings);
- SetWindowLongPtr(hwnd2Settings, GWLP_USERDATA, (LONG)NULL);
+ SetWindowLongPtr(hwnd2Settings, GWLP_USERDATA, 0);
if (himl2) ListView_SetImageList(hwnd2Settings, himl2, LVSIL_SMALL);
if (mtis->type == CONTACT_ROOT_ITEM && !hContact) {
diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp index 84b9e8a0a3..235b64b129 100644 --- a/plugins/DbEditorPP/src/settinglist.cpp +++ b/plugins/DbEditorPP/src/settinglist.cpp @@ -230,7 +230,7 @@ void PopulateSettings(HWND hwnd2Settings, MCONTACT hContact, char* module) info->hContact = hContact;
info->module = mir_tstrdup(module);
- SetWindowLongPtr(hwnd2Settings,GWLP_USERDATA, (LONG)info);
+ SetWindowLongPtr(hwnd2Settings,GWLP_USERDATA, 0);
// icons
if (himl2)
@@ -659,7 +659,7 @@ void EditLabel(HWND hwnd2List, int item, int subitem) db_free(&dbv);
- SettingLabelEditSubClass = (WNDPROC)SetWindowLongPtrW(info->hwnd2Edit, GWLP_WNDPROC, (LONG)SettingLabelEditSubClassProc);
+ SettingLabelEditSubClass = (WNDPROC)SetWindowLongPtr(info->hwnd2Edit, GWLP_WNDPROC, (LONG_PTR)SettingLabelEditSubClassProc);
SendMessage(info->hwnd2Edit, WM_USER, 0, (LPARAM)data);
}
|