From 608301f86c9bf534af47eed2d883dbf22b1cdfa0 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Wed, 3 Jul 2024 20:04:56 +0300 Subject: [PATCH] dummy sceAppContentGetAddcontInfoList and fixed structs --- .../libraries/app_content/app_content.cpp | 7 +++++-- src/core/libraries/app_content/app_content.h | 21 +++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/core/libraries/app_content/app_content.cpp b/src/core/libraries/app_content/app_content.cpp index d0184cfa..c43d6c39 100644 --- a/src/core/libraries/app_content/app_content.cpp +++ b/src/core/libraries/app_content/app_content.cpp @@ -120,8 +120,11 @@ int PS4_SYSV_ABI sceAppContentGetAddcontInfo() { return ORBIS_OK; } -int PS4_SYSV_ABI sceAppContentGetAddcontInfoList() { - LOG_ERROR(Lib_AppContent, "(STUBBED) called"); +int PS4_SYSV_ABI sceAppContentGetAddcontInfoList(u32 service_label, + OrbisAppContentAddcontInfo* list, u32 list_num, + u32* hit_num) { + *hit_num = 0; + LOG_ERROR(Lib_AppContent, "(DUMMY) called"); return ORBIS_OK; } diff --git a/src/core/libraries/app_content/app_content.h b/src/core/libraries/app_content/app_content.h index d566b25c..ecf69199 100644 --- a/src/core/libraries/app_content/app_content.h +++ b/src/core/libraries/app_content/app_content.h @@ -31,22 +31,29 @@ struct OrbisAppContentBootParam { }; typedef u32 OrbisAppContentTemporaryDataOption; -constexpr int ORBIS_APP_CONTENT_MOUNTPOINT_DATA_MAXSIZE = 16; -typedef struct OrbisAppContentMountPoint { +constexpr int ORBIS_APP_CONTENT_MOUNTPOINT_DATA_MAXSIZE = 16; + +struct OrbisAppContentMountPoint { char data[ORBIS_APP_CONTENT_MOUNTPOINT_DATA_MAXSIZE]; -} OrbisAppContentMountPoint; +}; constexpr int ORBIS_APP_CONTENT_TEMPORARY_DATA_OPTION_NONE = 0; constexpr int ORBIS_APP_CONTENT_TEMPORARY_DATA_OPTION_FORMAT = (1 << 0); constexpr int ORBIS_NP_UNIFIED_ENTITLEMENT_LABEL_SIZE = 17; -typedef struct OrbisNpUnifiedEntitlementLabel { +struct OrbisNpUnifiedEntitlementLabel { char data[ORBIS_NP_UNIFIED_ENTITLEMENT_LABEL_SIZE]; -} OrbisNpUnifiedEntitlementLabel; + char padding[3]; +}; typedef u32 OrbisAppContentAppParamId; +struct OrbisAppContentAddcontInfo { + OrbisNpUnifiedEntitlementLabel entitlement_label; + u32 status; +}; + int PS4_SYSV_ABI _Z5dummyv(); int PS4_SYSV_ABI sceAppContentAddcontDelete(); int PS4_SYSV_ABI sceAppContentAddcontEnqueueDownload(); @@ -64,7 +71,9 @@ int PS4_SYSV_ABI sceAppContentDownloadDataFormat(); int PS4_SYSV_ABI sceAppContentDownloadDataGetAvailableSpaceKb(); int PS4_SYSV_ABI sceAppContentGetAddcontDownloadProgress(); int PS4_SYSV_ABI sceAppContentGetAddcontInfo(); -int PS4_SYSV_ABI sceAppContentGetAddcontInfoList(); +int PS4_SYSV_ABI sceAppContentGetAddcontInfoList(u32 service_label, + OrbisAppContentAddcontInfo* list, u32 list_num, + u32* hit_num); int PS4_SYSV_ABI sceAppContentGetEntitlementKey(); int PS4_SYSV_ABI sceAppContentGetRegion(); int PS4_SYSV_ABI sceAppContentInitialize(const OrbisAppContentInitParam* initParam,