g | 18 +++++++++---------
vcl/source/window/window.cxx | 4 ++++
vcl/win/gdi/salvd.cxx | 1 +
vcl/win/window/salframe.cxx | 10 ++++++++++
4 files changed, 24 insertions(+), 9 deletions(-)
New commits:
commit 89612b363f3f11248beea6fa98071c80e8ea7a9c
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue May 31 14:38:02 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 31 14:41:20 2022 +0200
vcl: add some WinSalGraphics debug logging
Change-Id: I70f96bef0db4d40b70e08426779435f75b0241fa
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9a5a6cde533b..cbd93e3e44bf 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -86,6 +86,7 @@ Window::Window( WindowType nType )
: OutputDevice(OUTDEV_WINDOW)
, mpWindowImpl(new WindowImpl( nType ))
{
+ SAL_INFO("vcl.temp", "Window::Window: " << this);
// true: this outdev will be mirrored if RTL window layout (UI mirroring)
is globally active
mbEnableRTL = AllSettings::GetLayoutRTL();
}
@@ -94,6 +95,7 @@ Window::Window( vcl::Window* pParent, WinBits nStyle )
: OutputDevice(OUTDEV_WINDOW)
, mpWindowImpl(new WindowImpl( WindowType::WINDOW ))
{
+ SAL_INFO("vcl.temp", "Window::Window: " << this);
// true: this outdev will be mirrored if RTL window layout (UI mirroring)
is globally active
mbEnableRTL = AllSettings::GetLayoutRTL();
@@ -140,6 +142,7 @@ bool Window::IsDisposed() const
void Window::dispose()
{
+ SAL_INFO("vcl.temp", "Window::dispose: " << this << " mpFrame " <<
(mpWindowImpl ? mpWindowImpl->mpFrame : nullptr));
assert( mpWindowImpl );
assert( !mpWindowImpl->mbInDispose ); // should only be called from
disposeOnce()
assert( (!mpWindowImpl->mpParent ||
@@ -1037,6 +1040,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits
nStyle, SystemParentData* p
pFrame = pSVData->mpDefInst->CreateChildFrame( pSystemParentData,
nFrameStyle | SalFrameStyleFlags::PLUG );
else
pFrame = pSVData->mpDefInst->CreateFrame( pParentFrame,
nFrameStyle );
+ SAL_INFO("vcl.temp", "Window::ImplInit: " << this << " pFrame " <<
pFrame);
if ( !pFrame )
{
// do not abort but throw an exception, may be the current thread
terminates anyway (plugin-scenario)
diff --git a/vcl/win/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx
index d06412bc6743..b506fd4ea5cc 100644
--- a/vcl/win/gdi/salvd.cxx
+++ b/vcl/win/gdi/salvd.cxx
@@ -124,6 +124,7 @@ std::unique_ptr<SalVirtualDevice>
WinSalInstance::CreateVirtualDevice( SalGraphi
WinSalGraphics* pVirGraphics = new
WinSalGraphics(WinSalGraphics::VIRTUAL_DEVICE,
pGraphics->isScreen(),
nullptr, pVDev);
+ SAL_INFO("vcl.temp", "new WinSalGraphics: " << pVirGraphics << " for " <<
pVDev);
// by default no! mirroring for VirtualDevices, can be enabled with
EnableRTL()
pVirGraphics->SetLayout( SalLayoutFlags::NONE );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index dd5f8fbb8533..aed15def4240 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -828,6 +828,7 @@ void SetForegroundWindow_Impl(HWND hwnd)
WinSalFrame::WinSalFrame()
{
+ SAL_INFO("vcl.temp", "new WinSalFrame: " << this);
SalData* pSalData = GetSalData();
mhWnd = nullptr;
@@ -929,6 +930,7 @@ bool WinSalFrame::ReleaseFrameGraphicsDC( WinSalGraphics*
pGraphics )
WinSalFrame::~WinSalFrame()
{
+ SAL_INFO("vcl.temp", "del WinSalFrame: " << this);
SalData* pSalData = GetSalData();
if( mpClipRgnData )
@@ -945,6 +947,7 @@ WinSalFrame::~WinSalFrame()
if ( mpThreadGraphics )
{
ReleaseFrameGraphicsDC( mpThreadGraphics );
+ SAL_INFO("vcl.temp", "del WinSalGraphics: " << mpThreadGraphics << "
on " << this);
delete mpThreadGraphics;
mpThreadGraphics = nullptr;
}
@@ -953,6 +956,7 @@ WinSalFrame::~WinSalFrame()
if ( mpLocalGraphics )
{
ReleaseFrameGraphicsDC( mpLocalGraphics );
+ SAL_INFO("vcl.temp", "del WinSalGraphics: " << mpLocalGraphics << " on
" << this);
delete mpLocalGraphics;
mpLocalGraphics = nullptr;
}
@@ -1028,7 +1032,10 @@ SalGraphics* WinSalFrame::AcquireGraphics()
return nullptr;
if ( !mpThreadGraphics )
+ {
mpThreadGraphics = new WinSalGraphics(WinSalGraphics::WINDOW,
true, mhWnd, this);
+ SAL_INFO("vcl.temp", "new WinSalGraphics: " << mpThreadGraphics <<
" on " << this);
+ }
pGraphics = mpThreadGraphics;
assert( !pGraphics->getHDC() );
hDC = reinterpret_cast<HDC>(static_cast<sal_IntPtr>(SendMessageW(
pSalData->mpInstance->mhComWnd,
@@ -1037,7 +1044,10 @@ SalGraphics* WinSalFrame::AcquireGraphics()
else
{
if ( !mpLocalGraphics )
+ {
mpLocalGraphics = new WinSalGraphics(WinSalGraphics::WINDOW, true,
mhWnd, this);
+ SAL_INFO("vcl.temp", "new WinSalGraphics: " << mpLocalGraphics <<
" on " << this);
+ }
pGraphics = mpLocalGraphics;
hDC = pGraphics->getHDC();
if ( !hDC )
commit ba87b31c6b1e5a78b26389c9f3e5f3e78093b92e
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon May 30 21:30:04 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 31 14:41:20 2022 +0200
g: we are not, in fact, in the BUILDDIR
For an out-of-tree build, "make fetch" poinlessly clones all git
submodules.
Change-Id: If4afb218946f49ba934f68b35806fd8143c39387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit aa8ef74b475a6fbd6e4ec27c42941aa274998df6)
diff --git a/g b/g
index 746babe23539..dd95b737d492 100755
--- a/g
+++ b/g
@@ -10,9 +10,9 @@ fi
SUBMODULES_ALL="dictionaries helpcontent2 translations"
pushd $(dirname $0) > /dev/null
-if [ -f config_host.mk ] ; then
- # we are in the BUILDDIR
- SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
+if [ -f ${BUILDDIR}/config_host.mk ] ; then
+ # we are in the SRCDIR
+ SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e
"s/.*=//")
else
SRC_ROOT=$(pwd)
fi
@@ -138,8 +138,8 @@ get_active_submodules()
get_configured_submodules()
{
SUBMODULES_CONFIGURED=""
- if [ -f config_host.mk ] ; then
- SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES
| sed -e "s/.*=//")
+ if [ -f ${BUILDDIR}/config_host.mk ] ; then
+ SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a
GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
else
# if we need the configured submodule before the configuration is
done. we assumed you want them all
SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -149,12 +149,12 @@ get_configured_submodules()
get_git_reference()
{
REFERENCED_GIT=""
- if [ -f config_host.mk ]; then
- REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e
"s/.*=//")
+ if [ -f ${BUILDDIR}/config_host.mk ]; then
+ REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a
GIT_REFERENCE_SRC | sed -e "s/.*=//")
fi
LINKED_GIT=""
- if [ -f config_host.mk ]; then
- LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
+ if [ -f ${BUILDDIR}/config_host.mk ]; then
+ LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed
-e "s/.*=//")
fi
}
