diff options
| author | Liam <byteslice@airmail.cc> | 2024-01-26 03:12:44 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2024-01-26 04:18:37 +0100 |
| commit | 431df5ae931b1b0229bdabd5855ee148a3baf001 (patch) | |
| tree | bbd1986098644ad323da6977d8a8b7ec197975be /src/core/hle/service/cmif_serialization.h | |
| parent | Merge pull request #12759 from liamwhite/mp-misc (diff) | |
| download | yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar.gz yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar.bz2 yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar.lz yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar.xz yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.tar.zst yuzu-431df5ae931b1b0229bdabd5855ee148a3baf001.zip | |
Diffstat (limited to 'src/core/hle/service/cmif_serialization.h')
| -rw-r--r-- | src/core/hle/service/cmif_serialization.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/cmif_serialization.h b/src/core/hle/service/cmif_serialization.h index 8e8cf2507..84b736155 100644 --- a/src/core/hle/service/cmif_serialization.h +++ b/src/core/hle/service/cmif_serialization.h @@ -150,7 +150,7 @@ void ReadInArgument(CallArguments& args, const u8* raw_data, HLERequestContext& return ReadInArgument<Domain, MethodArguments, CallArguments, ArgAlign, ArgEnd, HandleIndex, InBufferIndex, OutBufferIndex, true, ArgIndex + 1>(args, raw_data, ctx, temp); } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InCopyHandle) { - std::get<ArgIndex>(args) = std::move(ctx.GetObjectFromHandle<typename ArgType::Type>(ctx.GetCopyHandle(HandleIndex))); + std::get<ArgIndex>(args) = ctx.GetObjectFromHandle<typename ArgType::Type>(ctx.GetCopyHandle(HandleIndex)).GetPointerUnsafe(); return ReadInArgument<Domain, MethodArguments, CallArguments, PrevAlign, DataOffset, HandleIndex + 1, InBufferIndex, OutBufferIndex, RawDataFinished, ArgIndex + 1>(args, raw_data, ctx, temp); } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InLargeData) { @@ -253,11 +253,11 @@ void WriteOutArgument(CallArguments& args, u8* raw_data, HLERequestContext& ctx, return WriteOutArgument<Domain, MethodArguments, CallArguments, PrevAlign, DataOffset, OutBufferIndex, true, ArgIndex + 1>(args, raw_data, ctx, temp); } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutCopyHandle) { - ctx.AddCopyObject(std::get<ArgIndex>(args).GetPointerUnsafe()); + ctx.AddCopyObject(std::get<ArgIndex>(args)); return WriteOutArgument<Domain, MethodArguments, CallArguments, PrevAlign, DataOffset, OutBufferIndex, RawDataFinished, ArgIndex + 1>(args, raw_data, ctx, temp); } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutMoveHandle) { - ctx.AddMoveObject(std::get<ArgIndex>(args).GetPointerUnsafe()); + ctx.AddMoveObject(std::get<ArgIndex>(args)); return WriteOutArgument<Domain, MethodArguments, CallArguments, PrevAlign, DataOffset, OutBufferIndex, RawDataFinished, ArgIndex + 1>(args, raw_data, ctx, temp); } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutLargeData) { |