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

miscellaneous linux fixes. Disables vulkan-trace-viewer and dumper

This commit is contained in:
Prism Tutaj 2019-09-07 20:30:25 -05:00
parent b2ff07cea8
commit 7eb69ca255
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/gpu/vulkan/premake5.lua
View File

@ -23,7 +23,7 @@ project("xenia-gpu-vulkan")
}) })
-- TODO(benvanik): kill this and move to the debugger UI. -- TODO(benvanik): kill this and move to the debugger UI.
group("src") --[[ group("src")
project("xenia-gpu-vulkan-trace-viewer") project("xenia-gpu-vulkan-trace-viewer")
uuid("86a1dddc-a26a-4885-8c55-cf745225d93e") uuid("86a1dddc-a26a-4885-8c55-cf745225d93e")
kind("WindowedApp") kind("WindowedApp")
@ -148,3 +148,4 @@ project("xenia-gpu-vulkan-trace-dump")
"1>scratch/stdout-trace-dump.txt", "1>scratch/stdout-trace-dump.txt",
}) })
end end
--]]

6
src/xenia/kernel/xam/user_profile.cc
View File

@ -104,7 +104,7 @@ void UserProfile::EncryptAccountFile(const X_XAMACCOUNTINFO* input,
UserProfile::UserProfile() : dash_gpd_(kDashboardID) { UserProfile::UserProfile() : dash_gpd_(kDashboardID) {
account_.xuid_online = 0xE000BABEBABEBABE; account_.xuid_online = 0xE000BABEBABEBABE;
wcscpy_s(account_.gamertag, L"XeniaUser"); wcscpy(account_.gamertag, L"XeniaUser");
// https://cs.rin.ru/forum/viewtopic.php?f=38&t=60668&hilit=gfwl+live&start=195 // https://cs.rin.ru/forum/viewtopic.php?f=38&t=60668&hilit=gfwl+live&start=195
// https://github.com/arkem/py360/blob/master/py360/constants.py // https://github.com/arkem/py360/blob/master/py360/constants.py
@ -218,7 +218,7 @@ void UserProfile::LoadProfile() {
for (auto title : titles) { for (auto title : titles) {
wchar_t fname[256]; wchar_t fname[256];
_swprintf(fname, L"%X.gpd", title.title_id); swprintf(fname, 256, L"%X.gpd", title.title_id);
mmap_ = MappedMemory::Open(xe::to_wstring(cvars::profile_directory) + fname, mmap_ = MappedMemory::Open(xe::to_wstring(cvars::profile_directory) + fname,
MappedMemory::Mode::kRead); MappedMemory::Mode::kRead);
if (!mmap_) { if (!mmap_) {
@ -452,7 +452,7 @@ bool UserProfile::UpdateGpd(uint32_t title_id, xdbf::GpdFile& gpd_data) {
} }
wchar_t fname[256]; wchar_t fname[256];
_swprintf(fname, L"%X.gpd", title_id); swprintf(fname, 256, L"%X.gpd", title_id);
filesystem::CreateFile(xe::to_wstring(cvars::profile_directory) + fname); filesystem::CreateFile(xe::to_wstring(cvars::profile_directory) + fname);
auto mmap_ = auto mmap_ =

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

@ -124,7 +124,7 @@ struct X_XAMACCOUNTINFO {
std::string GetGamertagString() const; std::string GetGamertagString() const;
}; };
static_assert_size(X_XAMACCOUNTINFO, 0x17C); // static_assert_size(X_XAMACCOUNTINFO, 0x17C);
#pragma pack(pop) #pragma pack(pop)
class UserProfile { class UserProfile {

4
src/xenia/kernel/xam/xam_info.cc
View File

@ -292,7 +292,7 @@ void XamLoaderLaunchTitle(lpstring_t raw_name, dword_t flags) {
loader_data.launch_flags = flags; loader_data.launch_flags = flags;
XELOGI( XELOGI(
"XamLoaderLaunchTitle launching: (%S) with flags (%d)", "XamLoaderLaunchTitle launching: (%S) with flags (%d)",
std::string(raw_name), flags); std::string(raw_name).c_str(), flags);
// Translate the launch path to a full path. // Translate the launch path to a full path.
if (raw_name && raw_name.value() == "") { if (raw_name && raw_name.value() == "") {
loader_data.launch_path = "game:\\default.xex"; loader_data.launch_path = "game:\\default.xex";
@ -435,4 +435,4 @@ void RegisterInfoExports(xe::cpu::ExportResolver* export_resolver,
} // namespace xam } // namespace xam
} // namespace kernel } // namespace kernel
} // namespace xe } // namespace xe

4
src/xenia/kernel/xam/xam_user.cc
View File

@ -31,7 +31,7 @@ struct X_PROFILEENUMRESULT {
X_XAMACCOUNTINFO account; X_XAMACCOUNTINFO account;
xe::be<uint32_t> device_id; xe::be<uint32_t> device_id;
}; };
static_assert_size(X_PROFILEENUMRESULT, 0x188); // static_assert_size(X_PROFILEENUMRESULT, 0x188);
dword_result_t XamProfileCreateEnumerator(dword_t device_id, dword_result_t XamProfileCreateEnumerator(dword_t device_id,
lpdword_t handle_out) { lpdword_t handle_out) {
@ -572,7 +572,7 @@ dword_result_t XamUserCreateAchievementEnumerator(dword_t title_id,
static uint32_t placeholder = 0; static uint32_t placeholder = 0;
if (!placeholder) { if (!placeholder) {
wchar_t* placeholder_val = L"<placeholder>"; const wchar_t* placeholder_val = L"<placeholder>";
placeholder = kernel_memory()->SystemHeapAlloc( placeholder = kernel_memory()->SystemHeapAlloc(
((uint32_t)wcslen(placeholder_val) + 1) * 2); ((uint32_t)wcslen(placeholder_val) + 1) * 2);