Gbuildify winaccessibility service

Conflicts:
winaccessibility/source/UAccCOM/UAccCOM.def
winaccessibility/source/service/AccObjectWinManager.cxx
winaccessibility/source/service/checkmt.cxx
winaccessibility/source/service/checkmt.hxx

Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c

16 files changed, 137 insertions, 44 deletions

diff --git a/Repository.mk b/Repository.mk
index 4c9d362d9185..220d79b35b50 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -558,7 +558,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		$(if $(DISABLE_ATL),,\
 			inprocserv \
 		) \
-		UAccCOM \
+		$(if $(ENABLE_IA2), \
+			UAccCOM \
+			winaccessibility \
+		) \
 	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b18c79b476f5..385cedbca305 100644..100755
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -400,6 +400,8 @@ public:
         createFolderPicker( const com::sun::star::uno::Reference<
                               com::sun::star::uno::XComponentContext >& rServiceManager );
 
+    static bool IsEnableAccessInterface() {return true;}
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 768a8e7fb248..6157e25d1a39 100644..100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -137,8 +137,11 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/win32/simplemail/smplmail \
 		shell/source/win32/syssh \
 		vcl/vcl.windows \
-		$(if $(ENABLE_JAVA), \
-			accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
+		$(if $(ENABLE_IA2), \
+			winaccessibility/source/service/winaccessibility, \
+			$(if $(ENABLE_JAVA), \
+			    accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
+			) \
 		) \
 	) \
 	$(if $(ENABLE_HEADLESS), \
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
index 749be7c23597..b3b91ce3c76c 100755
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -37,21 +37,20 @@ $(eval $(call gb_Library_add_exception_objects,UAccCOM,\
 	winaccessibility/source/UAccCOM/AccHypertext \
 	winaccessibility/source/UAccCOM/AccImage \
 	winaccessibility/source/UAccCOM/AccRelation \
+	winaccessibility/source/UAccCOM/AccTable \
 	winaccessibility/source/UAccCOM/AccText \
+	winaccessibility/source/UAccCOM/AccTextBase \
 	winaccessibility/source/UAccCOM/AccValue \
+	winaccessibility/source/UAccCOM/CheckEnableAccessible \
 	winaccessibility/source/UAccCOM/EnumVariant \
+	winaccessibility/source/UAccCOM/MAccessible \
 	winaccessibility/source/UAccCOM/StdAfx \
 	winaccessibility/source/UAccCOM/UAccCOM \
 	winaccessibility/source/UAccCOM/UNOXWrapper \
 ))
 
-#	winaccessibility/source/UAccCOM/AccTextBase \
-#	winaccessibility/source/UAccCOM/AccTable \
-#	winaccessibility/source/UAccCOM/MAccessible \
-
-#	/DEF:$(SRCDIR)/winaccessibility/source/UAccCOM/UAccCOM.def \
-
 $(eval $(call gb_Library_add_ldflags,UAccCOM,\
+	/DEF:$(SRCDIR)/winaccessibility/source/UAccCOM/UAccCOM.def \
 	-LIBPATH:$(ATL_LIB) \
 	-delayload:$(call gb_Library_get_filename,cppu) \
 	-delayload:$(call gb_Library_get_filename,sal) \
@@ -64,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,UAccCOM,\
 ))
 
 $(eval $(call gb_Library_use_externals,UAccCOM,\
+	boost_headers \
 	icuuc \
 	icui18n \
 ))
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
new file mode 100755
index 000000000000..0f1558c1f6f9
--- /dev/null
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -0,0 +1,81 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#
+
+$(eval $(call gb_Library_Library,winaccessibility))
+
+$(eval $(call gb_Library_use_custom_headers,winaccessibility,winaccessibility/ia2/idl))
+
+$(eval $(call gb_Library_set_include,winaccessibility,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/winaccessibility/inc \
+	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_use_sdk_api,winaccessibility))
+
+$(eval $(call gb_Library_set_componentfile,winaccessibility,winaccessibility/source/service/winaccessibility))
+
+$(eval $(call gb_Library_add_exception_objects,winaccessibility,\
+	winaccessibility/source/service/AccObject \
+	winaccessibility/source/service/ResIDGenerator \
+	winaccessibility/source/service/AccObjectWinManager \
+	winaccessibility/source/service/AccObjectManagerAgent \
+	winaccessibility/source/service/AccEventListener \
+	winaccessibility/source/service/AccComponentEventListener \
+	winaccessibility/source/service/AccContainerEventListener \
+	winaccessibility/source/service/AccDialogEventListener \
+	winaccessibility/source/service/AccFrameEventListener \
+	winaccessibility/source/service/AccWindowEventListener \
+	winaccessibility/source/service/AccMenuEventListener \
+	winaccessibility/source/service/AccTextComponentEventListener \
+	winaccessibility/source/service/AccObjectContainerEventListener \
+	winaccessibility/source/service/AccParagraphEventListener \
+	winaccessibility/source/service/AccDescendantManagerEventListener \
+	winaccessibility/source/service/AccListEventListener \
+	winaccessibility/source/service/AccTableEventListener \
+	winaccessibility/source/service/AccTreeEventListener \
+	winaccessibility/source/service/AccTopWindowListener \
+	winaccessibility/source/service/msaaservice_impl \
+	winaccessibility/source/service/AccResource \
+	winaccessibility/source/service/checkmt \
+))
+
+$(eval $(call gb_Library_use_externals,winaccessibility,\
+	boost_headers \
+))
+
+$(eval $(call gb_Library_use_libraries,winaccessibility,\
+	cppu \
+	cppuhelper \
+    vcl \
+	sal \
+	tk \
+	uwinapi \
+	tl \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,winaccessibility,\
+	oleacc \
+	advapi32 \
+	delayimp \
+	kernel32 \
+	ole32 \
+	oleaut32 \
+	shlwapi \
+	user32 \
+	uuid \
+	gdi32 \
+	shell32 \
+	imm32 \
+	winspool \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk
index e96f9884d1e7..b4945cfa93fa 100755
--- a/winaccessibility/Module_winaccessibility.mk
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,winaccessibility,\
 	WinResTarget_uacccom \
 	CustomTarget_ia2_idl \
 	Library_uacccom \
+	Library_winaccessibility \
 ))
 endif # ENABLE_IA2
 endif # COM=MSC
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index 06801da27187..5978dddddd43 100644..100755
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <cppuhelper/weak.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 class AccObjectManagerAgent;
 using namespace ::com::sun::star::uno;
@@ -45,7 +45,7 @@ protected:
     AccObjectManagerAgent* pAgent;
     //disposed state indicator
     bool  m_isDisposed;
-    mutable ::vos::OMutex aRemoveMutex;
+    mutable ::osl::Mutex aRemoveMutex;
 public:
     AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccEventListener();
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 945e86c44eda..800c9279bffa 100644..100755
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -25,7 +25,7 @@
 #endif
 #include <map>
 #include <windows.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/dllapi.h>
 #include "ResIDGenerator.hxx"
 #include "UAccCOM2.h"
@@ -93,9 +93,9 @@ private:
     AccObjectManagerAgent*   pAgent;
     static AccObjectWinManager* me;
     ResIDGenerator ResIdGen;
-    mutable ::vos::OMutex aDeleteMutex;
-    mutable ::vos::OMutex aNotifyMutex;
-    mutable ::vos::OMutex maATInterfaceMutex;
+    mutable ::osl::Mutex aDeleteMutex;
+    mutable ::osl::Mutex aNotifyMutex;
+    mutable ::osl::Mutex maATInterfaceMutex;
 
     AccObjectWinManager(AccObjectManagerAgent* Agent=NULL);
 
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 178017e62de7..178017e62de7 100644..100755
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 0b3f720379a2..df2a42c7967e 100644..100755
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -188,7 +188,7 @@ void AccEventListener::fireStateFocusdChange(bool enable)
  *  @param state    the state id
  *  @param set      true if state is set, false if state is unset
  */
-void AccEventListener::fireStatePropertyChange(short state, bool set )
+void AccEventListener::fireStatePropertyChange(short /*state*/, bool set )
 {
     if( set )
     {
@@ -231,7 +231,7 @@ void AccEventListener::removeMeFromBroadcaster()
 {
     try
     {
-        vos::OGuard aGuard(aRemoveMutex);
+        osl::MutexGuard aGuard(aRemoveMutex);
         if(m_isDisposed)
             return;
         //get accessible context
@@ -259,7 +259,7 @@ void AccEventListener::removeMeFromBroadcaster()
         if (pBroadcaster != NULL)
         {
             //remove the lister from accessible object
-            pBroadcaster->removeEventListener(this);
+            pBroadcaster->removeAccessibleEventListener(this);
             m_isDisposed = true;
             pAgent->NotifyDestroy(pAccessible);
         }
@@ -274,7 +274,7 @@ void AccEventListener::removeMeFromBroadcaster()
 /**
  *  this method is invoked before listener is disposed
  */
-void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& Source )
+void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
     removeMeFromBroadcaster();
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index c3627e3dc951..a57fc3c52ba8 100644..100755
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -33,7 +33,8 @@ using namespace com::sun::star::accessibility;
 #include <vcl/window.hxx>
 #include <toolkit/awt/Vclxwindow.hxx>
 
-#ifndef _SV_SYSDATA_HXX
+//#ifndef _SV_SYSDATA_HXX
+#if 0
 #if defined( WIN ) || defined( WNT ) || defined( OS2 )
 typedef sal_Int32 HWND;
 typedef sal_Int32 HMENU;
@@ -42,9 +43,9 @@ typedef void *PVOID;
 typedef PVOID HANDLE;
 typedef HANDLE HFONT;
 #endif
-#include <vcl/sysdata.hxx>
 #endif
-
+#include <vcl/sysdata.hxx>
+//#endif
 
 AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
@@ -115,7 +116,8 @@ void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
             const SystemEnvData* systemdata=window->GetSystemData();
 
             //add this child
-            pAgent->InsertAccObj( pAcc,pAccessible,(HWND)systemdata->hWnd);
+            //TODO(davido): FixMe
+            pAgent->InsertAccObj( pAcc,pAccessible,(long)(HWND)systemdata->hWnd);
             //add all oldValue's existing children
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 84a7456ac740..4ed41d68c7a7 100644..100755
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -133,7 +133,7 @@ AccObjectWinManager::~AccObjectWinManager()
 
 long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
 {
-    vos::OGuard localGuard(maATInterfaceMutex);//
+    osl::MutexGuard localGuard(maATInterfaceMutex);//
 
     IMAccessible* pRetIMAcc = NULL;
 
@@ -215,7 +215,7 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd)
    */
 sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state)
 {
-    vos::OGuard aGuard(aNotifyMutex);
+    osl::MutexGuard aGuard(aNotifyMutex);
 
     if (!IsInMainThread())
     {
@@ -563,7 +563,7 @@ void AccObjectWinManager::DeleteFromHwndXAcc(XAccessible* pXAcc )
    */
 void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
 {
-    vos::OGuard aGuard( aDeleteMutex );
+    osl::MutexGuard aGuard( aDeleteMutex );
     AccObject* currentObj=NULL;
     AccObject* childObj=NULL;
     XAccessible* pTmpXAcc=NULL;
@@ -592,7 +592,7 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
    */
 void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc )
 {
-    vos::OGuard aGuard( aDeleteMutex );
+    osl::MutexGuard aGuard( aDeleteMutex );
     if( pXAcc == NULL )
         return;
     XIdToAccObjHash::iterator temp = XIdAccList.find(pXAcc);
@@ -792,7 +792,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
             static_cast< XAccessibleEventListener* >(listener),UNO_QUERY );
         if(pp.is())
         {
-            broadcaster->addEventListener(pp);
+            broadcaster->addAccessibleEventListener(pp);
         }
         else
         {
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 7e1de22e9c63..28d2b7930ead 100644..100755
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -23,7 +23,8 @@
 #include <vcl/window.hxx>
 #include <toolkit/awt/Vclxwindow.hxx>
 
-#ifndef _SV_SYSDATA_HXX
+//#ifndef _SV_SYSDATA_HXX
+#if 0
 #if defined( WIN ) || defined( WNT ) || defined( OS2 )
 typedef sal_Int32 HWND;
 typedef sal_Int32 HMENU;
@@ -32,8 +33,8 @@ typedef void *PVOID;
 typedef PVOID HANDLE;
 typedef HANDLE HFONT;
 #endif
-#include <vcl/sysdata.hxx>
 #endif
+#include <vcl/sysdata.hxx>
 
 #include "AccTopWindowListener.hxx"
 #include "unomsaaevent.hxx"
@@ -105,7 +106,7 @@ void AccTopWindowListener::handleWindowOpened( com::sun::star::accessibility::XA
     //Only AccessibleContext exist, add all listeners
     if(pAccessibleContext != NULL && systemdata != NULL)
     {
-        accManagerAgent.SaveTopWindowHandle((HWND)systemdata->hWnd,  pAccessible);
+      accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd,  pAccessible);
 
         AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd);
 
@@ -181,7 +182,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
         return;
     }
 
-    accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,pWND );
+    accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,(long)(HWND)pWND );
 
     if (!accManagerAgent.IsContainer(pAccessible))
     {
@@ -220,7 +221,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
     }
 }
 
-void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
 {
 }
 
diff --git a/winaccessibility/source/service/checkmt.cxx b/winaccessibility/source/service/checkmt.cxx
index f5e89aa86f15..ad0f2b770647 100644..100755
--- a/winaccessibility/source/service/checkmt.cxx
+++ b/winaccessibility/source/service/checkmt.cxx
@@ -22,13 +22,13 @@
 
 bool IsInMainThread()
 {
-    if( Application::GetMainThreadIdentifier() == ::vos::OThread::getCurrentIdentifier())
+    if( Application::GetMainThreadIdentifier() == osl::Thread::getCurrentIdentifier())
         return true;
     else
         return false;
 }
 
-vos::IMutex& GetSolarMutex()
+comphelper::SolarMutex& GetSolarMutex()
 {
     return Application::GetSolarMutex();
 }
diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx
index c70f380b0286..bc5b757a7a8c 100644..100755
--- a/winaccessibility/source/service/checkmt.hxx
+++ b/winaccessibility/source/service/checkmt.hxx
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <vos/mutex.hxx>
+#include "comphelper/solarmutex.hxx"
 
 bool IsInMainThread();
 
-vos::IMutex&  GetSolarMutex();
+comphelper::SolarMutex& GetSolarMutex();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index c51b79bc36e4..860606908e4b 100644..100755
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -49,11 +49,11 @@ extern void handleWindowOpened_impl( long pAcc);
 namespace my_sc_impl
 {
 
-extern Sequence< OUString > SAL_CALL  getSupportedServiceNames_MSAAServiceImpl();
-extern OUString SAL_CALL getImplementationName_MSAAServiceImpl();
-extern Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
-        Reference< XComponentContext > const & xContext )
-    SAL_THROW( () );
+  //extern Sequence< OUString > SAL_CALL  getSupportedServiceNames_MSAAServiceImpl();
+  //static OUString SAL_CALL getImplementationName_MSAAServiceImpl();
+  //static Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
+  //      Reference< XComponentContext > const & xContext )
+  //  SAL_THROW( () );
 /**
    * Method that returns the service name.
    * @param
@@ -272,12 +272,12 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
 
 extern "C"
 {
-    void SAL_CALL component_getImplementationEnvironment(
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
         sal_Char const ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
     {
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
-    void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
         registry::XRegistryKey * xRegistry )
     {