From 3bd34008c9c402db2838c9846d3e94d4577451d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Tue, 28 Feb 2017 00:04:47 +0100
Subject: [PATCH] IOS/ES: Fix GetTMDView when title doesn't exist
This fixes ES_GetTMDView and ES_GetTMDViewSize to return -106
(FS_ENOENT) if the title does not exist (and more specifically when no
TMD exists in the NAND). This allows installed (or not installed) IOSes
to be detected properly.
---
Source/Core/Core/IOS/ES/ES.cpp | 26 +++++++++++++-------------
Source/Core/Core/IOS/ES/ES.h | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp
index d203c5b049..1a75f1c21f 100644
--- a/Source/Core/Core/IOS/ES/ES.cpp
+++ b/Source/Core/Core/IOS/ES/ES.cpp
@@ -303,7 +303,7 @@ IPCCommandResult ES::IOCtlV(const IOCtlVRequest& request)
case IOCTL_ES_GETVIEWS:
return GetViews(request);
case IOCTL_ES_GETTMDVIEWCNT:
- return GetTMDViewCount(request);
+ return GetTMDViewSize(request);
case IOCTL_ES_GETTMDVIEWS:
return GetTMDViews(request);
case IOCTL_ES_GETCONSUMPTION:
@@ -870,8 +870,7 @@ IPCCommandResult ES::GetViews(const IOCtlVRequest& request)
return GetDefaultReply(IPC_SUCCESS);
}
-// TODO: rename this to GetTMDViewSize. There is only one TMD, so the name doesn't make sense.
-IPCCommandResult ES::GetTMDViewCount(const IOCtlVRequest& request)
+IPCCommandResult ES::GetTMDViewSize(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(1, 1))
return GetDefaultReply(ES_PARAMETER_SIZE_OR_ALIGNMENT);
@@ -880,9 +879,10 @@ IPCCommandResult ES::GetTMDViewCount(const IOCtlVRequest& request)
const DiscIO::CNANDContentLoader& Loader = AccessContentDevice(TitleID);
- u32 view_size = 0;
- if (Loader.IsValid())
- view_size = static_cast<u32>(Loader.GetTMD().GetRawView().size());
+ if (!Loader.IsValid())
+ return GetDefaultReply(FS_ENOENT);
+
+ const u32 view_size = static_cast<u32>(Loader.GetTMD().GetRawView().size());
Memory::Write_U32(view_size, request.io_vectors[0].address);
INFO_LOG(IOS_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32),
@@ -903,14 +903,14 @@ IPCCommandResult ES::GetTMDViews(const IOCtlVRequest& request)
INFO_LOG(IOS_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x buffer size: %i",
(u32)(TitleID >> 32), (u32)TitleID, MaxCount);
- if (Loader.IsValid())
- {
- const std::vector<u8> raw_view = Loader.GetTMD().GetRawView();
- if (raw_view.size() != request.io_vectors[0].size)
- return GetDefaultReply(ES_PARAMETER_SIZE_OR_ALIGNMENT);
+ if (!Loader.IsValid())
+ return GetDefaultReply(FS_ENOENT);
- Memory::CopyToEmu(request.io_vectors[0].address, raw_view.data(), raw_view.size());
- }
+ const std::vector<u8> raw_view = Loader.GetTMD().GetRawView();
+ if (raw_view.size() != request.io_vectors[0].size)
+ return GetDefaultReply(ES_PARAMETER_SIZE_OR_ALIGNMENT);
+
+ Memory::CopyToEmu(request.io_vectors[0].address, raw_view.data(), raw_view.size());
INFO_LOG(IOS_ES, "IOCTL_ES_GETTMDVIEWS: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32),
(u32)TitleID, MaxCount);
diff --git a/Source/Core/Core/IOS/ES/ES.h b/Source/Core/Core/IOS/ES/ES.h
index 30348749d5..6521eaa360 100644
--- a/Source/Core/Core/IOS/ES/ES.h
+++ b/Source/Core/Core/IOS/ES/ES.h
@@ -174,7 +174,7 @@ private:
IPCCommandResult GetTitles(const IOCtlVRequest& request);
IPCCommandResult GetViewCount(const IOCtlVRequest& request);
IPCCommandResult GetViews(const IOCtlVRequest& request);
- IPCCommandResult GetTMDViewCount(const IOCtlVRequest& request);
+ IPCCommandResult GetTMDViewSize(const IOCtlVRequest& request);
IPCCommandResult GetTMDViews(const IOCtlVRequest& request);
IPCCommandResult GetConsumption(const IOCtlVRequest& request);
IPCCommandResult DeleteTitle(const IOCtlVRequest& request);