12 files changed, 49 insertions, 44 deletions
diff --git a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
index b3f9e4683..5be167fce 100644
--- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
@@ -4,7 +4,7 @@
 #include "core/hle/service/bcat/news/newly_arrived_event_holder.h"
 #include "core/hle/service/cmif_serialization.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
 INewlyArrivedEventHolder::INewlyArrivedEventHolder(Core::System& system_)
     : ServiceFramework{system_, "INewlyArrivedEventHolder"}, service_context{
@@ -20,7 +20,9 @@ INewlyArrivedEventHolder::INewlyArrivedEventHolder(Core::System& system_)
     arrived_event = service_context.CreateEvent("INewlyArrivedEventHolder::ArrivedEvent");
 }
 
-INewlyArrivedEventHolder::~INewlyArrivedEventHolder() = default;
+INewlyArrivedEventHolder::~INewlyArrivedEventHolder() {
+    service_context.CloseEvent(arrived_event);
+}
 
 Result INewlyArrivedEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_event) {
     LOG_INFO(Service_BCAT, "called");
@@ -29,4 +31,4 @@ Result INewlyArrivedEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_e
     R_SUCCEED();
 }
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/newly_arrived_event_holder.h b/src/core/hle/service/bcat/news/newly_arrived_event_holder.h
index af19d81a7..6cc9ae099 100644
--- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.h
+++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.h
@@ -16,7 +16,7 @@ class KEvent;
 class KReadableEvent;
 } // namespace Kernel
 
