From bd54295e1526de7f9760697c6c2012188cde04a9 Mon Sep 17 00:00:00 2001 From: NN Date: Sun, 4 Oct 2015 22:06:39 +0300 Subject: [PATCH] 64-bit fixes --- .../src/WinControls/OpenSaveFileDialog/FileDialog.cpp | 2 +- PowerEditor/src/WinControls/shortcut/shortcut.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp index 359f63ef6..efd860846 100644 --- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp +++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp @@ -374,7 +374,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L // Don't touch the following 3 lines, they are cursed !!! oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC); - if ((long)oldProc > 0) + if ((LONG_PTR)oldProc > 0) ::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc); return FALSE; diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.h b/PowerEditor/src/WinControls/shortcut/shortcut.h index 87c3e8b21..c1e2c6162 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.h +++ b/PowerEditor/src/WinControls/shortcut/shortcut.h @@ -137,7 +137,8 @@ public: return !(a == b); }; - virtual int doDialog() { + virtual INT_PTR doDialog() + { return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUT_DLG), _hParent, dlgProc, (LPARAM)this); }; @@ -230,7 +231,8 @@ public: generic_string toString() const; generic_string toString(int index) const; - int doDialog() { + INT_PTR doDialog() + { return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUTSCINT_DLG), _hParent, dlgProc, (LPARAM)this); };