GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix passing object reference as out parameter in scripting method invoke

Browse Source
This commit is contained in:
Wojtek Figat
2024-11-18 19:00:01 +01:00
parent a839cf796b
commit c0a99688f9
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Scripting/BinaryModule.cpp
View File

@@ -1264,6 +1264,7 @@ bool ManagedBinaryModule::InvokeMethod(void* method, const Variant& instance, Sp
// Marshal parameters // Marshal parameters
void** params = (void**)alloca(parametersCount * sizeof(void*)); void** params = (void**)alloca(parametersCount * sizeof(void*));
void** outParams = nullptr;
bool failed = false; bool failed = false;
bool hasOutParams = false; bool hasOutParams = false;
for (int32 paramIdx = 0; paramIdx < parametersCount; paramIdx++) for (int32 paramIdx = 0; paramIdx < parametersCount; paramIdx++)
@@ -1280,6 +1281,14 @@ bool ManagedBinaryModule::InvokeMethod(void* method, const Variant& instance, Sp
LOG(Error, "Failed to marshal parameter {5}:{4} of method '{0}.{1}' (args count: {2}), value type: {6}, value: {3}", String(mMethod->GetParentClass()->GetFullName()), String(mMethod->GetName()), parametersCount, paramValue, MCore::Type::ToString(paramType), paramIdx, paramValue.Type); LOG(Error, "Failed to marshal parameter {5}:{4} of method '{0}.{1}' (args count: {2}), value type: {6}, value: {3}", String(mMethod->GetParentClass()->GetFullName()), String(mMethod->GetName()), parametersCount, paramValue, MCore::Type::ToString(paramType), paramIdx, paramValue.Type);
return true; return true;
} }
if (isOut && MCore::Type::IsReference(paramType) && MCore::Type::GetType(paramType) == MTypes::Object)
{
// Object passed as out param so pass pointer to the value storage for proper marshalling
if (!outParams)
outParams = (void**)alloca(parametersCount * sizeof(void*));
outParams[paramIdx] = params[paramIdx];
params[paramIdx] = &outParams[paramIdx];
}
} }
// Invoke the method // Invoke the method
@@ -1344,6 +1353,13 @@ bool ManagedBinaryModule::InvokeMethod(void* method, const Variant& instance, Sp
} }
break; break;
} }
default:
{
MType* paramType = mMethod->GetParameterType(paramIdx);
if (MCore::Type::IsReference(paramType) && MCore::Type::GetType(paramType) == MTypes::Object)
paramValue = MUtils::UnboxVariant((MObject*)outParams[paramIdx]);
break;
}
} }
} }
} }