summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-02-21 18:19:12 +0100
committerLiam <byteslice@airmail.cc>2023-02-21 18:19:25 +0100
commit72e5552409305fe57781b83c3145fb2b66552be2 (patch)
tree7c88edce6084274a0c79a9284fc7290033e2e0bc /src/core
parentcheat_engine: add check for hid initialization (diff)
downloadyuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar.gz
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar.bz2
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar.lz
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar.xz
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.tar.zst
yuzu-72e5552409305fe57781b83c3145fb2b66552be2.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/hle_ipc.h12
-rw-r--r--src/core/hle/service/sm/sm.cpp9
2 files changed, 19 insertions, 2 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 6cbc974fe..b4364f984 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -147,9 +147,21 @@ public:
return server_manager;
}
+ // TODO: remove this when sm: is implemented with the proper IUserInterface
+ // abstraction, creating a new C++ handler object for each session:
+
+ bool GetIsInitializedForSm() const {
+ return is_initialized_for_sm;
+ }
+
+ void SetIsInitializedForSm() {
+ is_initialized_for_sm = true;
+ }
+
private:
bool convert_to_domain{};
bool is_domain{};
+ bool is_initialized_for_sm{};
SessionRequestHandlerPtr session_handler;
std::vector<SessionRequestHandlerPtr> domain_handlers;
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 6eba48f03..53c877836 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -112,7 +112,7 @@ ResultVal<Kernel::KPort*> ServiceManager::GetServicePort(const std::string& name
void SM::Initialize(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_SM, "called");
- is_initialized = true;
+ ctx.GetManager()->SetIsInitializedForSm();
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess);
@@ -159,7 +159,7 @@ static std::string PopServiceName(IPC::RequestParser& rp) {
}
ResultVal<Kernel::KClientSession*> SM::GetServiceImpl(Kernel::HLERequestContext& ctx) {
- if (!is_initialized) {
+ if (!ctx.GetManager()->GetIsInitializedForSm()) {
return ERR_NOT_INITIALIZED;
}
@@ -168,6 +168,11 @@ ResultVal<Kernel::KClientSession*> SM::GetServiceImpl(Kernel::HLERequestContext&
// Find the named port.
auto port_result = service_manager.GetServicePort(name);
+ if (port_result.Code() == ERR_INVALID_NAME) {
+ LOG_ERROR(Service_SM, "Invalid service name '{}'", name);
+ return ERR_INVALID_NAME;
+ }
+
if (port_result.Failed()) {
LOG_INFO(Service_SM, "Waiting for service {} to become available", name);
ctx.SetIsDeferred();