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

(Netplay/Vita) Launch compatibility patch (#14215)

This commit is contained in:
Cthulhu-throwaway 2022-07-25 02:07:22 -03:00 committed by GitHub
parent 07e03c86fa
commit 153f77d764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 165 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
frontend/drivers/platform_psp.c
View File

@ -60,6 +60,10 @@
#include "../../paths.h" #include "../../paths.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#if !defined(IS_SALAMANDER) && defined(HAVE_NETWORKING)
#include "../../network/netplay/netplay.h"
#endif
#if defined(PSP) && defined(HAVE_KERNEL_PRX) #if defined(PSP) && defined(HAVE_KERNEL_PRX)
#include "../../bootstrap/psp1/kernel_functions.h" #include "../../bootstrap/psp1/kernel_functions.h"
#endif #endif
@ -85,50 +89,46 @@ static enum frontend_fork psp_fork_mode = FRONTEND_FORK_NONE;
static void frontend_psp_get_env_settings(int *argc, char *argv[], static void frontend_psp_get_env_settings(int *argc, char *argv[],
void *args, void *params_data) void *args, void *params_data)
{ {
struct rarch_main_wrap *params = NULL; struct rarch_main_wrap *params = (struct rarch_main_wrap*)params_data;
#ifdef VITA
strcpy_literal(eboot_path, "app0:/");
strlcpy(g_defaults.dirs[DEFAULT_DIR_PORT], eboot_path, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
strcpy_literal(user_path, "ux0:/data/retroarch/");
#else
strlcpy(eboot_path, argv[0], sizeof(eboot_path));
/* for PSP, use uppercase directories, and no trailing slashes
otherwise mkdir fails */
strcpy_literal(user_path, "ms0:/PSP/RETROARCH");
fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], argv[0], sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
#endif
#ifdef VITA #ifdef VITA
strcpy_literal(eboot_path, "app0:/");
strcpy_literal(user_path, "ux0:/data/retroarch/");
strlcpy(g_defaults.dirs[DEFAULT_DIR_PORT], eboot_path,
sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
/* bundle data*/ /* bundle data*/
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE],
"", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); g_defaults.dirs[DEFAULT_DIR_PORT], "",
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_PORT], sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
"info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO],
g_defaults.dirs[DEFAULT_DIR_PORT], "info",
sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
/* user data*/ /* user data*/
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], user_path, "assets",
"assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path,
"database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path,
"database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR])); "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path, "cheats",
"cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
"config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG])); "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], user_path,
"downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, "remaps",
"remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path,
"savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); "savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], user_path, "system",
"system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CACHE], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CACHE], user_path, "temp",
"temp", sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE])); sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], user_path,
"overlays", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY])); "overlays", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY]));
#ifdef HAVE_VIDEO_LAYOUT #ifdef HAVE_VIDEO_LAYOUT
@ -137,76 +137,73 @@ static void frontend_psp_get_env_settings(int *argc, char *argv[],
#endif #endif
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS], user_path,
"thumbnails", sizeof(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS])); "thumbnails", sizeof(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], user_path, "logs",
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY], strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY], user_path,
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY])); sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path_config, user_path, fill_pathname_join(g_defaults.path_config, user_path, FILE_PATH_MAIN_CONFIG,
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config)); sizeof(g_defaults.path_config));
#else #else
strlcpy(eboot_path, argv[0], sizeof(eboot_path));
/* for PSP, use uppercase directories, and no trailing slashes
otherwise mkdir fails */
strcpy_literal(user_path, "ms0:/PSP/RETROARCH");
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT], fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], argv[0],
"CORES", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_PORT], /* bundle data*/
"INFO", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE],
g_defaults.dirs[DEFAULT_DIR_PORT], "CORES",
sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO],
g_defaults.dirs[DEFAULT_DIR_PORT], "INFO",
sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
/* user data */ /* user data */
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path, "CHEATS",
"CHEATS", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
"CONFIG", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG])); "CONFIG", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], user_path,
"DOWNLOADS", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); "DOWNLOADS", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"PLAYLISTS", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "PLAYLISTS", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP],
"REMAPS", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], "REMAPS",
sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"SAVEFILES", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "SAVEFILES", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path,
"SAVESTATES", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); "SAVESTATES", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], user_path,
"SCREENSHOTS", sizeof(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT])); "SCREENSHOTS", sizeof(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], user_path, "SYSTEM",
"SYSTEM", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], user_path, "LOGS",
"LOGS", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CACHE], user_path, "TEMP",
/* cache dir */ sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CACHE], user_path, strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY], user_path,
"TEMP", sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE])); sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path_config, user_path, FILE_PATH_MAIN_CONFIG,
/* history and main config */ sizeof(g_defaults.path_config));
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path_config, user_path,
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
#endif #endif
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
#ifdef VITA if (params && *argc > 1 && !string_is_empty(argv[1]))
params = (struct rarch_main_wrap*)params_data; #ifdef HAVE_NETWORKING
params->verbose = true; /* If the process was forked for netplay purposes,
DO NOT touch the arguments. */
if (!string_is_equal(argv[1], "-H") && !string_is_equal(argv[1], "-C"))
#endif #endif
if (!string_is_empty(argv[1]))
{ {
static char path[PATH_MAX_LENGTH] = {0}; params->content_path = argv[1];
struct rarch_main_wrap *args = params->sram_path = NULL;
(struct rarch_main_wrap*)params_data; params->state_path = NULL;
params->config_path = NULL;
if (args) params->libretro_path = NULL;
{ params->verbose = false;
strlcpy(path, argv[1], sizeof(path)); params->no_content = false;
params->touched = true;
args->touched = true;
args->no_content = false;
args->verbose = false;
args->config_path = NULL;
args->sram_path = NULL;
args->state_path = NULL;
args->content_path = path;
args->libretro_path = NULL;
}
} }
dir_check_defaults("custom.ini"); dir_check_defaults("custom.ini");
@ -303,69 +300,92 @@ static void frontend_psp_init(void *data)
static void frontend_psp_exec(const char *path, bool should_load_game) static void frontend_psp_exec(const char *path, bool should_load_game)
{ {
#ifdef IS_SALAMANDER
char boot_params[1024];
char core_name[256];
#endif
char argp[512] = {0};
SceSize args = 0;
#if defined(PSP) #if defined(PSP)
strlcpy(argp, eboot_path, sizeof(argp)); #ifdef HAVE_KERNEL_PRX
args = strlen(argp) + 1; char argp[PATH_MAX_LENGTH];
#endif SceSize args = strlcpy(argp, eboot_path, sizeof(argp)) + 1;
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT)) if (args < sizeof(argp) && should_load_game)
{ {
argp[args] = '\0'; const char *content = path_get(RARCH_PATH_CONTENT);
strlcat(argp + args, path_get(RARCH_PATH_CONTENT), sizeof(argp) - args);
args += strlen(argp + args) + 1; if (!string_is_empty(content))
args += strlcpy(argp + args, content, sizeof(argp) - args) + 1;
} }
#endif #endif
#if defined(VITA) if (args > sizeof(argp))
#ifdef IS_SALAMANDER args = sizeof(argp);
exitspawn_kernel(path, args, argp);
#endif
#elif defined(VITA)
#ifndef IS_SALAMANDER
#ifdef HAVE_NETWORKING
const char *arg_data[NETPLAY_FORK_MAX_ARGS];
#else
const char *arg_data[2];
#endif
char game_path[PATH_MAX_LENGTH];
#else
const char *arg_data[2];
char boot_params[PATH_MAX_LENGTH];
#endif
arg_data[0] = NULL;
#ifndef IS_SALAMANDER
if (should_load_game)
{
const char *content = path_get(RARCH_PATH_CONTENT);
#ifdef HAVE_NETWORKING
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_GET_FORK_ARGS,
(void*)arg_data))
#endif
if (!string_is_empty(content))
{
strlcpy(game_path, content, sizeof(game_path));
arg_data[0] = game_path;
arg_data[1] = NULL;
}
}
#else
sceAppMgrGetAppParam(boot_params); sceAppMgrGetAppParam(boot_params);
if (strstr(boot_params,"psgm:play")) if (strstr(boot_params, "psgm:play"))
{ {
char *param1 = strstr(boot_params, "&param="); char *param1 = strstr(boot_params, "&param=");
char *param2 = strstr(boot_params, "&param2="); char *param2 = strstr(boot_params, "&param2=");
/* copy path to core_name for normal boot */ if (param1 && param2)
strlcpy(core_name, path, sizeof(core_name)); {
char *delim;
if (param1 != NULL && param2 != NULL) param1 += STRLEN_CONST("&param=");
{ param2 += STRLEN_CONST("&param2=");
if (param2 > param1 && (param2 - (param1+7) < sizeof(core_name)) && strlen(param2+8) < sizeof(argp))
{
/* handle case where param2 follows param1 */
param1 += 7;
memcpy(core_name, param1, param2 - param1);
core_name[param2-param1] = 0;
strlcpy(argp, param2 + 8, sizeof(argp));
args = strlen(argp);
}
else if (param1 > param2 && (param1 - (param2+8) < sizeof(argp)) && strlen(param1+7) < sizeof(core_name))
{
/* handle case where param1 follows param2 */
param2 += 8;
memcpy(argp, param2, param1 - param2);
argp[param1-param2] = 0;
strlcpy(core_name, param1 + 7, sizeof(core_name));
args = strlen(argp);
}
}
int ret = sceAppMgrLoadExec(core_name, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL); delim = strchr(param1, '&');
if (delim)
*delim = '\0';
delim = strchr(param2, '&');
if (delim)
*delim = '\0';
if (!string_is_empty(param1))
{
path = param1;
if (!string_is_empty(param2))
{
arg_data[0] = param2;
arg_data[1] = NULL;
}
}
}
} }
else
#endif #endif
{ sceAppMgrLoadExec(path, arg_data[0] ? arg_data : NULL, NULL);
int ret = sceAppMgrLoadExec(path, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
}
#elif defined(PSP) && defined(HAVE_KERNEL_PRX)
exitspawn_kernel(path, args, argp);
#endif #endif
} }