From aef568b2069f47d6bb6361f628659589b01a84cd Mon Sep 17 00:00:00 2001 From: HookedBehemoth Date: Sun, 26 Jan 2020 20:08:02 +0100 Subject: [PATCH] capsa: fix capsaGetAlbumEntryFromApplicationAlbumEntry* --- nx/include/switch/services/capsa.h | 11 ++++++----- nx/source/services/capsa.c | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nx/include/switch/services/capsa.h b/nx/include/switch/services/capsa.h index d789c397..0730775e 100644 --- a/nx/include/switch/services/capsa.h +++ b/nx/include/switch/services/capsa.h @@ -117,12 +117,13 @@ Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFil Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size); /** - * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry + * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry and an Application Id. * @note Only available on [2.0.0+]. * @param[out] entry \ref CapsAlbumEntry * @param[in] application_entry \ref CapsApplicationAlbumEntry + * @param[in] application_id Application Id */ -Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry); +Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 application_id); /** * @brief Load the ScreenShotImage for the specified AlbumFile. @@ -329,13 +330,13 @@ Result capsaGetAlbumCache(CapsAlbumStorage storage, CapsAlbumCache *cache); Result capsaGetAlbumCacheEx(CapsAlbumStorage storage, CapsAlbumFileContents contents, CapsAlbumCache *cache); /** - * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry + * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry and an Applet Resource User Id. * @note Only available on [2.0.0+]. - * @note despite this having aruid in the name \ref capsaGetAlbumEntryFromApplicationAlbumEntry also sends it. * @param[out] entry \ref CapsAlbumEntry * @param[in] application_entry \ref CapsApplicationAlbumEntry + * @param[in] appletResourceUserId Application Resouce User Id */ -Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry); +Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 appletResourceUserId); /** * @brief Opens an AlbumMovieStream. diff --git a/nx/source/services/capsa.c b/nx/source/services/capsa.c index c5c48ea8..d37ede5f 100644 --- a/nx/source/services/capsa.c +++ b/nx/source/services/capsa.c @@ -112,13 +112,13 @@ Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const Cap return _capsaLoadAlbumScreenshot(width, height, file_id, image, image_size, workbuf, workbuf_size, 10); } -Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry) { +Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 application_id) { if (hosversionBefore(2,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); const struct { CapsApplicationAlbumEntry application_entry; - u64 aruid; - } in = { *application_entry, appletGetAppletResourceUserId() }; + u64 application_id; + } in = { *application_entry, application_id }; return serviceDispatchInOut(&g_capsaSrv, 11, in, *entry); } @@ -332,13 +332,13 @@ Result capsaGetAlbumCacheEx(CapsAlbumStorage storage, CapsAlbumFileContents cont return serviceDispatchInOut(&g_capsaSrv, 8013, in, *cache); } -Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry) { +Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 appletResourceUserId) { if (hosversionBefore(2,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); const struct { CapsApplicationAlbumEntry application_entry; u64 aruid; - } in = { *application_entry, appletGetAppletResourceUserId() }; + } in = { *application_entry, appletResourceUserId }; return serviceDispatchInOut(&g_capsaSrv, 8021, in, *entry, .in_send_pid = true); }