archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sceNp: correct type for data attachment

Browse source
This commit is contained in:
Megamouse 2024-02-03 14:28:28 +01:00
parent 2a0e2ce0a2
commit e5cfe710fa
3 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rpcs3/Emu/Cell/Modules/sceNp.cpp
View file

@ -1575,21 +1575,22 @@ error_code recv_message_gui(ppu_thread& ppu, u16 mainType, u32 recvOptions)
const auto& msg = msg_pair->second; const auto& msg = msg_pair->second;
u32 event_to_send; u32 event_to_send;
SceNpBasicAttachmentDataId data_id; SceNpBasicAttachmentData data{};
data.size = static_cast<u32>(msg.data.size());
switch (mainType) switch (mainType)
{ {
case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT: case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
event_to_send = SCE_NP_BASIC_EVENT_RECV_ATTACHMENT_RESULT; event_to_send = SCE_NP_BASIC_EVENT_RECV_ATTACHMENT_RESULT;
data_id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA; data.id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA;
break; break;
case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE: case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
event_to_send = SCE_NP_BASIC_EVENT_RECV_INVITATION_RESULT; event_to_send = SCE_NP_BASIC_EVENT_RECV_INVITATION_RESULT;
data_id = SCE_NP_BASIC_SELECTED_INVITATION_DATA; data.id = SCE_NP_BASIC_SELECTED_INVITATION_DATA;
break; break;
case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA: case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
event_to_send = SCE_NP_BASIC_EVENT_RECV_CUSTOM_DATA_RESULT; event_to_send = SCE_NP_BASIC_EVENT_RECV_CUSTOM_DATA_RESULT;
data_id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA; data.id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA;
break; break;
default: default:
fmt::throw_exception("recv_message_gui: Unexpected main type %d", mainType); fmt::throw_exception("recv_message_gui: Unexpected main type %d", mainType);
@ -1599,18 +1600,29 @@ error_code recv_message_gui(ppu_thread& ppu, u16 mainType, u32 recvOptions)
to_add.event = event_to_send; to_add.event = event_to_send;
strcpy_trunc(to_add.from.userId.handle.data, msg_pair->first); strcpy_trunc(to_add.from.userId.handle.data, msg_pair->first);
strcpy_trunc(to_add.from.name.data, msg_pair->first); strcpy_trunc(to_add.from.name.data, msg_pair->first);
to_add.data.resize(sizeof(SceNpBasicExtendedAttachmentData));
SceNpBasicExtendedAttachmentData* att_data = reinterpret_cast<SceNpBasicExtendedAttachmentData*>(to_add.data.data());
att_data->flags = 0; // ?
att_data->msgId = chosen_msg_id;
att_data->data.id = data_id;
att_data->data.size = static_cast<u32>(msg.data.size());
att_data->userAction = recv_result;
att_data->markedAsUsed = (recvOptions & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_PRESERVE) ? 0 : 1;
extra_nps::print_SceNpBasicExtendedAttachmentData(att_data); if (mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT)
{
to_add.data.resize(sizeof(SceNpBasicAttachmentData));
SceNpBasicAttachmentData* att_data = reinterpret_cast<SceNpBasicAttachmentData*>(to_add.data.data());
*att_data = data;
nph.set_message_selected(att_data->data.id, chosen_msg_id); extra_nps::print_SceNpBasicAttachmentData(att_data);
}
else
{
to_add.data.resize(sizeof(SceNpBasicExtendedAttachmentData));
SceNpBasicExtendedAttachmentData* att_data = reinterpret_cast<SceNpBasicExtendedAttachmentData*>(to_add.data.data());
att_data->flags = 0; // ?
att_data->msgId = chosen_msg_id;
att_data->data = data;
att_data->userAction = recv_result;
att_data->markedAsUsed = (recvOptions & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_PRESERVE) ? 0 : 1;
extra_nps::print_SceNpBasicExtendedAttachmentData(att_data);
}
nph.set_message_selected(data.id, chosen_msg_id);
// Is this sent if used from home menu but not from sceNpBasicRecvMessageCustom, not sure // Is this sent if used from home menu but not from sceNpBasicRecvMessageCustom, not sure
// sysutil_send_system_cmd(CELL_SYSUTIL_NP_INVITATION_SELECTED, 0); // sysutil_send_system_cmd(CELL_SYSUTIL_NP_INVITATION_SELECTED, 0);

7
rpcs3/Emu/NP/np_structs_extra.cpp
View file

@ -391,6 +391,13 @@ namespace extra_nps
} }
} }
void print_SceNpBasicAttachmentData(const SceNpBasicAttachmentData* data)
{
sceNp.warning("SceNpBasicAttachmentData:");
sceNp.warning("id: 0x%x", data->id);
sceNp.warning("size: %d", data->size);
}
void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data) void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data)
{ {
sceNp.warning("SceNpBasicExtendedAttachmentData:"); sceNp.warning("SceNpBasicExtendedAttachmentData:");

1
rpcs3/Emu/NP/np_structs_extra.h
View file

@ -25,5 +25,6 @@ namespace extra_nps
void print_get_roomdata_external_list_req(const SceNpMatching2GetRoomDataExternalListRequest* req); void print_get_roomdata_external_list_req(const SceNpMatching2GetRoomDataExternalListRequest* req);
void print_get_roomdata_external_list_resp(const SceNpMatching2GetRoomDataExternalListResponse* resp); void print_get_roomdata_external_list_resp(const SceNpMatching2GetRoomDataExternalListResponse* resp);
void print_SceNpBasicAttachmentData(const SceNpBasicAttachmentData* data);
void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data); void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data);
} // namespace extra_nps } // namespace extra_nps