Services/APT: Return the proper error code when calling SendParameter with an outstanding parameter already in memory.
This commit is contained in:
parent
a9bc417f59
commit
68596a7068
|
@ -192,6 +192,13 @@ void SendParameter(Service::Interface* self) {
|
|||
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
|
||||
|
||||
// A new parameter can not be sent if the previous one hasn't been consumed yet
|
||||
if (next_parameter) {
|
||||
rb.Push(ResultCode(ErrCodes::ParameterPresent, ErrorModule::Applet,
|
||||
ErrorSummary::InvalidState, ErrorLevel::Status));
|
||||
return;
|
||||
}
|
||||
|
||||
if (dest_applet == nullptr) {
|
||||
LOG_ERROR(Service_APT, "Unknown applet id=0x%08X", dst_app_id);
|
||||
rb.Push<u32>(-1); // TODO(Subv): Find the right error code
|
||||
|
@ -208,10 +215,10 @@ void SendParameter(Service::Interface* self) {
|
|||
|
||||
rb.Push(dest_applet->ReceiveParameter(param));
|
||||
|
||||
LOG_WARNING(Service_APT,
|
||||
"(STUBBED) called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X,"
|
||||
"buffer_size=0x%08X, handle=0x%08X, size=0x%08zX, in_param_buffer_ptr=0x%08X",
|
||||
src_app_id, dst_app_id, signal_type, buffer_size, handle, size, buffer);
|
||||
LOG_DEBUG(Service_APT,
|
||||
"called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X,"
|
||||
"buffer_size=0x%08X, handle=0x%08X, size=0x%08zX, in_param_buffer_ptr=0x%08X",
|
||||
src_app_id, dst_app_id, signal_type, buffer_size, handle, size, buffer);
|
||||
}
|
||||
|
||||
void ReceiveParameter(Service::Interface* self) {
|
||||
|
|
|
@ -116,6 +116,12 @@ enum class ScreencapPostPermission : u32 {
|
|||
DisableScreenshotPostingToMiiverse = 3
|
||||
};
|
||||
|
||||
namespace ErrCodes {
|
||||
enum {
|
||||
ParameterPresent = 2,
|
||||
};
|
||||
}
|
||||
|
||||
/// Send a parameter to the currently-running application, which will read it via ReceiveParameter
|
||||
void SendParameter(const MessageParameter& parameter);
|
||||
|
||||
|
|
Reference in New Issue