fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected implementation of %s for _vswprintf.

Browse Source
This commit is contained in:
gibbed
2014-01-17 19:15:40 -08:00
parent 373d8a3eb8
commit 4fa3efd2b6
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/xenia/kernel/xboxkrnl_strings.cc
View File

@@ -436,8 +436,7 @@ SHIM_CALL _vswprintf_shim(
XEASSERT(false); XEASSERT(false);
} }
} }
else if (*end == 's' || else if (*end == 'p') {
*end == 'p') {
wchar_t local[512]; wchar_t local[512];
local[0] = '\0'; local[0] = '\0';
wcsncat(local, start, end + 1 - start); wcsncat(local, start, end + 1 - start);
@@ -445,7 +444,7 @@ SHIM_CALL _vswprintf_shim(
XEASSERT(arg_size == 4); XEASSERT(arg_size == 4);
if (arg_extras == 0) { if (arg_extras == 0) {
uint32_t value = (uint32_t)SHIM_MEM_64(arg_ptr + (arg_index * 8)); // TODO: check if this is correct... uint32_t value = (uint32_t)SHIM_MEM_64(arg_ptr + (arg_index * 8)); // TODO: check if this is correct...
const wchar_t* pointer = (const wchar_t*)SHIM_MEM_ADDR(value); const char* pointer = (const char*)SHIM_MEM_ADDR(value);
int result = wsprintf(b, local, pointer); int result = wsprintf(b, local, pointer);
b += result; b += result;
arg_index++; arg_index++;
@@ -454,6 +453,31 @@ SHIM_CALL _vswprintf_shim(
XEASSERT(false); XEASSERT(false);
} }
} }
else if (*end == 's') {
wchar_t local[512];
local[0] = '\0';
wcsncat(local, start, end + 1 - start);
XEASSERT(arg_size == 4);
if (arg_extras == 0) {
uint32_t value = (uint32_t)SHIM_MEM_64(arg_ptr + (arg_index * 8)); // TODO: check if this is correct...
const wchar_t* data = (const wchar_t*)SHIM_MEM_ADDR(value);
size_t data_length = wcslen(data);
wchar_t* swapped_data = (wchar_t*)xe_malloc((data_length + 1) * sizeof(wchar_t));
for (size_t i = 0; i < data_length; ++i)
{
swapped_data[i] = XESWAP16(data[i]);
}
swapped_data[data_length] = '\0';
int result = wsprintf(b, local, swapped_data);
xe_free(swapped_data);
b += result;
arg_index++;
}
else {
XEASSERT(false);
}
}
else { else {
XEASSERT(false); XEASSERT(false);
break; break;