-namespace Service::BCAT {
+namespace Service::News {
 
 class INewlyArrivedEventHolder final : public ServiceFramework<INewlyArrivedEventHolder> {
 public:
@@ -30,4 +30,4 @@ private:
     KernelHelpers::ServiceContext service_context;
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_data_service.cpp b/src/core/hle/service/bcat/news/news_data_service.cpp
index eba2e6064..08103c9c3 100644
--- a/src/core/hle/service/bcat/news/news_data_service.cpp
+++ b/src/core/hle/service/bcat/news/news_data_service.cpp
@@ -3,7 +3,7 @@
 
 #include "core/hle/service/bcat/news/news_data_service.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
 INewsDataService::INewsDataService(Core::System& system_)
     : ServiceFramework{system_, "INewsDataService"} {
@@ -22,4 +22,4 @@ INewsDataService::INewsDataService(Core::System& system_)
 
 INewsDataService::~INewsDataService() = default;
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_data_service.h b/src/core/hle/service/bcat/news/news_data_service.h
index 441e0ea8e..12082ada4 100644
--- a/src/core/hle/service/bcat/news/news_data_service.h
+++ b/src/core/hle/service/bcat/news/news_data_service.h
@@ -9,7 +9,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::BCAT {
+namespace Service::News {
 
 class INewsDataService final : public ServiceFramework<INewsDataService> {
 public:
@@ -17,4 +17,4 @@ public:
     ~INewsDataService() override;
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_database_service.cpp b/src/core/hle/service/bcat/news/news_database_service.cpp
index 3b4b33901..18109f9b0 100644
--- a/src/core/hle/service/bcat/news/news_database_service.cpp
+++ b/src/core/hle/service/bcat/news/news_database_service.cpp
@@ -4,7 +4,7 @@
 #include "core/hle/service/bcat/news/news_database_service.h"
 #include "core/hle/service/cmif_serialization.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
 INewsDatabaseService::INewsDatabaseService(Core::System& system_)
     : ServiceFramework{system_, "INewsDatabaseService"} {
@@ -25,11 +25,11 @@ INewsDatabaseService::INewsDatabaseService(Core::System& system_)
 
 INewsDatabaseService::~INewsDatabaseService() = default;
 
-Result INewsDatabaseService::Count(Out<u32> out_count,
+Result INewsDatabaseService::Count(Out<s32> out_count,
                                    InBuffer<BufferAttr_HipcPointer> buffer_data) {
     LOG_WARNING(Service_BCAT, "(STUBBED) called, buffer_size={}", buffer_data.size());
     *out_count = 0;
     R_SUCCEED();
 }
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_database_service.h b/src/core/hle/service/bcat/news/news_database_service.h
index dd09a1662..f5916634b 100644
--- a/src/core/hle/service/bcat/news/news_database_service.h
+++ b/src/core/hle/service/bcat/news/news_database_service.h
@@ -10,7 +10,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::BCAT {
+namespace Service::News {
 
 class INewsDatabaseService final : public ServiceFramework<INewsDatabaseService> {
 public:
@@ -18,7 +18,7 @@ public:
     ~INewsDatabaseService() override;
 
 private:
-    Result Count(Out<u32> out_count, InBuffer<BufferAttr_HipcPointer> buffer_data);
+    Result Count(Out<s32> out_count, InBuffer<BufferAttr_HipcPointer> buffer_data);
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_service.cpp b/src/core/hle/service/bcat/news/news_service.cpp
index 372937351..e19cea7b5 100644
--- a/src/core/hle/service/bcat/news/news_service.cpp
+++ b/src/core/hle/service/bcat/news/news_service.cpp
@@ -4,7 +4,7 @@
 #include "core/hle/service/bcat/news/news_service.h"
 #include "core/hle/service/cmif_serialization.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
 INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "INewsService"} {
     // clang-format off
@@ -43,4 +43,4 @@ Result INewsService::GetSubscriptionStatus(Out<u32> out_status,
     R_SUCCEED();
 }
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_service.h b/src/core/hle/service/bcat/news/news_service.h
index bb2e49848..8d06be9d6 100644
--- a/src/core/hle/service/bcat/news/news_service.h
+++ b/src/core/hle/service/bcat/news/news_service.h
@@ -10,7 +10,7 @@ namespace Core {
 class System;
 }
 
-namespace Service::BCAT {
+namespace Service::News {
 
 class INewsService final : public ServiceFramework<INewsService> {
 public:
@@ -21,4 +21,4 @@ private:
     Result GetSubscriptionStatus(Out<u32> out_status, InBuffer<BufferAttr_HipcPointer> buffer_data);
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
index 4b06bfc5e..c32a5ca8f 100644
--- a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
@@ -4,7 +4,7 @@
 #include "core/hle/service/bcat/news/overwrite_event_holder.h"
 #include "core/hle/service/cmif_serialization.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
 IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_)
     : ServiceFramework{system_, "IOverwriteEventHolder"}, service_context{system_,
@@ -19,7 +19,9 @@ IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_)
     overwrite_event = service_context.CreateEvent("IOverwriteEventHolder::OverwriteEvent");
 }
 
-IOverwriteEventHolder::~IOverwriteEventHolder() = default;
+IOverwriteEventHolder::~IOverwriteEventHolder() {
+    service_context.CloseEvent(overwrite_event);
+}
 
 Result IOverwriteEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_event) {
     LOG_INFO(Service_BCAT, "called");
@@ -28,4 +30,4 @@ Result IOverwriteEventHolder::Get(OutCopyHandle<Kernel::KReadableEvent> out_even
     R_SUCCEED();
 }
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/overwrite_event_holder.h b/src/core/hle/service/bcat/news/overwrite_event_holder.h
index 4b016b2fe..cdc87d782 100644
--- a/src/core/hle/service/bcat/news/overwrite_event_holder.h
+++ b/src/core/hle/service/bcat/news/overwrite_event_holder.h
@@ -16,7 +16,7 @@ class KEvent;
 class KReadableEvent;
 } // namespace Kernel
 
-namespace Service::BCAT {
+namespace Service::News {
 
 class IOverwriteEventHolder final : public ServiceFramework<IOverwriteEventHolder> {
 public:
@@ -30,4 +30,4 @@ private:
     KernelHelpers::ServiceContext service_context;
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_interface.cpp b/src/core/hle/service/bcat/news/service_creator.cpp
index 0eaef2ddc..d5ba5dff7 100644
--- a/src/core/hle/service/bcat/news/news_interface.cpp
+++ b/src/core/hle/service/bcat/news/service_creator.cpp
@@ -4,60 +4,61 @@
 #include "core/hle/service/bcat/news/newly_arrived_event_holder.h"
 #include "core/hle/service/bcat/news/news_data_service.h"
 #include "core/hle/service/bcat/news/news_database_service.h"
-#include "core/hle/service/bcat/news/news_interface.h"
 #include "core/hle/service/bcat/news/news_service.h"
 #include "core/hle/service/bcat/news/overwrite_event_holder.h"
+#include "core/hle/service/bcat/news/service_creator.h"
 #include "core/hle/service/cmif_serialization.h"
 
-namespace Service::BCAT {
+namespace Service::News {
 
-NewsInterface::NewsInterface(Core::System& system_, u32 permissions_, const char* name_)
+IServiceCreator::IServiceCreator(Core::System& system_, u32 permissions_, const char* name_)
     : ServiceFramework{system_, name_}, permissions{permissions_} {
     // clang-format off
     static const FunctionInfo functions[] = {
-        {0, C<&NewsInterface::CreateNewsService>, "CreateNewsService"},
-        {1, C<&NewsInterface::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
-        {2, C<&NewsInterface::CreateNewsDataService>, "CreateNewsDataService"},
-        {3, C<&NewsInterface::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
-        {4, C<&NewsInterface::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
+        {0, C<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
+        {1, C<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
+        {2, C<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
+        {3, C<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
+        {4, C<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
     };
     // clang-format on
 
     RegisterHandlers(functions);
 }
 
-NewsInterface::~NewsInterface() = default;
+IServiceCreator::~IServiceCreator() = default;
 
-Result NewsInterface::CreateNewsService(OutInterface<INewsService> out_interface) {
+Result IServiceCreator::CreateNewsService(OutInterface<INewsService> out_interface) {
     LOG_INFO(Service_BCAT, "called");
     *out_interface = std::make_shared<INewsService>(system);
     R_SUCCEED();
 }
 
-Result NewsInterface::CreateNewlyArrivedEventHolder(
+Result IServiceCreator::CreateNewlyArrivedEventHolder(
     OutInterface<INewlyArrivedEventHolder> out_interface) {
     LOG_INFO(Service_BCAT, "called");
     *out_interface = std::make_shared<INewlyArrivedEventHolder>(system);
     R_SUCCEED();
 }
 
-Result NewsInterface::CreateNewsDataService(OutInterface<INewsDataService> out_interface) {
+Result IServiceCreator::CreateNewsDataService(OutInterface<INewsDataService> out_interface) {
     LOG_INFO(Service_BCAT, "called");
     *out_interface = std::make_shared<INewsDataService>(system);
     R_SUCCEED();
 }
 
-Result NewsInterface::CreateNewsDatabaseService(OutInterface<INewsDatabaseService> out_interface) {
+Result IServiceCreator::CreateNewsDatabaseService(
+    OutInterface<INewsDatabaseService> out_interface) {
     LOG_INFO(Service_BCAT, "called");
     *out_interface = std::make_shared<INewsDatabaseService>(system);
     R_SUCCEED();
 }
 
-Result NewsInterface::CreateOverwriteEventHolder(
+Result IServiceCreator::CreateOverwriteEventHolder(
     OutInterface<IOverwriteEventHolder> out_interface) {
     LOG_INFO(Service_BCAT, "called");
     *out_interface = std::make_shared<IOverwriteEventHolder>(system);
     R_SUCCEED();
 }
 
-} // namespace Service::BCAT
+} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_interface.h b/src/core/hle/service/bcat/news/service_creator.h
index d95edba3d..5a62e7c1a 100644
--- a/src/core/hle/service/bcat/news/news_interface.h
+++ b/src/core/hle/service/bcat/news/service_creator.h
@@ -10,17 +10,17 @@ namespace Core {
 class System;
 }
 
-namespace Service::BCAT {
+namespace Service::News {
 class INewsService;
 class INewlyArrivedEventHolder;
 class INewsDataService;
 class INewsDatabaseService;
 class IOverwriteEventHolder;
 
-class NewsInterface final : public ServiceFramework<NewsInterface> {
+class IServiceCreator final : public ServiceFramework<IServiceCreator> {
 public:
-    explicit NewsInterface(Core::System& system_, u32 permissions_, const char* name_);
-    ~NewsInterface() override;
+    explicit IServiceCreator(Core::System& system_, u32 permissions_, const char* name_);
+    ~IServiceCreator() override;
 
 private:
     Result CreateNewsService(OutInterface<INewsService> out_interface);
@@ -32,4 +32,4 @@ private:
     u32 permissions;
 };
 
-} // namespace Service::BCAT
+} // namespace Service::News