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

Object table names are case insensitive.

This commit is contained in:
Ben Vanik 2015-09-01 18:08:00 -07:00
parent f3c75b8d87
commit 3f433fe20a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/xenia/kernel/object_table.cc
View File

@ -262,17 +262,27 @@ X_HANDLE ObjectTable::TranslateHandle(X_HANDLE handle) {
} }
X_STATUS ObjectTable::AddNameMapping(const std::string& name, X_HANDLE handle) { X_STATUS ObjectTable::AddNameMapping(const std::string& name, X_HANDLE handle) {
// Names are case-insensitive.
std::string lower_name = name;
std::transform(lower_name.begin(), lower_name.end(), lower_name.begin(),
tolower);
std::lock_guard<xe::recursive_mutex> lock(table_mutex_); std::lock_guard<xe::recursive_mutex> lock(table_mutex_);
if (name_table_.count(name)) { if (name_table_.count(lower_name)) {
return X_STATUS_OBJECT_NAME_COLLISION; return X_STATUS_OBJECT_NAME_COLLISION;
} }
name_table_.insert({name, handle}); name_table_.insert({lower_name, handle});
return X_STATUS_SUCCESS; return X_STATUS_SUCCESS;
} }
void ObjectTable::RemoveNameMapping(const std::string& name) { void ObjectTable::RemoveNameMapping(const std::string& name) {
// Names are case-insensitive.
std::string lower_name = name;
std::transform(lower_name.begin(), lower_name.end(), lower_name.begin(),
tolower);
std::lock_guard<xe::recursive_mutex> lock(table_mutex_); std::lock_guard<xe::recursive_mutex> lock(table_mutex_);
auto it = name_table_.find(name); auto it = name_table_.find(lower_name);
if (it != name_table_.end()) { if (it != name_table_.end()) {
name_table_.erase(it); name_table_.erase(it);
} }
@ -280,8 +290,13 @@ void ObjectTable::RemoveNameMapping(const std::string& name) {
X_STATUS ObjectTable::GetObjectByName(const std::string& name, X_STATUS ObjectTable::GetObjectByName(const std::string& name,
X_HANDLE* out_handle) { X_HANDLE* out_handle) {
// Names are case-insensitive.
std::string lower_name = name;
std::transform(lower_name.begin(), lower_name.end(), lower_name.begin(),
tolower);
std::lock_guard<xe::recursive_mutex> lock(table_mutex_); std::lock_guard<xe::recursive_mutex> lock(table_mutex_);
auto it = name_table_.find(name); auto it = name_table_.find(lower_name);
if (it == name_table_.end()) { if (it == name_table_.end()) {
*out_handle = X_INVALID_HANDLE_VALUE; *out_handle = X_INVALID_HANDLE_VALUE;
return X_STATUS_OBJECT_NAME_NOT_FOUND; return X_STATUS_OBJECT_NAME_NOT_FOUND;