[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests vcl/win

[Michael Stahl]

 qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java |    4 +++-
 vcl/win/source/window/salframe.cxx                        |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c94cf0cf5f10edb45a74a58c95c306b0d271645b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 19 12:12:55 2015 +0100

    qadevOOo: sadly XToolkit::processEventsToIdle doesn't fix...
    
    ... the ScAccessiblePreviewTable test, somehow the event still doesn't
    fire in time, let's add an arbitrary sleep too.
    
    Change-Id: I97ab658e61b33455e8623ba0fd861e2018aa3af6

diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index 7844b3c..fece4f3d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -178,9 +178,11 @@ public class ScAccessiblePreviewTable extends TestCase {
                             // but some toolbar button - this will indirectly
                             // trigger a table event but only from VCL main loop
                             utils.waitForEventIdle(Param.getMSF());
+                            // sadly it turns out that idle is not enough...
+                            Thread.sleep(500);
                         } catch (com.sun.star.lang.IndexOutOfBoundsException ibe) {
                             log.println("ScAccessiblePreviewTable: IndexOutOfBoundsException from pressZoom.doAccessibleAction(0)");
-                        }
+                        } catch (InterruptedException ex) {}
                 }
             });
 
commit fdd958b8a3f3bda0b39959cb4ac3184ae232e279
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 18 22:59:13 2015 +0100

    vcl: reorder loop to avoid DrMemory warning
    
    DrMemory 1.9.0-4 32-bit complains about UNINITIALIZED READ on the
    instruction "test %ecx %ecx" corresponding to the *pW test in the while
    loop, on the last iteration.
    
    GetKeyNameTextW() is documented to null-terminate the buffer, so either
    it has a bug and doesn't do that, or DrMemory has a bug and falsely
    reports an error.
    
    Either way it can be avoided by checking the end position first.
    
    https://github.com/DynamoRIO/drmemory/issues/1819
    
    Change-Id: I546d2057d39865d527c1d7c436f690669b214d75

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 697efae..4b873a9 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2346,7 +2346,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
         if( nKeyLen > 0 )
         {
             WCHAR *pW = aKeyBuf, *pE = aKeyBuf + nKeyLen;
-            while( *pW && (pW < pE) && (rCount < nMaxSize) )
+            while ((pW < pE) && *pW && (rCount < nMaxSize))
                 pBuf[rCount++] = *pW++;
         }
         else // fall back to provided default name