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

[XAM] Fixed issue with Content not being close due to upper-lower characters difference.

Browse Source 
- Added string_key_insensitive
This commit is contained in:
Gliniak
2025-08-06 22:22:01 +02:00
parent 10f2b5ebfc
commit e9b2464254
3 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/xenia/kernel/xam/content_manager.cc
View File

@@ -366,7 +366,7 @@ X_RESULT ContentManager::CreateContent(const std::string_view root_name,
const XCONTENT_AGGREGATE_DATA& data) {
auto global_lock = global_critical_region_.Acquire();
if (open_packages_.count(string_key(root_name))) {
if (open_packages_.count(string_key_insensitive(root_name))) {
// Already content open with this root name.
return X_ERROR_ALREADY_EXISTS;
}
@@ -384,7 +384,8 @@ X_RESULT ContentManager::CreateContent(const std::string_view root_name,
auto package = ResolvePackage(root_name, xuid, data);
assert_not_null(package);
open_packages_.insert({string_key::create(root_name), package.release()});
open_packages_.insert(
{string_key_insensitive::create(root_name), package.release()});
return X_ERROR_SUCCESS;
}
@@ -396,7 +397,7 @@ X_RESULT ContentManager::OpenContent(const std::string_view root_name,
const uint32_t disc_number) {
auto global_lock = global_critical_region_.Acquire();
if (open_packages_.count(string_key(root_name))) {
if (open_packages_.count(string_key_insensitive(root_name))) {
// Already content open with this root name.
return X_ERROR_ALREADY_EXISTS;
}
@@ -425,7 +426,8 @@ X_RESULT ContentManager::OpenContent(const std::string_view root_name,
}
}
open_packages_.insert({string_key::create(root_name), package.release()});
open_packages_.insert(
{string_key_insensitive::create(root_name), package.release()});
return X_ERROR_SUCCESS;
}
@@ -433,7 +435,9 @@ X_RESULT ContentManager::OpenContent(const std::string_view root_name,
X_RESULT ContentManager::CloseContent(const std::string_view root_name) {
auto global_lock = global_critical_region_.Acquire();
auto it = open_packages_.find(string_key(root_name));
// 415607D6 - Uses XamContentCreate with name "save", but XamContentClose with
// "SAVE".
auto it = open_packages_.find(string_key_insensitive(root_name));
if (it == open_packages_.end()) {
return X_ERROR_FILE_NOT_FOUND;
}
@@ -509,10 +513,11 @@ std::filesystem::path ContentManager::ResolveGameUserContentPath(
}
bool ContentManager::IsContentOpen(const XCONTENT_AGGREGATE_DATA& data) const {
return std::any_of(open_packages_.cbegin(), open_packages_.cend(),
[data](std::pair<string_key, ContentPackage*> content) {
return data == content.second->GetPackageContentData();
});
return std::any_of(
open_packages_.cbegin(), open_packages_.cend(),
[data](std::pair<string_key_insensitive, ContentPackage*> content) {
return data == content.second->GetPackageContentData();
});
}
void ContentManager::CloseOpenedFilesFromContent(

2
src/xenia/kernel/xam/content_manager.h
View File

@@ -211,7 +211,7 @@ class ContentManager {
// TODO(benvanik): remove use of global lock, it's bad here!
xe::global_critical_region global_critical_region_;
std::unordered_map<string_key, ContentPackage*> open_packages_;
std::unordered_map<string_key_insensitive, ContentPackage*> open_packages_;
};
} // namespace xam