[Libreoffice-commits] core.git: include/sal toolkit/source vcl/win

Thorsten Behrens Thorsten.Behrens at CIB.de
Fri May 4 00:47:22 UTC 2018


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

New commits:
commit bb2443cc18d43860faafc852a5bfc5d446a7b6b3
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
    Reviewed-on: https://gerrit.libreoffice.org/53777
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0f8927cc89ff..488f4d6c0232 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -462,6 +462,7 @@ 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
 @li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.gtk3
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index d85def1007e7..45c7d1dcdc62 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -269,6 +269,8 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks, void*, void)
 {
     const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
 
+    SAL_INFO("toolkit.controls", "OnProcessCallbacks grabbing solarmutex");
+
     // work on a copy of the callback array
     CallbackArray aCallbacksCopy;
     {
@@ -287,6 +289,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks, void*, void)
     }
 
     {
+        SAL_INFO("toolkit.controls", "OnProcessCallbacks relinquished solarmutex");
         SolarMutexReleaser aReleaseSolar;
         for (   CallbackArray::const_iterator loop = aCallbacksCopy.begin();
                 loop != aCallbacksCopy.end();
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index a33b7e1bd683..c0bd18f85627 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -582,6 +582,8 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b
     WinSalInstance *pInst = GetSalData()->mpInstance;
     WinSalTimer *const pTimer = static_cast<WinSalTimer*>( ImplGetSVData()->maSchedCtx.mpSalTimer );
 
+SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" << wParam << ", lParam=" << lParam << ")");
+
     switch ( nMsg )
     {
         case SAL_MSG_THREADYIELD:
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 7dfe3c0a573d..864c0dd45f03 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5437,6 +5437,8 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
     static bool  bInWheelMsg = false;
     static bool  bInQueryEnd = false;
 
+    SAL_INFO("vcl.gdi.wndproc", "SalFrameWndProc(nMsg=" << nMsg << ", wParam=" << wParam << ", lParam=" << lParam << ")");
+
     // By WM_CREATE we connect the frame with the window handle
     if ( nMsg == WM_CREATE )
     {


More information about the Libreoffice-commits mailing list