From 6c93ebc358679807bd3ed85323cf769141852788 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Wed, 30 Oct 2024 13:41:08 -0700
Subject: [PATCH] caps: add fields to AlbumFileId, simplify old invoke

---
 nx/include/switch/services/caps.h | 4 +++-
 nx/source/services/capsc.c        | 8 ++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nx/include/switch/services/caps.h b/nx/include/switch/services/caps.h
index 7604389b..24671fe8 100644
--- a/nx/include/switch/services/caps.h
+++ b/nx/include/switch/services/caps.h
@@ -93,7 +93,9 @@ typedef struct {
     CapsAlbumFileDateTime datetime;             ///< \ref CapsAlbumFileDateTime
     u8 storage;                                 ///< \ref CapsAlbumStorage
     u8 content;                                 ///< \ref CapsAlbumFileContents
-    u8 pad_x12[0x6];                            ///< padding
+    u8 unknown_12;                              ///< [19.0.0+]
+    u8 unknown_13;                              ///< [19.0.0+]
+    u8 pad_x14[0x4];                            ///< padding
 } CapsAlbumFileId;
 
 /// AlbumEntry
diff --git a/nx/source/services/capsc.c b/nx/source/services/capsc.c
index 1f49d381..d8eb7447 100644
--- a/nx/source/services/capsc.c
+++ b/nx/source/services/capsc.c
@@ -80,12 +80,8 @@ Result capscGetApplicationIdFromAruid(CapsApplicationId *application_id, u64 aru
 
     if (hosversionAtLeast(19,0,0))
         return serviceDispatchInOut(&g_capscSrv, 2013, aruid, *application_id);
-
-    u64 old_application_id=0;
-    Result rc = serviceDispatchInOut(&g_capscSrv, 2013, aruid, old_application_id);
-    if (R_SUCCEEDED(rc))
-        *application_id = (CapsApplicationId){ old_application_id, 0, 0 };
-    return rc;
+    else
+        return serviceDispatchInOut(&g_capscSrv, 2013, aruid, application_id->application_id);
 }
 
 Result capscCheckApplicationIdRegistered(u64 application_id) {