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

More string switching.

Browse Source
This commit is contained in:
Ben Vanik
2014-08-16 16:46:20 -07:00
parent 7c5fa88661
commit ead74f2cdb
10 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/kernel/fs/devices/disc_image_entry.cc
View File

@@ -87,10 +87,9 @@ X_STATUS DiscImageEntry::QueryDirectory(
auto end = (uint8_t*)out_info + length;
auto entry = *gdfx_entry_iterator_;
auto entry_name = entry->name.c_str();
size_t entry_name_length = xestrlena(entry_name);
auto entry_name = entry->name;
if (((uint8_t*)&out_info->file_name[0]) + entry_name_length > end) {
if (((uint8_t*)&out_info->file_name[0]) + entry_name.size() > end) {
gdfx_entry_iterator_ = gdfx_entry_->children.end();
return X_STATUS_UNSUCCESSFUL;
}
@@ -104,8 +103,8 @@ X_STATUS DiscImageEntry::QueryDirectory(
out_info->end_of_file = entry->size;
out_info->allocation_size = 2048;
out_info->attributes = (X_FILE_ATTRIBUTES)entry->attributes;
out_info->file_name_length = (uint32_t)entry_name_length;
memcpy(out_info->file_name, entry_name, entry_name_length);
out_info->file_name_length = static_cast<uint32_t>(entry_name.size());
memcpy(out_info->file_name, entry_name.c_str(), entry_name.size());
return X_STATUS_SUCCESS;
}

9
src/xenia/kernel/fs/devices/stfs_container_entry.cc
View File

@@ -66,10 +66,9 @@ X_STATUS STFSContainerEntry::QueryDirectory(
auto end = (uint8_t*)out_info + length;
auto entry = *stfs_entry_iterator_;
auto entry_name = entry->name.c_str();
size_t entry_name_length = xestrlena(entry_name);
auto entry_name = entry->name;
if (((uint8_t*)&out_info->file_name[0]) + entry_name_length > end) {
if (((uint8_t*)&out_info->file_name[0]) + entry_name.size() > end) {
stfs_entry_iterator_ = stfs_entry_->children.end();
return X_STATUS_UNSUCCESSFUL;
}
@@ -82,8 +81,8 @@ X_STATUS STFSContainerEntry::QueryDirectory(
out_info->end_of_file = entry->size;
out_info->allocation_size = 4096;
out_info->attributes = entry->attributes;
out_info->file_name_length = (uint32_t)entry_name_length;
memcpy(out_info->file_name, entry_name, entry_name_length);
out_info->file_name_length = static_cast<uint32_t>(entry_name.size());
memcpy(out_info->file_name, entry_name.c_str(), entry_name.size());
return X_STATUS_SUCCESS;
}

8
src/xenia/kernel/xboxkrnl_rtl.cc
View File

@@ -153,7 +153,7 @@ SHIM_CALL RtlInitAnsiString_shim(
if (source_ptr != 0) {
const char* source = (char*)SHIM_MEM_ADDR(source_ptr);
uint16_t length = (uint16_t)xestrlena(source);
uint16_t length = (uint16_t)strlen(source);
SHIM_SET_MEM_16(destination_ptr + 0, length);
SHIM_SET_MEM_16(destination_ptr + 2, length + 1);
} else {
@@ -211,8 +211,10 @@ SHIM_CALL RtlInitUnicodeString_shim(
// _In_opt_ PCWSTR SourceString
if (source.size()) {
SHIM_SET_MEM_16(destination_ptr + 0, source.size() * 2);
SHIM_SET_MEM_16(destination_ptr + 2, (source.size() + 1) * 2);
SHIM_SET_MEM_16(destination_ptr + 0,
static_cast<uint16_t>(source.size() * 2));
SHIM_SET_MEM_16(destination_ptr + 2,
static_cast<uint16_t>((source.size() + 1) * 2));
SHIM_SET_MEM_32(destination_ptr + 4, source_ptr);
} else {
SHIM_SET_MEM_16(destination_ptr + 0, 0);