Skip to content

Win64 bridge backport #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leginee wants to merge 2 commits into
base: trunk
Choose a base branch
from
+19 −8
Open

Win64 bridge backport #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c969c40
bridges/msvc_win64: pass simple argument values, not the temp's address
leginee Jul 27, 2026
a59e4e8
bridges/msvc_win64: return queryInterface's Any in the hidden return …
leginee Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,18 @@ extern "C" typelib_TypeClass cpp_vtable_call(

if ( pInterface )
{
::uno_any_construct( reinterpret_cast<uno_Any *>( pCallStack[1] ),
// pCallStack is "ret addr, this, [ret *], params", so the
// hidden return buffer is [2]; [1] is `this`. Writing the
// Any to [1] overwrote the proxy object and left the
// caller's return buffer untouched, so the caller then
// destructed an uninitialised Any.
::uno_any_construct( reinterpret_cast<uno_Any *>( pCallStack[2] ),
&pInterface, pTD, cpp_acquire );

pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );

reinterpret_cast<void **>( pRegisterReturn )[0] = pCallStack[1];
reinterpret_cast<void **>( pRegisterReturn )[0] = pCallStack[2];
eRet = typelib_TypeClass_ANY;
break;
}
Expand Down
18 changes: 12 additions & 6 deletions main/bridges/source/cpp_uno/msvc_win64_x86-64/uno2cpp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,29 +105,34 @@ static void cpp_call(
uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
pThis->getBridge()->getUno2Cpp() );

// pCppArgs[nPos] is the alloca(8) temp above, i.e. a POINTER to the
// converted value -- the value is *pCppArgs[nPos]. Using
// &pCppArgs[nPos] would read the array slot instead, passing the
// temp's address as the argument. (That form is correct only in the
// complex/ref branch below, where the pointer IS the argument.)
switch (pParamTypeDescr->eTypeClass)
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
*pStack++ = *(sal_uInt64*)&pCppArgs[nPos];
*pStack++ = *(sal_uInt64*)pCppArgs[nPos];
break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM:
*pStack++ = *(sal_uInt32*)&pCppArgs[nPos];
*pStack++ = *(sal_uInt32*)pCppArgs[nPos];
break;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT:
case typelib_TypeClass_CHAR:
*pStack++ = *(sal_uInt16*)&pCppArgs[nPos];
*pStack++ = *(sal_uInt16*)pCppArgs[nPos];
break;
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
*pStack++ = *(sal_uInt8*)&pCppArgs[nPos];
*pStack++ = *(sal_uInt8*)pCppArgs[nPos];
break;
case typelib_TypeClass_FLOAT:
case typelib_TypeClass_DOUBLE:
*pStack++ = *(sal_uInt64*)&pCppArgs[nPos]; // verbatim!
*pStack++ = *(sal_uInt64*)pCppArgs[nPos]; // verbatim!
break;
default:
break;
Expand Down Expand Up @@ -164,7 +169,8 @@ static void cpp_call(
// no longer needed
TYPELIB_DANGER_RELEASE( pParamTypeDescr );
}
*pStack++ = *(sal_uInt64*)&pCppArgs[nPos];
// here the POINTER is the argument (complex value passed by ref)
*pStack++ = (sal_uInt64)pCppArgs[nPos];
}
}

Expand Down
Loading