Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-11 20:10:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed serialization runtime exceptions

Browse source
This commit is contained in:
Hamish Milne 2020-01-11 16:33:48 +00:00 • committed by zhupengfei
parent ca971ff31f
commit e4f05884c3
23 changed files with 140 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/hle/service/ir/ir_rst.cpp
View file

@ -29,7 +29,6 @@ void IR_RST::serialize(Archive& ar, const unsigned int) {
// update_callback_id and input devices are set separately
ReloadInputDevices();
}
SERIALIZE_IMPL(IR_RST)
struct PadDataEntry {
PadState current_state;

3
src/core/hle/service/ir/ir_u.h
View file

@ -12,6 +12,9 @@ namespace Service::IR {
class IR_U final : public ServiceFramework<IR_U> {
public:
IR_U();
private:
SERVICE_SERIALIZATION_SIMPLE
};
} // namespace Service::IR

11
src/core/hle/service/ir/ir_user.cpp
View file

@ -4,6 +4,8 @@
#include <memory>
#include <boost/crc.hpp>
#include <boost/serialization/shared_ptr.hpp>
#include <boost/serialization/unique_ptr.hpp>
#include "common/string_util.h"
#include "common/swap.h"
#include "core/core.h"
@ -13,6 +15,9 @@
#include "core/hle/service/ir/extra_hid.h"
#include "core/hle/service/ir/ir_user.h"
SERIALIZE_EXPORT_IMPL(Service::IR::IR_USER)
SERVICE_CONSTRUCT_IMPL(Service::IR::IR_USER)
namespace Service::IR {
template <class Archive>
@ -23,10 +28,9 @@ void IR_USER::serialize(Archive& ar, const unsigned int) {
ar& receive_event;
ar& shared_memory;
ar& connected_device;
ar&* receive_buffer.get();
ar& receive_buffer;
ar&* extra_hid.get();
}
SERIALIZE_IMPL(IR_USER)
// This is a header that will present in the ir:USER shared memory if it is initialized with
// InitializeIrNopShared service function. Otherwise the shared memory doesn't have this header if
@ -204,6 +208,8 @@ private:
u32 max_data_size;
private:
BufferManager() = default;
template <class Archive>
void serialize(Archive& ar, const unsigned int) {
ar& info;
@ -449,6 +455,7 @@ IR_USER::IR_USER(Core::System& system) : ServiceFramework("ir:USER", 1) {
using namespace Kernel;
connected_device = false;
conn_status_event = system.Kernel().CreateEvent(ResetType::OneShot, "IR:ConnectionStatusEvent");
send_event = system.Kernel().CreateEvent(ResetType::OneShot, "IR:SendEvent");
receive_event = system.Kernel().CreateEvent(ResetType::OneShot, "IR:ReceiveEvent");

4
src/core/hle/service/ir/ir_user.h
View file

@ -7,7 +7,6 @@
#include <functional>
#include <memory>
#include <vector>
#include <boost/serialization/shared_ptr.hpp>
#include "core/hle/service/service.h"
namespace Kernel {
@ -177,3 +176,6 @@ private:
};
} // namespace Service::IR
BOOST_CLASS_EXPORT_KEY(Service::IR::IR_USER)
SERVICE_CONSTRUCT(Service::IR::IR_USER)