The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12703 from nlebeck/settingshandler-nomove-2

Browse Source 
Pass `SettingsHandler` buffers by const ref instead of rvalue ref (since the contents are copied either way)
This commit is contained in:
Jordan Woyak 2024-04-13 17:10:11 -05:00 committed by GitHub
commit 637ae12ff4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/SettingsHandler.cpp
View File

@ -22,9 +22,9 @@ SettingsHandler::SettingsHandler()
Reset(); Reset();
} }
SettingsHandler::SettingsHandler(Buffer&& buffer) SettingsHandler::SettingsHandler(const Buffer& buffer)
{ {
SetBytes(std::move(buffer)); SetBytes(buffer);
} }
const SettingsHandler::Buffer& SettingsHandler::GetBytes() const const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
@ -32,10 +32,10 @@ const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
return m_buffer; return m_buffer;
} }
void SettingsHandler::SetBytes(Buffer&& buffer) void SettingsHandler::SetBytes(const Buffer& buffer)
{ {
Reset(); Reset();
m_buffer = std::move(buffer); m_buffer = buffer;
Decrypt(); Decrypt();
} }

4
Source/Core/Common/SettingsHandler.h
View File

@ -25,12 +25,12 @@ public:
using Buffer = std::array<u8, SETTINGS_SIZE>; using Buffer = std::array<u8, SETTINGS_SIZE>;
SettingsHandler(); SettingsHandler();
explicit SettingsHandler(Buffer&& buffer); explicit SettingsHandler(const Buffer& buffer);
void AddSetting(std::string_view key, std::string_view value); void AddSetting(std::string_view key, std::string_view value);
const Buffer& GetBytes() const; const Buffer& GetBytes() const;
void SetBytes(Buffer&& buffer); void SetBytes(const Buffer& buffer);
std::string GetValue(std::string_view key) const; std::string GetValue(std::string_view key) const;
void Decrypt(); void Decrypt();

