summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-22 16:47:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-22 16:51:07 +0200
commitaa6670764b49a37a82641ae8d9fe77683b820190 (patch)
tree6feacdecf5710bd74b95caa45ba8175a6c176463 /bridges
parentb076c015083caaee79a43dc87e6cbf017e27ceae (diff)
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)
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx1
1 files changed, 1 insertions, 0 deletions
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 d7f534d2e015..4f1905c6361b 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;
}