64-bit fixes

This commit is contained in:
NN 2015-10-04 22:06:39 +03:00
parent 46e6bed223
commit bd54295e15
2 changed files with 5 additions and 3 deletions

View File

@ -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 !!! // Don't touch the following 3 lines, they are cursed !!!
oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC); oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC);
if ((long)oldProc > 0) if ((LONG_PTR)oldProc > 0)
::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc); ::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc);
return FALSE; return FALSE;

View File

@ -137,7 +137,8 @@ public:
return !(a == b); return !(a == b);
}; };
virtual int doDialog() { virtual INT_PTR doDialog()
{
return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUT_DLG), _hParent, dlgProc, (LPARAM)this); return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUT_DLG), _hParent, dlgProc, (LPARAM)this);
}; };
@ -230,7 +231,8 @@ public:
generic_string toString() const; generic_string toString() const;
generic_string toString(int index) const; generic_string toString(int index) const;
int doDialog() { INT_PTR doDialog()
{
return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUTSCINT_DLG), _hParent, dlgProc, (LPARAM)this); return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUTSCINT_DLG), _hParent, dlgProc, (LPARAM)this);
}; };