This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b077179428dfa5125ee813e8c67931625572ae9d
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Fri Jan 3 01:46:53 2025 +0200
More fpicker Win64 fixes.
Patch by: me
---
.../source/win32/filepicker/WinFileOpenImpl.cxx | 20 ++++++++++----------
.../source/win32/filepicker/WinFileOpenImpl.hxx | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 21aa7966c8..b79eae9b87 100644
--- a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -508,7 +508,7 @@ inline sal_Bool SAL_CALL
CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPIN
LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)
{
- unsigned int lResult = 0;
+ LRESULT lResult = 0;
CWinFileOpenImpl* pImpl =
dynamic_cast<CWinFileOpenImpl*>(getCurrentInstance(hWnd));
@@ -523,7 +523,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
else
lResult = CallWindowProc(
reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
- hWnd,wMessage,wParam,lParam);
+ hWnd,wMessage,wParam,lParam);
}
break;
@@ -553,8 +553,8 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
case WM_NCDESTROY:
// restore the old window proc
- SetWindowLong(hWnd, GWL_WNDPROC,
- reinterpret_cast<LONG>(pImpl->m_pfnOldDlgProc));
+ SetWindowLongPtr(hWnd, GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(pImpl->m_pfnOldDlgProc));
lResult = CallWindowProc(
reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
@@ -654,7 +654,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd,
LPARAM lParam)
//
//-----------------------------------------------------------------
-sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()
+UINT_PTR SAL_CALL CWinFileOpenImpl::onFileOk()
{
m_NonExecuteFilePickerState->reset();
@@ -832,7 +832,7 @@ void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)
// onMessageCommand handler
//-----------------------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(
+UINT_PTR SAL_CALL CWinFileOpenImpl::onCtrlCommand(
HWND, sal_uInt16 ctrlId, sal_uInt16)
{
SetDefaultExtension();
@@ -903,10 +903,10 @@ void
CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)
{
// subclass the dialog window
- m_pfnOldDlgProc =
- reinterpret_cast<WNDPROC>(
- SetWindowLong( hwndDlg, GWL_WNDPROC,
- reinterpret_cast<LONG>(SubClassFunc)));
+ m_pfnOldDlgProc =
+ reinterpret_cast<WNDPROC>(
+ SetWindowLongPtr( hwndDlg, GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(SubClassFunc)));
}
//-----------------------------------------------------------------------------------------
diff --git a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index ed71ef0f93..8022ac2822 100644
--- a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -170,7 +170,7 @@ protected:
virtual bool SAL_CALL preModal( );
virtual void SAL_CALL postModal( sal_Int16 nDialogResult );
- virtual sal_uInt32 SAL_CALL onFileOk();
+ virtual UINT_PTR SAL_CALL onFileOk();
virtual void SAL_CALL onSelChanged( HWND hwndListBox );
// only called back if OFN_EXPLORER is set
@@ -181,7 +181,7 @@ protected:
// call base class method first when overloading
virtual void SAL_CALL onInitDialog( HWND hwndDlg );
- virtual sal_uInt32 SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16
ctrlId, sal_uInt16 notifyCode );
+ virtual UINT_PTR SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16
ctrlId, sal_uInt16 notifyCode );
void onWMSize();
