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

Added LibnxError_LibAppletBadExit, which is now used in swkbd.

Browse Source
This commit is contained in:
yellows8 2018-12-20 21:08:36 -05:00
parent 58cbacc76f
commit 59382cab1f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/result.h
View File

@ -122,6 +122,7 @@ enum {
LibnxError_ApmFailedToInitialize, LibnxError_ApmFailedToInitialize,
LibnxError_NvinfoFailedToInitialize, LibnxError_NvinfoFailedToInitialize,
LibnxError_NvbufFailedToInitialize, LibnxError_NvbufFailedToInitialize,
LibnxError_LibAppletBadExit,
}; };
/// libnx binder error codes /// libnx binder error codes

7
nx/source/applets/swkbd.c
View File

@ -37,7 +37,7 @@ static Result _swkbdProcessOutput(AppletHolder* h, char* out_string, size_t out_
if (strbuf) memset(strbuf, 0, strbuf_size+2); if (strbuf) memset(strbuf, 0, strbuf_size+2);
if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, 0, &CloseResult, sizeof(CloseResult)); if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, 0, &CloseResult, sizeof(CloseResult));
if (R_SUCCEEDED(rc) && CloseResult!=0) rc = 0x29f;//TODO: See below. if (R_SUCCEEDED(rc) && CloseResult!=0) rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, sizeof(CloseResult), strbuf, strbuf_size); if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, sizeof(CloseResult), strbuf, strbuf_size);
if (R_SUCCEEDED(rc)) _swkbdConvertToUTF8(out_string, strbuf, out_string_size-1); if (R_SUCCEEDED(rc)) _swkbdConvertToUTF8(out_string, strbuf, out_string_size-1);
@ -85,11 +85,10 @@ Result swkbdShow(SwkbdConfig* c, char* out_string, size_t out_string_size) {
LibAppletExitReason reason = appletHolderGetExitReason(&holder); LibAppletExitReason reason = appletHolderGetExitReason(&holder);
if (reason == LibAppletExitReason_Canceled) { if (reason == LibAppletExitReason_Canceled) {
rc = 0x29f;//TODO: Official sw returns this, replace it with something else. rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
} }
else if (reason == LibAppletExitReason_Abnormal || reason == LibAppletExitReason_Unexpected) { else if (reason == LibAppletExitReason_Abnormal || reason == LibAppletExitReason_Unexpected) {
//TODO: Official sw asserts here - return a proper error here. rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
return -1;
} }
else { //success else { //success
rc = _swkbdProcessOutput(&holder, out_string, out_string_size); rc = _swkbdProcessOutput(&holder, out_string, out_string_size);