ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from wszechpolak/write-gamer-tile 

Fix XamWriteGamerTile
This commit is contained in:
Ben Vanik 2014-08-16 14:56:01 -07:00
parent e082d085d0 1f8cfb6fce
commit 0675282e19
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/xam_content.cc
View File

@ -76,7 +76,7 @@ SHIM_CALL XamShowDeviceSelectorUI_shim(
XELOGD( XELOGD(
"XamShowDeviceSelectorUI(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X)", "XamShowDeviceSelectorUI(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X)",
arg0, arg1, arg2, arg3, arg4, arg5); arg0, arg1, arg2, arg3, arg4, arg5);
SHIM_SET_RETURN_32(997); SHIM_SET_RETURN_32(X_ERROR_IO_PENDING);
} }

12
src/xenia/kernel/xam_user.cc
View File

@ -283,13 +283,19 @@ SHIM_CALL XamWriteGamerTile_shim(
uint32_t arg2 = SHIM_GET_ARG_32(2); uint32_t arg2 = SHIM_GET_ARG_32(2);
uint32_t arg3 = SHIM_GET_ARG_32(3); uint32_t arg3 = SHIM_GET_ARG_32(3);
uint32_t arg4 = SHIM_GET_ARG_32(4); uint32_t arg4 = SHIM_GET_ARG_32(4);
uint32_t arg5 = SHIM_GET_ARG_32(5); uint32_t overlapped_ptr = SHIM_GET_ARG_32(5);
XELOGD( XELOGD(
"XamWriteGamerTile(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X)", "XamWriteGamerTile(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X)",
arg0, arg1, arg2, arg3, arg4, arg5); arg0, arg1, arg2, arg3, arg4, overlapped_ptr);
SHIM_SET_RETURN_32(0x3E5); if (overlapped_ptr) {
state->CompleteOverlappedImmediate(overlapped_ptr, X_ERROR_SUCCESS);
SHIM_SET_RETURN_32(X_ERROR_IO_PENDING);
}
else {
SHIM_SET_RETURN_32(X_ERROR_SUCCESS);
}
} }

1
src/xenia/xbox.h
View File

@ -76,6 +76,7 @@ typedef uint32_t X_RESULT;
#define X_ERROR_NOT_FOUND X_HRESULT_FROM_WIN32(0x00000490L) #define X_ERROR_NOT_FOUND X_HRESULT_FROM_WIN32(0x00000490L)
#define X_ERROR_CANCELLED X_HRESULT_FROM_WIN32(0x000004C7L) #define X_ERROR_CANCELLED X_HRESULT_FROM_WIN32(0x000004C7L)
#define X_ERROR_NO_SUCH_USER X_HRESULT_FROM_WIN32(0x00000525L) #define X_ERROR_NO_SUCH_USER X_HRESULT_FROM_WIN32(0x00000525L)
#define X_ERROR_FUNCTION_FAILED X_HRESULT_FROM_WIN32(0x0000065BL)
#define X_ERROR_EMPTY X_HRESULT_FROM_WIN32(0x000010D2L) #define X_ERROR_EMPTY X_HRESULT_FROM_WIN32(0x000010D2L)
// MEM_*, used by NtAllocateVirtualMemory // MEM_*, used by NtAllocateVirtualMemory