6 files changed, 24 insertions, 17 deletions
diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl b/offapi/com/sun/star/accessibility/XMSAAService.idl
index 54c12d3048b6..3b9773e129b6 100755..100644
--- a/offapi/com/sun/star/accessibility/XMSAAService.idl
+++ b/offapi/com/sun/star/accessibility/XMSAAService.idl
@@ -39,9 +39,9 @@ interface XMSAAService : ::com::sun::star::uno::XInterface
 
         @see AccessibleContext
     */
-    long getAccObjectPtr ([in] long hWnd, [in] long lParam, [in] long wParam);
+    hyper getAccObjectPtr([in] hyper hWnd, [in] hyper lParam, [in] hyper wParam);
 
-    void handleWindowOpened ([in] long i);
+    void handleWindowOpened([in] hyper i);
 };
 
 }; }; }; };
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 046e83e9cd23..2b2055822b02 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -103,7 +103,7 @@ public:
 
     sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 );
 
-    long Get_ToATInterface( HWND hWnd, long lParam, long wParam);
+    LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
 
     void  DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
     void  IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
diff --git a/winaccessibility/inc/g_msacc.hxx b/winaccessibility/inc/g_msacc.hxx
index d700249a9bb3..9f851bf42622 100644
--- a/winaccessibility/inc/g_msacc.hxx
+++ b/winaccessibility/inc/g_msacc.hxx
@@ -21,8 +21,8 @@
 #define __G_MSACC_HXX
 
 extern void FreeTopWindowListener();
-extern void handleWindowOpened_impl( long pAcc );
-extern long GetMSComPtr( long hWnd, long lParam, long wParam );
+extern void handleWindowOpened_impl(sal_Int64 pAcc);
+extern sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
 
 extern AccTopWindowListener* g_pTop;
 
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 0a84c38da2b5..88d31a8b0567 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -63,11 +63,12 @@ AccObjectWinManager* AccObjectWinManager::me = NULL;
    * @param
    * @return  Com interface.
    */
-long GetMSComPtr(long hWnd, long lParam, long wParam)
+sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
 {
-    if( g_acc_manager )
-        return (long)g_acc_manager->Get_ToATInterface(HWND((void*)hWnd),lParam,wParam );
-    return NULL;
+    if (!g_acc_manager)
+        return 0;
+    return static_cast<sal_Int64>(g_acc_manager->Get_ToATInterface(
+            static_cast<HWND>(reinterpret_cast<void*>(hWnd)), lParam, wParam));
 }
 
 /**
@@ -132,7 +133,8 @@ AccObjectWinManager::~AccObjectWinManager()
    * @return Com interface with event.
    */
 
-long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
+LRESULT
+AccObjectWinManager::Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam)
 {
     IMAccessible* pRetIMAcc = NULL;
 
@@ -150,7 +152,7 @@ long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam
     if ( pRetIMAcc && lParam == OBJID_CLIENT )
     {
         IAccessible* pTemp = dynamic_cast<IAccessible*>( pRetIMAcc );
-        HRESULT result = LresultFromObject(IID_IAccessible, wParam, pTemp);
+        LRESULT result = LresultFromObject(IID_IAccessible, wParam, pTemp);
         pTemp->Release();
         return result;
     }
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 87b4b9f7e1db..7900bf6c36f7 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -59,10 +59,12 @@ void FreeTopWindowListener()
 /**
  *  As a global method to invoke the handleWindowOpened() method
  */
-void handleWindowOpened_impl(long pAcc)
+void handleWindowOpened_impl(sal_Int64 pAcc)
 {
     if( g_pTop && pAcc != 0 )
-        g_pTop->HandleWindowOpened( (com::sun::star::accessibility::XAccessible*)((void*)pAcc) );
+        g_pTop->HandleWindowOpened(
+            static_cast<com::sun::star::accessibility::XAccessible*>(
+                reinterpret_cast<void*>(pAcc)));
 }
 
 /**
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 6b27c9a913fc..b68efde7366c 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -80,8 +80,9 @@ public:
     virtual void SAL_CALL removeEventListener( const ::css::uno::Reference< ::css::lang::XEventListener >& ) { /* dummy */ }
 
     // XMSAAService
-    virtual sal_Int32 SAL_CALL getAccObjectPtr (long hWnd, long lParam, long wParam);
-    virtual void SAL_CALL handleWindowOpened(sal_Int32);
+    virtual sal_Int64 SAL_CALL getAccObjectPtr(
+            sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
+    virtual void SAL_CALL handleWindowOpened(sal_Int64);
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName();
@@ -112,7 +113,9 @@ void MSAAServiceImpl::initialize( Sequence< Any > const & args ) throw (Exceptio
    * @param
    * @return Com interface.
    */
-sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam) throw (RuntimeException)
+sal_Int64 MSAAServiceImpl::getAccObjectPtr(
+        sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
+throw (RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -125,7 +128,7 @@ sal_Int32 MSAAServiceImpl::getAccObjectPtr ( long hWnd, long lParam, long wParam
    * @param
    * @return
    */
-void MSAAServiceImpl::handleWindowOpened( sal_Int32 nAcc)
+void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
 {
     SolarMutexGuard g;