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

Fixing line endings.

This commit is contained in:
Ben Vanik 2013-10-16 20:10:16 -07:00
parent ab5b9d75e0
commit fea5c06180
1 changed files with 202 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

404
src/xenia/kernel/modules/xboxkrnl/xboxkrnl_rtl.cc
View File

@ -350,212 +350,212 @@ SHIM_CALL RtlUnicodeStringToAnsiString_shim(
} }
// TODO: clean me up! // TODO: clean me up!
SHIM_CALL _vsnprintf_shim( SHIM_CALL _vsnprintf_shim(
xe_ppc_state_t* ppc_state, KernelState* state) { xe_ppc_state_t* ppc_state, KernelState* state) {
uint32_t buffer_ptr = SHIM_GET_ARG_32(0); uint32_t buffer_ptr = SHIM_GET_ARG_32(0);
uint32_t count = SHIM_GET_ARG_32(1); uint32_t count = SHIM_GET_ARG_32(1);
uint32_t format_ptr = SHIM_GET_ARG_32(2); uint32_t format_ptr = SHIM_GET_ARG_32(2);
uint32_t arg_ptr = SHIM_GET_ARG_32(3); uint32_t arg_ptr = SHIM_GET_ARG_32(3);
if (format_ptr == 0) { if (format_ptr == 0) {
SHIM_SET_RETURN(-1); SHIM_SET_RETURN(-1);
return; return;
} }
char *buffer = (char *)SHIM_MEM_ADDR(buffer_ptr); // TODO: ensure it never writes past the end of the buffer (count)... char *buffer = (char *)SHIM_MEM_ADDR(buffer_ptr); // TODO: ensure it never writes past the end of the buffer (count)...
const char *format = (const char *)SHIM_MEM_ADDR(format_ptr); const char *format = (const char *)SHIM_MEM_ADDR(format_ptr);
int arg_index = 0; int arg_index = 0;
char *b = buffer; char *b = buffer;
for (; *format != '\0'; ++format) { for (; *format != '\0'; ++format) {
const char *start = format; const char *start = format;
if (*format != '%') { if (*format != '%') {
*b++ = *format; *b++ = *format;
continue; continue;
} }
++format; ++format;
if (*format == '\0') { if (*format == '\0') {
break; break;
} }
if (*format == '%') { if (*format == '%') {
*b++ = *format; *b++ = *format;
continue; continue;
} }
const char *end; const char *end;
end = format; end = format;
// skip flags // skip flags
while (*end == '-' || while (*end == '-' ||
*end == '+' || *end == '+' ||
*end == ' ' || *end == ' ' ||
*end == '#' || *end == '#' ||
*end == '0') { *end == '0') {
++end; ++end;
} }
if (*end == '\0') { if (*end == '\0') {
break; break;
} }
int arg_extras = 0; int arg_extras = 0;
// skip width // skip width
if (*end == '*') { if (*end == '*') {
++end; ++end;
arg_extras++; arg_extras++;
} }
else { else {
while (*end >= '0' && *end <= '9') { while (*end >= '0' && *end <= '9') {
++end; ++end;
} }
} }
if (*end == '\0') { if (*end == '\0') {
break; break;
} }
// skip precision // skip precision
if (*end == '.') { if (*end == '.') {
++end; ++end;
if (*end == '*') { if (*end == '*') {
++end; ++end;
++arg_extras; ++arg_extras;
} }
else { else {
while (*end >= '0' && *end <= '9') { while (*end >= '0' && *end <= '9') {
++end; ++end;
} }
} }
} }
if (*end == '\0') { if (*end == '\0') {
break; break;
} }
// get length // get length
int arg_size = 4; int arg_size = 4;
if (*end == 'h') { if (*end == 'h') {
++end; ++end;
arg_size = 4; arg_size = 4;
if (*end == 'h') { if (*end == 'h') {
++end; ++end;
} }
} }
else if (*end == 'l') { else if (*end == 'l') {
++end; ++end;
arg_size = 4; arg_size = 4;
if (*end == 'l') { if (*end == 'l') {
++end; ++end;
arg_size = 8; arg_size = 8;
} }
} }
else if (*end == 'j') { else if (*end == 'j') {
arg_size = 8; arg_size = 8;
++end; ++end;
} }
else if (*end == 'z') { else if (*end == 'z') {
arg_size = 4; arg_size = 4;
++end; ++end;
} }
else if (*end == 't') { else if (*end == 't') {
arg_size = 8; arg_size = 8;
++end; ++end;
} }
else if (*end == 'L') { else if (*end == 'L') {
arg_size = 8; arg_size = 8;
++end; ++end;
} }
if (*end == '\0') { if (*end == '\0') {
break; break;
} }
if (*end == 'd' || if (*end == 'd' ||
*end == 'i' || *end == 'i' ||
*end == 'u' || *end == 'u' ||
*end == 'o' || *end == 'o' ||
*end == 'x' || *end == 'x' ||
*end == 'X' || *end == 'X' ||
*end == 'f' || *end == 'f' ||
*end == 'F' || *end == 'F' ||
*end == 'e' || *end == 'e' ||
*end == 'E' || *end == 'E' ||
*end == 'g' || *end == 'g' ||
*end == 'G' || *end == 'G' ||
*end == 'a' || *end == 'a' ||
*end == 'A' || *end == 'A' ||
*end == 'c') { *end == 'c') {
char local[512]; char local[512];
local[0] = '\0'; local[0] = '\0';
strncat(local, start, end + 1 - start); strncat(local, start, end + 1 - start);
XEASSERT(arg_size == 8 || arg_size == 4); XEASSERT(arg_size == 8 || arg_size == 4);
if (arg_size == 8) { if (arg_size == 8) {
if (arg_extras == 0) { if (arg_extras == 0) {
uint64_t value = SHIM_MEM_64(arg_ptr + (arg_index * 8)); // TODO: check if this is correct... uint64_t value = SHIM_MEM_64(arg_ptr + (arg_index * 8)); // TODO: check if this is correct...
int result = sprintf(b, local, value); int result = sprintf(b, local, value);
b += result; b += result;
arg_index++; arg_index++;
} }
else { else {
XEASSERT(false); XEASSERT(false);
} }
} }
else if (arg_size == 4) { else if (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...
int result = sprintf(b, local, value); int result = sprintf(b, local, value);
b += result; b += result;
arg_index++; arg_index++;
} }
else { else {
XEASSERT(false); XEASSERT(false);
} }
} }
} }
else if (*end == 's' || else if (*end == 's' ||
*end == 'p' || *end == 'p' ||
*end == 'n') { *end == 'n') {
char local[512]; char local[512];
local[0] = '\0'; local[0] = '\0';
strncat(local, start, end + 1 - start); strncat(local, start, end + 1 - start);
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 char *pointer = (const char *)SHIM_MEM_ADDR(value); const char *pointer = (const char *)SHIM_MEM_ADDR(value);
int result = sprintf(b, local, pointer); int result = sprintf(b, local, pointer);
b += result; b += result;
arg_index++; arg_index++;
} }
else { else {
XEASSERT(false); XEASSERT(false);
} }
} }
else { else {
XEASSERT(false); XEASSERT(false);
break; break;
} }
format = end; format = end;
} }
*b++ = '\0'; *b++ = '\0';
SHIM_SET_RETURN((uint32_t)(b - buffer)); SHIM_SET_RETURN((uint32_t)(b - buffer));
} }
uint32_t xeRtlNtStatusToDosError(X_STATUS status) { uint32_t xeRtlNtStatusToDosError(X_STATUS status) {
if (!status || (status & 0x20000000)) { if (!status || (status & 0x20000000)) {
// Success. // Success.
return status; return status;
} else if ((status & 0xF0000000) == 0xD0000000) { } else if ((status & 0xF0000000) == 0xD0000000) {
// High bit doesn't matter. // High bit doesn't matter.
status &= ~0x10000000; status &= ~0x10000000;