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

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-04-13 20:30:17 +03:00
parent 293851d0c9 5a6b42c611
commit 286628b75b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/xenia/kernel/xboxkrnl/xboxkrnl_modules.cc
View File

@ -23,7 +23,7 @@ X_STATUS xeExGetXConfigSetting(uint16_t category, uint16_t setting,
void* buffer, uint16_t buffer_size, void* buffer, uint16_t buffer_size,
uint16_t* required_size) { uint16_t* required_size) {
uint16_t setting_size = 0; uint16_t setting_size = 0;
uint32_t value = 0; alignas(uint32_t) uint8_t value[4];
// TODO(benvanik): have real structs here that just get copied from. // TODO(benvanik): have real structs here that just get copied from.
// https://free60project.github.io/wiki/XConfig.html // https://free60project.github.io/wiki/XConfig.html
@ -34,7 +34,7 @@ X_STATUS xeExGetXConfigSetting(uint16_t category, uint16_t setting,
switch (setting) { switch (setting) {
case 0x0002: // XCONFIG_SECURED_AV_REGION case 0x0002: // XCONFIG_SECURED_AV_REGION
setting_size = 4; setting_size = 4;
value = 0x00001000; // USA/Canada xe::store_and_swap<uint32_t>(value, 0x00001000); // USA/Canada
break; break;
default: default:
assert_unhandled_case(setting); assert_unhandled_case(setting);
@ -53,25 +53,26 @@ X_STATUS xeExGetXConfigSetting(uint16_t category, uint16_t setting,
case 0x0007: // XCONFIG_USER_TIME_ZONE_DLT_BIAS case 0x0007: // XCONFIG_USER_TIME_ZONE_DLT_BIAS
setting_size = 4; setting_size = 4;
// TODO(benvanik): get this value. // TODO(benvanik): get this value.
value = 0; xe::store_and_swap<uint32_t>(value, 0);
break; break;
case 0x0009: // XCONFIG_USER_LANGUAGE case 0x0009: // XCONFIG_USER_LANGUAGE
setting_size = 4; setting_size = 4;
value = 0x00000001; // English xe::store_and_swap<uint32_t>(value, 0x00000001); // English
break; break;
case 0x000A: // XCONFIG_USER_VIDEO_FLAGS case 0x000A: // XCONFIG_USER_VIDEO_FLAGS
setting_size = 4; setting_size = 4;
value = 0x00040000; xe::store_and_swap<uint32_t>(value, 0x00040000);
break; break;
case 0x000C: // XCONFIG_USER_RETAIL_FLAGS case 0x000C: // XCONFIG_USER_RETAIL_FLAGS
setting_size = 4; setting_size = 4;
// TODO(benvanik): get this value. // TODO(benvanik): get this value.
value = 0; xe::store_and_swap<uint32_t>(value, 0);
break; break;
case 0x000E: // XCONFIG_USER_COUNTRY case 0x000E: // XCONFIG_USER_COUNTRY
setting_size = 4; // Halo: Reach sub_82804888 - min 0x5, max 0x6E.
setting_size = 1;
// TODO(benvanik): get this value. // TODO(benvanik): get this value.
value = 0; value[0] = 5;
break; break;
default: default:
assert_unhandled_case(setting); assert_unhandled_case(setting);
@ -83,15 +84,15 @@ X_STATUS xeExGetXConfigSetting(uint16_t category, uint16_t setting,
return X_STATUS_INVALID_PARAMETER_1; return X_STATUS_INVALID_PARAMETER_1;
} }
if (buffer_size < setting_size) {
return X_STATUS_BUFFER_TOO_SMALL;
}
if (!buffer && buffer_size) {
return X_STATUS_INVALID_PARAMETER_3;
}
if (buffer) { if (buffer) {
xe::store_and_swap<uint32_t>(buffer, value); if (buffer_size < setting_size) {
return X_STATUS_BUFFER_TOO_SMALL;
}
std::memcpy(buffer, value, setting_size);
} else {
if (buffer_size) {
return X_STATUS_INVALID_PARAMETER_3;
}
} }
if (required_size) { if (required_size) {
*required_size = setting_size; *required_size = setting_size;