summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/ns
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-11-12 11:38:12 +0100
committerLioncash <mathew1800@gmail.com>2019-11-12 13:55:39 +0100
commitf11b87ebf1cd5770f9128e62931183b0c9331067 (patch)
tree286bed12845e8843e88d2a317388d115b69d2d95 /src/core/hle/service/ns
parentperf_stats: Resolve implicit int to double conversion error (diff)
downloadyuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar.gz
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar.bz2
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar.lz
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar.xz
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.tar.zst
yuzu-f11b87ebf1cd5770f9128e62931183b0c9331067.zip
Diffstat (limited to 'src/core/hle/service/ns')
-rw-r--r--src/core/hle/service/ns/ns.cpp4
-rw-r--r--src/core/hle/service/ns/pl_u.cpp2
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(),