[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - framework/source include/sal toolkit/source vcl/win

[Thorsten Behrens]

 framework/source/dispatch/dispatchprovider.cxx |    1 +
 include/sal/log-areas.dox                      |    2 ++
 toolkit/source/awt/vclxwindow.cxx              |    3 +++
 vcl/win/source/app/salinst.cxx                 |    2 ++
 vcl/win/source/window/salframe.cxx             |    2 ++
 5 files changed, 10 insertions(+)

New commits:
commit 763669aebf9b93ca8237445d06736f7b0afb27d0
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Feb 1 03:29:18 2017 +0100

    logging: add some strategic places around vcl messages
    
    Change-Id: I3eb1076a0dd697ceb3b4310444542f324848b358

diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 949b65d..0bcfc64 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -542,6 +542,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     SolarMutexGuard g;
                     if ( ! m_xMenuDispatcher.is() )
                     {
+                        SAL_INFO("fwk.dispatch", "setting MenuDispatcher");
                         MenuDispatcher* pDispatcher = new MenuDispatcher( m_xContext, xOwner );
                         m_xMenuDispatcher = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 99282a5..5316fa3 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -391,6 +391,8 @@ certain functionality.
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
+ at li @c vcl.gdi.wndproc - Windows Procedure part of VCL
+ at li @c vcl.gdi.opengl - the GDI part of VCL using opengl
 @li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.harfbuzz - HarfBuzz text layout
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index f315f99..716a9c0 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -275,6 +275,8 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
 {
     const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
 
+    SAL_INFO("toolkit.controls", "OnProcessCallbacks grabbing solarmutex");
+
     // work on a copy of the callback array
     CallbackArray aCallbacksCopy;
     {
@@ -293,6 +295,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
     }
 
     {
+        SAL_INFO("toolkit.controls", "OnProcessCallbacks relinquished solarmutex");
         SolarMutexReleaser aReleaseSolar;
         for (   CallbackArray::const_iterator loop = aCallbacksCopy.begin();
                 loop != aCallbacksCopy.end();
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 48d6655..9e238bf 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -664,6 +664,8 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, i
 {
     LRESULT nRet = 0;
 
+    SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" << wParam << ", lParam=" << lParam << ")");
+
     switch ( nMsg )
     {
         case SAL_MSG_PRINTABORTJOB:
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 07505d4..55d6d9f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5483,6 +5483,8 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
     static int  bInWheelMsg = FALSE;
     static int  bInQueryEnd = FALSE;
 
+    SAL_INFO("vcl.gdi.wndproc", "SalFrameWndProc(nMsg=" << nMsg << ", wParam=" << wParam << ", lParam=" << lParam << ")");
+
     // By WM_CRETAE we connect the frame with the window handle
     if ( nMsg == WM_CREATE )
     {