From a2c378c5943c98a22d8ef019ac1846e397dc5943 Mon Sep 17 00:00:00 2001 From: Tunip3 Date: Tue, 10 Aug 2021 15:45:14 +0100 Subject: [PATCH 1/3] add entry to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e79b4a5556..6bee5b0885 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ param.sfo *.self *.vpk /.vs +/deps/SPIRV-Cross/out/build/x64-Debug From a4017e69e4557ce025ffe32f05d6f43a36a0b400 Mon Sep 17 00:00:00 2001 From: Tunip3 Date: Tue, 10 Aug 2021 17:24:31 +0100 Subject: [PATCH 2/3] fix cd based beetle cores --- libretro-common/vfs/vfs_implementation_uwp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-common/vfs/vfs_implementation_uwp.cpp b/libretro-common/vfs/vfs_implementation_uwp.cpp index bf0d76c8db..5452da5284 100644 --- a/libretro-common/vfs/vfs_implementation_uwp.cpp +++ b/libretro-common/vfs/vfs_implementation_uwp.cpp @@ -380,7 +380,7 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl( if (mode == RETRO_VFS_FILE_ACCESS_READ) { desireAccess = GENERIC_READ; - creationDisposition = OPEN_ALWAYS; + creationDisposition = OPEN_EXISTING; } else { From 59e36c51a30c9534654586761901ab8f09738dbb Mon Sep 17 00:00:00 2001 From: Tunip3 Date: Tue, 10 Aug 2021 17:31:59 +0100 Subject: [PATCH 3/3] simplify getting root drives --- frontend/drivers/platform_uwp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/drivers/platform_uwp.c b/frontend/drivers/platform_uwp.c index fc4dc131bf..0ad61f3d55 100644 --- a/frontend/drivers/platform_uwp.c +++ b/frontend/drivers/platform_uwp.c @@ -276,19 +276,19 @@ static int frontend_uwp_parse_drive_list(void *data, bool load_content) enum msg_hash_enums enum_idx = load_content ? MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR : MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY; - char drive[] = " :\\"; bool have_any_drives = false; - home_dir[0] = '\0'; 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, - drive, + driveName, msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), enum_idx, FILE_TYPE_DIRECTORY, 0, 0);