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

[Kernel] Fix some stuff from PR merge.

This commit is contained in:
gibbed 2018-11-23 17:27:35 -06:00
parent 66c10a4b9f
commit 213e688173
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,7 @@ dword_result_t XamContentCreateDeviceEnumerator(dword_t content_type,
*handle_out = e->handle(); *handle_out = e->handle();
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
DECLARE_XAM_EXPORT(XamContentCreateDeviceEnumerator, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamContentCreateDeviceEnumerator, kNone, kImplemented);
dword_result_t XamContentCreateEx(dword_t user_index, lpstring_t root_name, dword_result_t XamContentCreateEx(dword_t user_index, lpstring_t root_name,
lpvoid_t content_data_ptr, dword_t flags, lpvoid_t content_data_ptr, dword_t flags,

22
src/xenia/kernel/xam/xam_info.cc
View File

@ -49,7 +49,7 @@ dword_result_t XamGetOnlineSchema() {
// return pointer to the schema ptr/schema size struct // return pointer to the schema ptr/schema size struct
return schema_ptr_guest; return schema_ptr_guest;
} }
DECLARE_XAM_EXPORT(XamGetOnlineSchema, ExportTag::kImplemented); DECLARE_XAM_EXPORT2(XamGetOnlineSchema, kNone, kImplemented, kSketchy);
void XamFormatDateString(dword_t unk, qword_t filetime, lpvoid_t buffer, void XamFormatDateString(dword_t unk, qword_t filetime, lpvoid_t buffer,
dword_t buffer_length) { dword_t buffer_length) {
@ -73,9 +73,11 @@ void XamFormatDateString(dword_t unk, qword_t filetime, lpvoid_t buffer,
stLocal.wYear); stLocal.wYear);
xe::copy_and_swap((wchar_t*)buffer.host_address(), buf, buffer_length); xe::copy_and_swap((wchar_t*)buffer.host_address(), buf, buffer_length);
#else
assert_always();
#endif #endif
} }
DECLARE_XAM_EXPORT(XamFormatDateString, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamFormatDateString, kNone, kImplemented);
void XamFormatTimeString(dword_t unk, qword_t filetime, lpvoid_t buffer, void XamFormatTimeString(dword_t unk, qword_t filetime, lpvoid_t buffer,
dword_t buffer_length) { dword_t buffer_length) {
@ -97,9 +99,11 @@ void XamFormatTimeString(dword_t unk, qword_t filetime, lpvoid_t buffer,
swprintf(buf, 256, L"%02d:%02d", stLocal.wHour, stLocal.wMinute); swprintf(buf, 256, L"%02d:%02d", stLocal.wHour, stLocal.wMinute);
xe::copy_and_swap((wchar_t*)buffer.host_address(), buf, buffer_length); xe::copy_and_swap((wchar_t*)buffer.host_address(), buf, buffer_length);
#else
assert_always();
#endif #endif
} }
DECLARE_XAM_EXPORT(XamFormatTimeString, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamFormatTimeString, kNone, kImplemented);
dword_result_t keXamBuildResourceLocator(uint64_t module, dword_result_t keXamBuildResourceLocator(uint64_t module,
const wchar_t* container, const wchar_t* container,
@ -129,7 +133,7 @@ dword_result_t XamBuildResourceLocator(qword_t module, lpwstring_t container,
resource.value().c_str(), buffer, resource.value().c_str(), buffer,
buffer_length); buffer_length);
} }
DECLARE_XAM_EXPORT(XamBuildResourceLocator, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamBuildResourceLocator, kNone, kImplemented);
dword_result_t XamBuildGamercardResourceLocator(lpwstring_t filename, dword_result_t XamBuildGamercardResourceLocator(lpwstring_t filename,
lpvoid_t buffer, lpvoid_t buffer,
@ -145,7 +149,7 @@ dword_result_t XamBuildGamercardResourceLocator(lpwstring_t filename,
return keXamBuildResourceLocator(0, L"gamercrd", filename.value().c_str(), return keXamBuildResourceLocator(0, L"gamercrd", filename.value().c_str(),
buffer, buffer_length); buffer, buffer_length);
} }
DECLARE_XAM_EXPORT(XamBuildGamercardResourceLocator, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamBuildGamercardResourceLocator, kNone, kImplemented);
dword_result_t XamBuildSharedSystemResourceLocator(lpwstring_t filename, dword_result_t XamBuildSharedSystemResourceLocator(lpwstring_t filename,
lpvoid_t buffer, lpvoid_t buffer,
@ -154,23 +158,21 @@ dword_result_t XamBuildSharedSystemResourceLocator(lpwstring_t filename,
return keXamBuildResourceLocator(0, L"shrdres", filename.value().c_str(), return keXamBuildResourceLocator(0, L"shrdres", filename.value().c_str(),
buffer, buffer_length); buffer, buffer_length);
} }
DECLARE_XAM_EXPORT(XamBuildSharedSystemResourceLocator, DECLARE_XAM_EXPORT1(XamBuildSharedSystemResourceLocator, kNone, kImplemented);
ExportTag::kImplemented);
dword_result_t XamBuildLegacySystemResourceLocator(lpwstring_t filename, dword_result_t XamBuildLegacySystemResourceLocator(lpwstring_t filename,
lpvoid_t buffer, lpvoid_t buffer,
dword_t buffer_length) { dword_t buffer_length) {
return XamBuildSharedSystemResourceLocator(filename, buffer, buffer_length); return XamBuildSharedSystemResourceLocator(filename, buffer, buffer_length);
} }
DECLARE_XAM_EXPORT(XamBuildLegacySystemResourceLocator, DECLARE_XAM_EXPORT1(XamBuildLegacySystemResourceLocator, kNone, kImplemented);
ExportTag::kImplemented);
dword_result_t XamBuildXamResourceLocator(lpwstring_t filename, lpvoid_t buffer, dword_result_t XamBuildXamResourceLocator(lpwstring_t filename, lpvoid_t buffer,
dword_t buffer_length) { dword_t buffer_length) {
return keXamBuildResourceLocator(0, L"xam", filename.value().c_str(), buffer, return keXamBuildResourceLocator(0, L"xam", filename.value().c_str(), buffer,
buffer_length); buffer_length);
} }
DECLARE_XAM_EXPORT(XamBuildXamResourceLocator, ExportTag::kImplemented); DECLARE_XAM_EXPORT1(XamBuildXamResourceLocator, kNone, kImplemented);
dword_result_t XamGetSystemVersion() { dword_result_t XamGetSystemVersion() {
// eh, just picking one. If we go too low we may break new games, but // eh, just picking one. If we go too low we may break new games, but