2
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -377,7 +377,7 @@ bool CBoot::SetupWiiMemory(Core::System& system, IOS::HLE::IOSC::ConsoleType con
IOS::HLE::FS::Mode::Read); IOS::HLE::FS::Mode::Read);
if (file && file->Read(data.data(), data.size())) if (file && file->Read(data.data(), data.size()))
{ {
gen.SetBytes(std::move(data)); gen.SetBytes(data);
serno = gen.GetValue("SERNO"); serno = gen.GetValue("SERNO");
model = gen.GetValue("MODEL"); model = gen.GetValue("MODEL");

2
Source/Core/Core/IOS/DolphinDevice.cpp
View File

@ -139,7 +139,7 @@ IPCReply GetRealProductCode(Core::System& system, const IOCtlVRequest& request)
return IPCReply(IPC_ENOENT); return IPCReply(IPC_ENOENT);
Common::SettingsHandler gen; Common::SettingsHandler gen;
gen.SetBytes(std::move(data)); gen.SetBytes(data);
const std::string code = gen.GetValue("CODE"); const std::string code = gen.GetValue("CODE");
const size_t length = std::min<size_t>(request.io_vectors[0].size, code.length()); const size_t length = std::min<size_t>(request.io_vectors[0].size, code.length());

4
Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
View File

@ -931,7 +931,7 @@ IPCReply NetKDRequestDevice::HandleRequestRegisterUserId(const IOS::HLE::IOCtlRe
return IPCReply{IPC_SUCCESS}; return IPCReply{IPC_SUCCESS};
} }
const Common::SettingsHandler gen{std::move(data)}; const Common::SettingsHandler gen{data};
const std::string serno = gen.GetValue("SERNO"); const std::string serno = gen.GetValue("SERNO");
const std::string form_data = const std::string form_data =
fmt::format("mlid=w{}&hdid={}&rgncd={}", m_config.Id(), m_ios.GetIOSC().GetDeviceId(), serno); fmt::format("mlid=w{}&hdid={}&rgncd={}", m_config.Id(), m_ios.GetIOSC().GetDeviceId(), serno);
@ -1079,7 +1079,7 @@ std::optional<IPCReply> NetKDRequestDevice::IOCtl(const IOCtlRequest& request)
Common::SettingsHandler::Buffer data; Common::SettingsHandler::Buffer data;
if (file->Read(data.data(), data.size())) if (file->Read(data.data(), data.size()))
{ {
const Common::SettingsHandler gen{std::move(data)}; const Common::SettingsHandler gen{data};
area = gen.GetValue("AREA"); area = gen.GetValue("AREA");
model = gen.GetValue("MODEL"); model = gen.GetValue("MODEL");
} }

23
Source/UnitTests/Common/SettingsHandlerTest.cpp
View File

@ -52,8 +52,7 @@ TEST(SettingsHandlerTest, EncryptSingleSetting)
TEST(SettingsHandlerTest, DecryptSingleSetting) TEST(SettingsHandlerTest, DecryptSingleSetting)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_A; Common::SettingsHandler handler(BUFFER_A);
Common::SettingsHandler handler(std::move(buffer));
EXPECT_EQ(handler.GetValue("key"), "val"); EXPECT_EQ(handler.GetValue("key"), "val");
} }
@ -70,8 +69,7 @@ TEST(SettingsHandlerTest, EncryptMultipleSettings)
TEST(SettingsHandlerTest, DecryptMultipleSettings) TEST(SettingsHandlerTest, DecryptMultipleSettings)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_B; Common::SettingsHandler handler(BUFFER_B);
Common::SettingsHandler handler(std::move(buffer));
EXPECT_EQ(handler.GetValue("key1"), "val1"); EXPECT_EQ(handler.GetValue("key1"), "val1");
EXPECT_EQ(handler.GetValue("key2"), "val2"); EXPECT_EQ(handler.GetValue("key2"), "val2");
EXPECT_EQ(handler.GetValue("foo"), "bar"); EXPECT_EQ(handler.GetValue("foo"), "bar");
@ -79,13 +77,11 @@ TEST(SettingsHandlerTest, DecryptMultipleSettings)
TEST(SettingsHandlerTest, SetBytesOverwritesExistingBuffer) TEST(SettingsHandlerTest, SetBytesOverwritesExistingBuffer)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_A; Common::SettingsHandler handler(BUFFER_A);
Common::SettingsHandler handler(std::move(buffer));
ASSERT_EQ(handler.GetValue("key"), "val"); ASSERT_EQ(handler.GetValue("key"), "val");
ASSERT_EQ(handler.GetValue("foo"), ""); ASSERT_EQ(handler.GetValue("foo"), "");
Common::SettingsHandler::Buffer buffer2 = BUFFER_B; handler.SetBytes(BUFFER_B);
handler.SetBytes(std::move(buffer2));
EXPECT_EQ(handler.GetValue("foo"), "bar"); EXPECT_EQ(handler.GetValue("foo"), "bar");
EXPECT_EQ(handler.GetValue("key"), ""); EXPECT_EQ(handler.GetValue("key"), "");
} }
@ -97,14 +93,13 @@ TEST(SettingsHandlerTest, GetValueOnSameInstance)
EXPECT_EQ(handler.GetValue("key"), ""); EXPECT_EQ(handler.GetValue("key"), "");
Common::SettingsHandler::Buffer buffer = handler.GetBytes(); Common::SettingsHandler::Buffer buffer = handler.GetBytes();
handler.SetBytes(std::move(buffer)); handler.SetBytes(buffer);
EXPECT_EQ(handler.GetValue("key"), "val"); EXPECT_EQ(handler.GetValue("key"), "val");
} }
TEST(SettingsHandlerTest, GetValueAfterReset) TEST(SettingsHandlerTest, GetValueAfterReset)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_A; Common::SettingsHandler handler(BUFFER_A);
Common::SettingsHandler handler(std::move(buffer));
ASSERT_EQ(handler.GetValue("key"), "val"); ASSERT_EQ(handler.GetValue("key"), "val");
handler.Reset(); handler.Reset();
@ -131,14 +126,12 @@ TEST(SettingsHandlerTest, EncryptAddsLFOnNullCharTwice)
TEST(SettingsHandlerTest, DecryptSingleAddedLF) TEST(SettingsHandlerTest, DecryptSingleAddedLF)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_C; Common::SettingsHandler handler(BUFFER_C);
Common::SettingsHandler handler(std::move(buffer));
EXPECT_EQ(handler.GetValue("\xFA"), "a"); EXPECT_EQ(handler.GetValue("\xFA"), "a");
} }
TEST(SettingsHandlerTest, DecryptTwoAddedLFs) TEST(SettingsHandlerTest, DecryptTwoAddedLFs)
{ {
Common::SettingsHandler::Buffer buffer = BUFFER_D; Common::SettingsHandler handler(BUFFER_D);
Common::SettingsHandler handler(std::move(buffer));
EXPECT_EQ(handler.GetValue("\xFA\xE9"), "a"); EXPECT_EQ(handler.GetValue("\xFA\xE9"), "a");
} }