mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

caps(su): Updated for new-ipc. Updated for using AccountUid.

Browse Source
This commit is contained in:
yellows8 2019-10-08 22:01:37 -04:00
parent 3a1459cf4c
commit 2940833a1b
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
3 changed files with 40 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/services/caps.h
View File

@ -123,7 +123,7 @@ typedef struct {
/// UserIdList
typedef struct {
union { u128 userIDs[ACC_USER_LIST_SIZE]; } PACKED; ///< userIDs.
AccountUid userIDs[ACC_USER_LIST_SIZE]; ///< \ref AccountUid
u8 count; ///< Total userIDs.
u8 pad[7]; ///< Padding.
} CapsUserIdList;

7
nx/include/switch/services/capssu.h
View File

@ -6,7 +6,8 @@
*/
#pragma once
#include "../types.h"
#include "../services/sm.h"
#include "../sf/service.h"
#include "../services/acc.h"
#include "../services/caps.h"
/// Initialize caps:su. Only available on [4.0.0+].
@ -51,11 +52,11 @@ Result capssuSaveScreenShotWithUserData(const void* buffer, size_t size, AlbumRe
* @param[in] size Size of the buffer.
* @param[in] reportoption \ref AlbumReportOption
* @param[in] orientation \ref AlbumImageOrientation
* @param[in] userIDs Input array of account userIDs. If NULL, the \ref CapsUserIdList will be empty.
* @param[in] userIDs Input array of \ref AccountUid. If NULL, the \ref CapsUserIdList will be empty.
* @param[in] userID_count Size of the userID array in entries, must be within bounds for CapsUserIdList::userIDs. If 0, the \ref CapsUserIdList will be empty.
* @param[out] out \ref CapsApplicationAlbumEntry. Optional, can be NULL.
*/
Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const u128* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out);
Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const AccountUid* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out);
/**
* @brief Saves an Album screenshot using the specified gfx data in the buffer, with the specified \ref CapsScreenShotAttribute.

162
nx/source/services/capssu.c
View File

@ -1,28 +1,21 @@
#define NX_SERVICE_ASSUME_NON_DOMAIN
#include <string.h>
#include "types.h"
#include "result.h"
#include "arm/atomics.h"
#include "kernel/ipc.h"
#include "service_guard.h"
#include "runtime/hosversion.h"
#include "services/applet.h"
#include "services/caps.h"
#include "services/capssu.h"
#include "services/acc.h"
#include "services/sm.h"
static Service g_capssuSrv;
static u64 g_capssuRefCnt;
static Result _capssuSetShimLibraryVersion(u64 version);
Result capssuInitialize(void) {
NX_GENERATE_SERVICE_GUARD(capssu);
Result _capssuInitialize(void) {
Result rc=0;
atomicIncrement64(&g_capssuRefCnt);
if (serviceIsActive(&g_capssuSrv))
return 0;
if (hosversionBefore(4,0,0))
rc = MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
@ -30,14 +23,11 @@ Result capssuInitialize(void) {
if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) rc = _capssuSetShimLibraryVersion(capsGetShimLibraryVersion());
if (R_FAILED(rc)) capssuExit();
return rc;
}
void capssuExit(void) {
if (atomicDecrement64(&g_capssuRefCnt) == 0)
serviceClose(&g_capssuSrv);
void _capssuCleanup(void) {
serviceClose(&g_capssuSrv);
}
Service* capssuGetServiceSession(void) {
@ -51,136 +41,54 @@ static Result _capssuSetShimLibraryVersion(u64 version) {
u64 AppletResourceUserId = 0;
appletGetAppletResourceUserId(&AppletResourceUserId);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
const struct {
u64 version;
u64 AppletResourceUserId;
} *raw;
} in = { version, AppletResourceUserId };
ipcSendPid(&c);
raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 32;
raw->version = version;
raw->AppletResourceUserId = AppletResourceUserId;
Result rc = serviceIpcDispatch(&g_capssuSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
return serviceDispatchIn(&g_capssuSrv, 32, in,
.in_send_pid = true,
);
}
static Result _capssuSaveScreenShotEx0(const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
u64 AppletResourceUserId = 0;
appletGetAppletResourceUserId(&AppletResourceUserId);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
const struct {
CapsScreenShotAttribute attr;
u32 reportoption;
u64 AppletResourceUserId;
} *raw;
} in = { *attr, reportoption, AppletResourceUserId };
ipcSendPid(&c);
ipcAddSendBuffer(&c, buffer, size, BufferType_Type1);
raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 203;
raw->attr = *attr;
raw->reportoption = reportoption;
raw->AppletResourceUserId = AppletResourceUserId;
Result rc = serviceIpcDispatch(&g_capssuSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
CapsApplicationAlbumEntry out;
} *resp;
serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && out) *out = resp->out;
}
return rc;
return serviceDispatchInOut(&g_capssuSrv, 203, in, *out,
.buffer_attrs = { SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
.buffers = { { buffer, size } },
.in_send_pid = true,
);
}
static Result _capssuSaveScreenShotEx(u64 cmd_id, bool pid, const void* argbuf, size_t argbuf_size, const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
static Result _capssuSaveScreenShotEx(u32 cmd_id, bool pid, const void* argbuf, size_t argbuf_size, const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
u64 AppletResourceUserId = 0;
appletGetAppletResourceUserId(&AppletResourceUserId);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
const struct {
CapsScreenShotAttribute attr;
u32 reportoption;
u64 AppletResourceUserId;
} *raw;
} in = { *attr, reportoption, AppletResourceUserId };
if (pid) ipcSendPid(&c);
ipcAddSendBuffer(&c, argbuf, argbuf_size, BufferType_Normal);
ipcAddSendBuffer(&c, buffer, size, BufferType_Type1);
raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->attr = *attr;
raw->reportoption = reportoption;
raw->AppletResourceUserId = AppletResourceUserId;
Result rc = serviceIpcDispatch(&g_capssuSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
CapsApplicationAlbumEntry out;
} *resp;
serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && out) *out = resp->out;
}
return rc;
return serviceDispatchInOut(&g_capssuSrv, cmd_id, in, *out,
.buffer_attrs = {
SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
},
.buffers = {
{ argbuf, argbuf_size },
{ buffer, size },
},
.in_send_pid = pid,
);
}
Result capssuSaveScreenShot(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, CapsApplicationAlbumEntry *out) {
@ -211,7 +119,7 @@ Result capssuSaveScreenShotWithUserData(const void* buffer, size_t size, AlbumRe
return capssuSaveScreenShotEx1(buffer, size, &attr, reportoption, &appdata, out);
}
Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const u128* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out) {
Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const AccountUid* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out) {
CapsScreenShotAttribute attr;
CapsUserIdList list;
@ -223,7 +131,7 @@ Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumRep
attr.unk_xc = 1;
memset(&list, 0, sizeof(list));
if (userIDs && userID_count) memcpy(list.userIDs, userIDs, userID_count*sizeof(u128));
if (userIDs && userID_count) memcpy(list.userIDs, userIDs, userID_count*sizeof(AccountUid));
list.count = userID_count;
return capssuSaveScreenShotEx2(buffer, size, &attr, reportoption, &list, out);