Commit Graph

5654 Commits

Author SHA1 Message Date
Gliniak 6e538300c1 Revert "[XAM/User] Added title_id == 0 check for few User functions"
This reverts commit 05433007c5.
2020-01-10 15:17:54 +01:00
Gliniak 2749ab1284 [XAM/User] Added title_id == 0 check for few User functions
Games like to report title_id as 0 (it is expected behaviour).
0 in this case means currently opened title
2020-01-10 15:17:54 +01:00
Gliniak 7d9e8fba2c [GPU] InitializeRingBuffer - Clear buffer space to prevent random data readout 2020-01-10 15:17:53 +01:00
emoose 0ffe2e712d [XAM] Add XamShowCreateProfileUI & XamProfileCreate impl.
Seems to kinda work, xshell uses XamProfileCreate and says that it's successful at least.
Dash uses the ShowUI function, but doesn't seem to login to the created profile correctly for some reason... restarting with the toml configured for the new profile does seem to work though.
2020-01-10 15:17:53 +01:00
emoose 1ebd47dc0f [VFS] Oops, fix wrong BlockToOffset result for non-CON packages 2020-01-10 15:17:53 +01:00
emoose 9fbc85796a [Kernel] Fix XamReadTile not returning profile pic, breaking dash profile...
This caused dash not to load profile anymore, since dash passes user_index == kNone...
The new method should be closer to how things are actually meant to work.
2020-01-10 15:17:53 +01:00
emoose 58632f2a21 [VFS] Port new BlockToOffsetSTFS algo from stfs-headers
65ca664fdb
This should give better compatibility with CON packages - ie. profiles taken from actual consoles should hopefully extract properly without errors, now there's shouldn't be any need for extracting them with Velocity/Horizon first.
2020-01-10 15:17:52 +01:00
emoose 42c5890c5e [XMP] Add extra checks from XAM to help prevent dash host crash 2020-01-10 15:17:52 +01:00
emoose cb2fbb51bd [User] Add some extra checks from XAM to Read/WriteProfileSettings exports 2020-01-10 15:17:52 +01:00
emoose 073d2ed75b [XAM/User] Fix wrong error code given when ReadProfileSettings buffer is too small
Strange, seems ReadProfileSettings returns this error as the result code instead of the xoverlapped error code - it could be possible other Xam functions do the same too.
This fixes Crackdown loading (thanks Gliniak for the tip about buffer size), hope it doesn't break any other games though.
2020-01-10 15:17:52 +01:00
emoose 94bc499400 [XAM/User] Fix dashboard GPD overwrite when loading new game 2020-01-10 15:17:51 +01:00
emoose d6367e36d4 [XAM/User] Allow titles to actually access title-specific settings
Would only allow access to dash GPD previously...
I'm not sure if we need to setup the XPROFILE_TITLE_SPECIFIC settings in advance or not though, really it should be on the games to do this themselves, but not sure whats actually needed...

This should probably fix games that would save progress to profile (Halo 3 progression, etc.), haven't actually noticed any changes myself yet though.
2020-01-10 15:17:51 +01:00
emoose 5483c4ea92 [User/XAM] Oops, fix null pointer deref 2020-01-10 15:17:51 +01:00
emoose 56d4a7aa20 [XAM/User] Try logging in to any available profile when XUID isn't set
Now the XUID doesn't need to be set at all for Xenia to try logging into an available profile (as long as signin_state != 0, previously this needed XUID to be set to '1')

So from a default install, you should be able to just drop an X360 profile into the right profiles dir, and when you run Xenia it'll login to it automatically for you, no config changes needed!

This applies to all 4 user slots, just set their signin states, drop 4 profiles in and it should log them all into each one seperately, then you can edit the config with specific profile XUIDs for each user.

Xenia should now only generate a default XeniaUser profile when no profiles are available for a user.
2020-01-10 15:17:51 +01:00
emoose e3aff6d335 [XAM/User] Add UserIndex enum, handle special UserIndexes inside KernelState::user_profile 2020-01-10 15:17:51 +01:00
emoose ffed5eda3a [XAM/User] Add support for multiple signed-in users/profiles
This adds support for multiple profiles to Xenia, profiles can be configured with the [Profiles] user_*_xuid / user_*_state config settings.
If state is non-zero (1 = offline, 2 = LIVE), the profile will be counted as logged-on - either with a generated XeniaUser gamertag, or if the XUID is set to 1 the first available profile will be loaded.
The XUID can also be set to the offline-XUID (E000...) of an existing profile, to sign in the user as that profile.
(Profiles should be stored in the Xenia content/FFFE07D1/00010000/ folder, either as an STFS package or an extracted folder)

