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

Merge pull request #12789 from Xbox-Homebrew/master 

Fix beetle cores on UWP and clean up the method in which drives are listed
This commit is contained in:
Autechre 2021-08-13 15:54:18 +02:00 committed by GitHub
parent 1ca1d362bf 59e36c51a3
commit 1c4895b8bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -224,3 +224,4 @@ param.sfo
*.self *.self
*.vpk *.vpk
/.vs /.vs
/deps/SPIRV-Cross/out/build/x64-Debug

10
frontend/drivers/platform_uwp.c
View File

@ -276,19 +276,19 @@ static int frontend_uwp_parse_drive_list(void *data, bool load_content)
enum msg_hash_enums enum_idx = load_content ? enum msg_hash_enums enum_idx = load_content ?
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR : MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR :
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY; MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY;
char drive[] = " :\\";
bool have_any_drives = false; bool have_any_drives = false;
home_dir[0] = '\0'; home_dir[0] = '\0';
fill_pathname_home_dir(home_dir, sizeof(home_dir)); fill_pathname_home_dir(home_dir, sizeof(home_dir));
for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) DWORD drives = GetLogicalDrives();
for (int i = 0; i < 26; i++)
{ {
if (uwp_drive_exists(drive)) if (drives & (1 << i))
{ {
TCHAR driveName[] = { TEXT('A') + i, TEXT(':'), TEXT('\\'), TEXT('\0') };
menu_entries_append_enum(list, menu_entries_append_enum(list,
drive, driveName,
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx, enum_idx,
FILE_TYPE_DIRECTORY, 0, 0); FILE_TYPE_DIRECTORY, 0, 0);

2
libretro-common/vfs/vfs_implementation_uwp.cpp
View File

@ -380,7 +380,7 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(
if (mode == RETRO_VFS_FILE_ACCESS_READ) if (mode == RETRO_VFS_FILE_ACCESS_READ)
{ {
desireAccess = GENERIC_READ; desireAccess = GENERIC_READ;
creationDisposition = OPEN_ALWAYS; creationDisposition = OPEN_EXISTING;
} }
else else
{ {