Skip to content

Commit 58f1fc6

Browse files
SciresMfincs
authored andcommitted
caps: add fields to AlbumFileId, simplify old invoke
1 parent 65c643f commit 58f1fc6

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

nx/include/switch/services/caps.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ typedef struct {
9393
CapsAlbumFileDateTime datetime; ///< \ref CapsAlbumFileDateTime
9494
u8 storage; ///< \ref CapsAlbumStorage
9595
u8 content; ///< \ref CapsAlbumFileContents
96-
u8 pad_x12[0x6]; ///< padding
96+
u8 unknown_12; ///< [19.0.0+]
97+
u8 unknown_13; ///< [19.0.0+]
98+
u8 pad_x14[0x4]; ///< padding
9799
} CapsAlbumFileId;
98100

99101
/// AlbumEntry

nx/source/services/capsc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,8 @@ Result capscGetApplicationIdFromAruid(CapsApplicationId *application_id, u64 aru
8080

8181
if (hosversionAtLeast(19,0,0))
8282
return serviceDispatchInOut(&g_capscSrv, 2013, aruid, *application_id);
83-
84-
u64 old_application_id=0;
85-
Result rc = serviceDispatchInOut(&g_capscSrv, 2013, aruid, old_application_id);
86-
if (R_SUCCEEDED(rc))
87-
*application_id = (CapsApplicationId){ old_application_id, 0, 0 };
88-
return rc;
83+
else
84+
return serviceDispatchInOut(&g_capscSrv, 2013, aruid, application_id->application_id);
8985
}
9086

9187
Result capscCheckApplicationIdRegistered(u64 application_id) {

0 commit comments

Comments
 (0)