[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeOssFuzz.conf vcl/opengl

[Caolán McNamara]

 distro-configs/LibreOfficeOssFuzz.conf |    5 +++--
 vcl/opengl/win/gdiimpl.cxx             |    5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2109e7d9a0d3dab172961ec19e75da1fa8a6cc61
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 8 13:40:34 2016 +0000

    the return from ImplInit *is* checked
    
    bool WinOpenGLContext::init(HDC hDC, HWND hWnd)
    {
    ... return ImplInit();
    }
    
    rtl::Reference<OpenGLContext> WinOpenGLSalGraphicsImpl::CreateWinContext()
    {
    ... if (!xContext->init(mrWinParent.mhLocalDC, mrWinParent.mhWnd))
    }
    
    etc.
    
    Another problem here is ...
    
    "If we notice that OpenGL is broken the first time being called, it is not too
    late to call disableOpenGLAndTerminateForRestart(). The first time this will be
    called is from displaying the splash screen"
    
    isn't true when the first start causes opengl to be disabled, then on subsequent
    starts you can enter this function from launching an opengl slide transition.
    
    (note opengl is disabled if opengl is < 30, so all the versioning checks the
    slide transitions do is probably pointless now. The only actually useful use
    of opengl we have seems to be somewhat unloved)
    
    Change-Id: I1e159f826447520f39ea063fd4c0c83220b1385f

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 6215c4c..3f5da83 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -473,9 +473,8 @@ bool compiledShaderBinariesWork()
 
 bool WinOpenGLContext::ImplInit()
 {
-    // Failures here typically means that OpenGL can't be used. Returning false is fairly pointless
-    // as the calling code doesn't even check, but oh well. If we notice that OpenGL is broken the
-    // first time being called, it is not too late to call
+    // Failures here typically means that OpenGL can't be used.
+    // If we notice that OpenGL is broken the first time being called, it is not too late to call
     // disableOpenGLAndTerminateForRestart(). The first time this will be called is from displaying
     // the splash screen, so if OpenGL is broken, it is "early enough" for us to be able to disable
     // OpenGL and terminate bluntly with EXITHELPER_NORMAL_RESTART, thus causing the wrapper process
commit b42225d5d11a78e186797d9753ff40867f6b678a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 8 11:44:13 2016 +0000

    oss-fuzz: disable-gui now works
    
    Change-Id: I8c9349299e67532c60fcd1e887fc0e33e45a29b8

diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
index 652eb83..cf911a6 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -1,11 +1,12 @@
 --enable-fuzzers
+--disable-gui
+--disable-gtk
+--disable-gtk3
 --disable-postgresql-sdbc
 --disable-firebird-sdbc
 --disable-coinmp
 --disable-lpsolve
 --disable-gltf
---disable-gtk
---disable-gtk3
 --disable-gio
 --disable-dconf
 --disable-collada