[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - bridges/source

[Stephan Bergmann]

 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit aa6670764b49a37a82641ae8d9fe77683b820190
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 22 16:47:39 2015 +0200

    MSVC 64-bit: In queryInterface optimization, copy hidden ret val addr
    
    ...to location where privateSnippetExecutor will pick it up to return it from
    RAX.
    
    Change-Id: I59b8db1a12177a3c4da4c810770bee4ace295115
    (cherry picked from commit 04834f4ad1682e7853536ffcdd9b19a9848c4c70)

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index d7f534d..4f1905c 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -332,6 +332,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
                             pInterface->release();
                             TYPELIB_DANGER_RELEASE( pTD );
 
+                            pStack[0] = pStack[3];
                             eRet = typelib_TypeClass_ANY;
                             break;
                         }