All the XamUser* functions have been updated to support multiple user_index's provided to them too.
(there's still issues with weird indexes like 0xFF, 0x7FF9... being given though, still dunno what's with that, the KernelState::user_profile() code will treat 0xFF as 0)

I'm not really sure if this is the most ideal way to do things though, but it does appear to work fine, at least Halo 3 does detect the profiles with state > 0 fine.

TODO: look into changing up xam_content to make use of user_index & profiles.
It shouldn't be too difficult now to emulate the same content paths X360 uses (seperating content by XUID etc)
Would probably be a good idea, since it'd probably be needed for us to support multiple profiles properly, so that they don't all share savegames etc...
2020-01-10 15:17:50 +01:00
emoose dbaa00cef0 [HID] Allow winkey driver to use the first unused user index
This removes the user_index == 0 requirement from the InputSystem code, and updates WinKeyInputDriver to use the first non-connected user index if it can.

Eg. if you had 2 XInput controllers plugged in, those two will take up user index 0 and 1, and keyboard will take user index 2.
If all four indexes are taken up already, the WinKey driver will be disabled.

(This is done by passing already-setup drivers to each drivers Setup function: since WinKey is the last to be setup, this'll let it query the XInput driver and find which user_index it should handle)
2020-01-10 15:15:32 +01:00
emoose 39f8ec655b [Xam/Content] Remove unused ResolveGameUserContentPath func
(not needed since we store this stuff inside GPD now)
2020-01-10 15:15:32 +01:00
emoose 12674aa529 [XAM] Allow loading profile from STFS (extracts package automatically!)
Profiles can now be placed as either an extracted folder with GPDs, or an STFS package, inside the Documents\Xenia\content\FFFE07D1\00010000\ directory
eg. Documents\Xenia\content\FFFE07D1\00010000\E0000E07FA53D7F1
(this roughly matches the same location as X360 stores it)

If loading an STFS package the package will first get extracted to <path>.dir/, and then the profile is loaded/saved into that directory.
(originally was going to mount the package and read everything in-memory, but then realized how hard adding new files/modifying/etc would be.. VFS doesn't allow mixing two devices into the same mount_path afaik)

Code for extraction is taken from xenia-vfs-dump (as StfsContainerDevice::ExtractToFolder)

A [XAM]profile_xuid config option is added too, which should let you pick which profile to load from the FFFE07D1\00010000\ folder if you have multiple there.
(at least I hope it should - something like "profile_xuid = 0xE0000E07FA53D7F1" will work I hope... cpptoml might have issues with hex digits though, not sure, will investigate later...)
If profile_xuid isn't set (left at -1), Xenia will just load whatever the first file/folder inside there is.
2020-01-10 15:15:32 +01:00
emoose 41b94145e2 [Base] Change DEFINE_uint64 -> DEFINE_int64, cpptoml seems to have issues with uint64..
Tried setting a uint64 setting to -1 (FFFF FFFF FFFF FFFF), which made it throw a out of range exception when loading the toml...
Internally it uses int64 to parse numbers, so I guess it doesn't work well with converting to uint64?
Changing everything from uint64->int64 seems to solve it though, now -1 works fine.
2020-01-10 15:15:31 +01:00
emoose bc129c2c4d [VFS] Fix STFS file table info being read in wrong endian 2020-01-10 15:15:31 +01:00
emoose f472b859f6 [XAM/User] Fix AchievementPlatform definitions...
big oof
2020-01-10 15:15:31 +01:00
emoose 2e6306a270 [XAM/User] Store profile inside content root instead of next to EXE
eg. Documents/Xenia/content/profile/
2020-01-10 15:15:31 +01:00
emoose 8d68e77630 [XAM/Misc] Impl. IsSystem/IsXbox1/IsSystemExperience & FirstRunExperienceShouldRun exports 2020-01-10 15:15:30 +01:00
emoose 7d2e07fe38 [XAM/User] Only add arcade games to profile if license_mask is set 2020-01-10 15:15:30 +01:00
emoose 2bf72f5a35 [XAM/User] GetTitleId -> GetTitleData, check flags/titletype before adding to profile 2020-01-10 15:15:30 +01:00
emoose 75d52e7a43 [XAM/User] ...CreateTitlesPlayedEnumerator: sort titles by date played (thanks Gliniak!) 2020-01-10 15:15:30 +01:00
emoose 74ca77a5a3 [XAM/User] Stub GetIndexFromXUID, add param to IsOnlineEnabled
Maybe can help with user_index issues? Not sure, dash still seems to use some wacky indexes sometimes..
2020-01-10 15:15:29 +01:00
emoose 016f89f4da [XAM/User] XamReadTile: support reading gamerpic from profile tile_64.png file 2020-01-10 15:15:29 +01:00
emoose 5f70be7fbe [XAM/User] Add extra checks to XamReadTile, remove GetTitleSpa
GetTitleGpd should work fine for what we're using it for here... it could be a good idea to keep an instance of the current SpaFile of the running title and have a GetTitleSpa that returns that though, since I think some stuff like XamReadString might eventually need access to SPA data, not really sure yet though.
2020-01-10 15:15:29 +01:00
emoose fe250d98d9 [XAM] Allow reading binary & unicode settings, but block AVATAR_INFO_1 2020-01-10 15:15:29 +01:00
emoose 946b2126be [XAM] Small XamUserCreateTitlesPlayedEnumerator tweaks + other fixups 2020-01-10 15:15:28 +01:00
emoose c2e4e7b911 [XAM] UserProfile: Update ach/gamerscore info inside UpdateGpd, add dash checks to SetTitleSpaData 2020-01-10 15:15:28 +01:00
emoose 5957ff5b12 [XAM] UserProfile::LoadProfile: setup default settings 2020-01-10 15:15:28 +01:00
emoose 4d36f46edc [XAM] Update profile setting code to use new xdbf::Setting struct 2020-01-10 15:15:28 +01:00
emoose 574ea8f334 [XAM] xdbf.h: const-ify some parameters 2020-01-10 15:15:27 +01:00
emoose a53e841cd7 [XAM] xdbf.h: add more achievement details (flags, comments..) 2020-01-10 15:15:27 +01:00
emoose 1c405b4804 [XAM] xdbf_xbox.h: add X360 GPD settings structs + minor fixups 2020-01-10 15:15:27 +01:00
Gliniak 7df62cfc68 [XAM/User] XamUserCreateTitlesPlayedEnumerator - Skip titles without achievements
It mimics behaviour of real 360 dashboard that
skips info about demos and system apps

also smaller code style changes
2020-01-10 15:15:27 +01:00
Gliniak 0a4d1e8073 [XAM/User] Implemented sketchy XamReadTileEx
Also changes to XamReadTile
2020-01-10 15:15:26 +01:00
Gliniak 7f1882ea6c [XAM/User] Resolved missing profile tab on 12xxx dashboard
It doesn't provide overlap pointer and requires instant response
2020-01-10 15:15:26 +01:00
Gliniak 4f78f839fb [XAM/User] Added descriptions and labels for achievements
Disclaimer: On old dash it causes memleak (slight),
newer dashboards allocates them only once which is solution for that.

Ps. If anyone have easy solution please implement it. Cheers
2020-01-10 15:15:26 +01:00
Gliniak 12bdaca517 [XAM/Misc] Added stub for: XamIsXbox1TitleId 2020-01-10 15:15:26 +01:00
Gliniak 52904ce2f4 [User] Removed hardcode from XPROFILE_GAMERCARD_TITLES_PLAYED
(Now dashboard 9199 shows more reliable amount of games played)
2020-01-10 15:15:25 +01:00
Cancerous 65781c9329 stubs for 9199 (eventually) 2020-01-10 15:13:46 +01:00
Gliniak 06e9f7bab6 [User] Added method for calculating gamerscore 2020-01-10 15:13:46 +01:00
Gliniak ef9f28b966 [XAM/Media] Added stub for: XamLoaderGetMediaInfo 2020-01-10 15:13:46 +01:00
Gliniak 2e5c5ac0b1 [XAM/User] Added Stub for: XamUserIsOnlineEnabled 2020-01-10 15:13:46 +01:00
Gliniak 82e739d570 [XAM/User] XamUserGetGamerTag - added exception for user_index -1 (0xFF)
(Fixes gamertag in 9199 dash)
2020-01-10 15:13:46 +01:00
Gliniak 1cbff63830 [Profile] Added dummy settings (This causes gamertag to appear) 2020-01-10 15:13:46 +01:00