mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-31 06:48:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

tipc/sm: various fixes for issues

Browse source
This commit is contained in:
Michael Scire 2021-04-10 15:32:48 -07:00 • committed by SciresM
parent 57c8bc432d
commit 9be8b32311
6 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libraries/libstratosphere/include/stratosphere/tipc/impl/tipc_impl_command_serialization.hpp
View file

@ -314,8 +314,8 @@ namespace ams::tipc::impl {
static constexpr svc::ipc::MessageBuffer::SpecialHeader OutSpecialHeader{false, NumOutCopyHandles, NumOutMoveHandles, HasOutSpecialHeader};
static constexpr auto OutMessageHandleIndex = svc::ipc::MessageBuffer::GetSpecialDataIndex(OutMessageHeader, OutSpecialHeader);
static constexpr auto OutMessageRawDataIndex = svc::ipc::MessageBuffer::GetRawDataIndex(OutMessageHeader, OutSpecialHeader);
static constexpr auto OutMessageResultIndex = OutMessageRawDataIndex + OutDataSize / sizeof(u32);
static constexpr auto OutMessageResultIndex = svc::ipc::MessageBuffer::GetRawDataIndex(OutMessageHeader, OutSpecialHeader);
static constexpr auto OutMessageRawDataIndex = OutMessageResultIndex + 1;
/* Construction of argument serialization structs. */
private:
@ -580,11 +580,11 @@ namespace ams::tipc::impl {
/* Set output handles. */
out_handles_holder.CopyTo(message_buffer);
/* Set output data. */
out_raw_holder.CopyTo(message_buffer);
/* Set output result. */
message_buffer.Set(CommandMeta::OutMessageResultIndex, result.GetValue());
/* Set output data. */
out_raw_holder.CopyTo(message_buffer);
}
};

2
libraries/libstratosphere/include/stratosphere/tipc/tipc_object_manager.hpp
View file

@ -131,11 +131,9 @@ namespace ams::tipc {
R_TRY_CATCH(svc::ReplyAndReceive(std::addressof(dummy), nullptr, 0, reply_target, 0)) {
R_CATCH(svc::ResultTimedOut) {
/* Timing out is acceptable. */
return R_CURRENT_RESULT;
}
R_CATCH(svc::ResultSessionClosed) {
/* It's okay if we couldn't reply to a closed session. */
return R_CURRENT_RESULT;
}
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;