diff options
author | bunnei <bunneidev@gmail.com> | 2019-11-15 18:08:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 18:08:50 +0100 |
commit | 3e0e4f146b3f2ad7f1935a61141c38cdce87e04f (patch) | |
tree | 75f29ce4bb9d84f9d9722b7aa86d71e805cac8cc /src/core/hle/service/ns | |
parent | Merge pull request #3113 from lioncash/semi (diff) | |
parent | externals: Update httplib (diff) | |
download | yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.gz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.bz2 yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.lz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.xz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.zst yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.zip |
Diffstat (limited to 'src/core/hle/service/ns')
-rw-r--r-- | src/core/hle/service/ns/ns.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 15c156ce1..eeba0aa19 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -271,7 +271,7 @@ void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestC "output buffer is too small! (actual={:016X}, expected_min=0x4000)", size); IPC::ResponseBuilder rb{ctx, 2}; // TODO(DarkLordZach): Find a better error code for this. - rb.Push(ResultCode(-1)); + rb.Push(RESULT_UNKNOWN); return; } @@ -291,7 +291,7 @@ void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestC 0x4000 + control.second->GetSize()); IPC::ResponseBuilder rb{ctx, 2}; // TODO(DarkLordZach): Find a better error code for this. - rb.Push(ResultCode(-1)); + rb.Push(RESULT_UNKNOWN); return; } diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 23477315f..db433305f 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -97,7 +97,7 @@ void EncryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output, const auto key = Common::swap32(EXPECTED_RESULT ^ EXPECTED_MAGIC); std::vector<u32> transformed_font(input.size() + 2); transformed_font[0] = Common::swap32(EXPECTED_MAGIC); - transformed_font[1] = Common::swap32(input.size() * sizeof(u32)) ^ key; + transformed_font[1] = Common::swap32(static_cast<u32>(input.size() * sizeof(u32))) ^ key; std::transform(input.begin(), input.end(), transformed_font.begin() + 2, [key](u32 in) { return in ^ key; }); std::memcpy(output.data() + offset, transformed_font.data(), |