From c741d7d5cc9f7673dc455c9e663835d5867718ad Mon Sep 17 00:00:00 2001 From: Lectem Date: Thu, 28 Jul 2016 00:40:50 +0200 Subject: [PATCH] fix incorrect values for bool outputs in services --- libctru/source/services/am.c | 2 +- libctru/source/services/apt.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libctru/source/services/am.c b/libctru/source/services/am.c index cc51e25..4d8e640 100644 --- a/libctru/source/services/am.c +++ b/libctru/source/services/am.c @@ -560,7 +560,7 @@ Result AM_QueryAvailableExternalTitleDatabase(bool* available) if(R_FAILED(ret = (Result)cmdbuf[1])) return ret; // Only accept this if the command was a success - if(available) *available = cmdbuf[2]; + if(available) *available = cmdbuf[2] & 0xFF; return ret; } diff --git a/libctru/source/services/apt.c b/libctru/source/services/apt.c index d750a53..ec84449 100644 --- a/libctru/source/services/apt.c +++ b/libctru/source/services/apt.c @@ -635,8 +635,8 @@ Result APT_GetAppletInfo(NS_APPID appID, u64* pProgramID, u8* pMediaType, bool* { if (pProgramID) *pProgramID =(u64)cmdbuf[2]|((u64)cmdbuf[3]<<32); if (pMediaType) *pMediaType =cmdbuf[4]; - if (pRegistered) *pRegistered=cmdbuf[5]; - if (pLoadState) *pLoadState =cmdbuf[6]; + if (pRegistered) *pRegistered=cmdbuf[5] & 0xFF; + if (pLoadState) *pLoadState =cmdbuf[6] & 0xFF; if (pAttributes) *pAttributes=cmdbuf[7]; } @@ -678,7 +678,7 @@ Result APT_IsRegistered(NS_APPID appID, bool* out) Result ret = aptSendCommand(cmdbuf); if (R_SUCCEEDED(ret)) - *out=cmdbuf[2]; + *out=cmdbuf[2] & 0xFF; return ret; } @@ -884,7 +884,7 @@ Result APT_CancelParameter(NS_APPID source, NS_APPID dest, bool* success) Result ret = aptSendCommand(cmdbuf); if (R_SUCCEEDED(ret) && success) - *success = cmdbuf[2]&0xFF; + *success = cmdbuf[2] & 0xFF; return ret; } @@ -973,7 +973,7 @@ static Result APT_CheckNew3DS_System(bool* out) Result ret = aptSendCommand(cmdbuf); if (R_SUCCEEDED(ret)) - *out = cmdbuf[2]&0xFF; + *out = cmdbuf[2] & 0xFF; return ret; }