dummy implement user service event

fix nier doesn't read pad
Inori · May 14, 2022 · 9aa2448 · 9aa2448
1 parent 1466ffc
commit 9aa2448
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 6 deletions.
diff --git a/GPCS4/GPCS4.vcxproj b/GPCS4/GPCS4.vcxproj
@@ -225,6 +225,7 @@
     <ClInclude Include="SceModules\SceNet\sce_net.h" />
     <ClInclude Include="SceModules\SceNpCommerce\sce_npcommerce.h" />
     <ClInclude Include="SceModules\SceNpCommon\sce_npcommon.h" />
+    <ClInclude Include="SceModules\SceNpCommon\sce_npcommon_types.h" />
     <ClInclude Include="SceModules\SceNpManager\sce_npmanager.h" />
     <ClInclude Include="SceModules\SceNpMatching2\sce_npmatching2.h" />
     <ClInclude Include="SceModules\SceNpProfileDialog\sce_npprofiledialog.h" />

diff --git a/GPCS4/GPCS4.vcxproj.filters b/GPCS4/GPCS4.vcxproj.filters
@@ -922,6 +922,9 @@
     <ClInclude Include="Graphics\Sce\SceLabelManager.h">
       <Filter>Source Files\Graphics\Sce</Filter>
     </ClInclude>
+    <ClInclude Include="SceModules\SceNpCommon\sce_npcommon_types.h">
+      <Filter>SceModules\SceNpCommon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Loader\EbootObject.cpp">

diff --git a/GPCS4/SceModules/SceNpCommon/sce_npcommon_types.h b/GPCS4/SceModules/SceNpCommon/sce_npcommon_types.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "GPCS4Common.h"
+
+#define SCE_NP_ONLINEID_MIN_LENGTH 3
+#define SCE_NP_ONLINEID_MAX_LENGTH 16
+
+/* Online ID */
+typedef struct SceNpOnlineId
+{
+	char data[SCE_NP_ONLINEID_MAX_LENGTH];
+	char term;
+	char dummy[3];
+} SceNpOnlineId;
+
+/* NP ID */
+typedef struct SceNpId
+{
+	SceNpOnlineId handle;
+	uint8_t       opt[8];
+	uint8_t       reserved[8];
+} SceNpId;
diff --git a/GPCS4/SceModules/SceNpManager/sce_npmanager.cpp b/GPCS4/SceModules/SceNpManager/sce_npmanager.cpp
@@ -60,9 +60,16 @@ int PS4API sceNpDeleteRequest(void)
 }
 
 
-int PS4API sceNpGetNpId(void)
+int PS4API sceNpGetNpId(SceUserServiceUserId userId, SceNpId* npId)
 {
-	LOG_FIXME("Not implemented");
+	LOG_SCE_DUMMY_IMPL();
+	LOG_SCE_TRACE("userId %x", userId);
+
+	LOG_ASSERT(std::strlen(GPCS4_APP_NAME) < SCE_NP_ONLINEID_MAX_LENGTH, "app name too long.");
+	std::memset(npId, 0, sizeof(SceNpId));
+	std::strcpy(npId->handle.data, GPCS4_APP_NAME);
+	npId->handle.term = '\0';
+
 	return SCE_OK;
 }
 

diff --git a/GPCS4/SceModules/SceNpManager/sce_npmanager.h b/GPCS4/SceModules/SceNpManager/sce_npmanager.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "sce_module_common.h"
+#include "../SceNpCommon/sce_npcommon_types.h"
 
 
 extern const SCE_EXPORT_MODULE g_ExpModuleSceNpManager;
@@ -46,7 +47,7 @@ int PS4API sceNpCreateAsyncRequest(void);
 int PS4API sceNpDeleteRequest(void);
 
 
-int PS4API sceNpGetNpId(void);
+int PS4API sceNpGetNpId(SceUserServiceUserId userId, SceNpId* npId);
 
 
 int PS4API sceNpGetOnlineId(void);

diff --git a/GPCS4/SceModules/SceUserService/sce_userservice.cpp b/GPCS4/SceModules/SceUserService/sce_userservice.cpp
@@ -71,9 +71,21 @@ int PS4API sceUserServiceGetUserName(const SceUserServiceUserId userId, char *us
 int PS4API sceUserServiceGetEvent(SceUserServiceEvent* event)
 {
 	LOG_SCE_TRACE("event %p", event);
-	event->eventType = SCE_USER_SERVICE_EVENT_TYPE_LOGIN;
-	event->userId = SCE_DUMMY_USERID;
-	return SCE_USER_SERVICE_ERROR_NO_EVENT;
+
+	static bool firstEvent = true;
+
+	int ret = SCE_USER_SERVICE_ERROR_NO_EVENT;
+	// We should at least queue one login event even
+	// if there's no user login happened.
+	if (firstEvent)
+	{
+		event->eventType = SCE_USER_SERVICE_EVENT_TYPE_LOGIN;
+		event->userId    = SCE_DUMMY_USERID;
+		ret              = SCE_OK;
+		firstEvent       = false;
+	}
+
+	return ret;
 }
 
 int PS4API sceUserServiceGetLoginUserIdList(SceUserServiceLoginUserIdList* userIdList)