Merge branch '86Box:master' into bugfixes

This commit is contained in:
starfrost
2025-12-22 22:36:25 +00:00
committed by GitHub
16 changed files with 22 additions and 16 deletions

View File

@@ -47,7 +47,7 @@
/* Recently used images */
#define MAX_PREV_IMAGES 10
#define MAX_IMAGE_PATH_LEN 2048
#define MAX_IMAGE_PATH_LEN 4096
/* Max UUID Length */
#define MAX_UUID_LEN 64

View File

@@ -21,7 +21,7 @@ extern "C" {
#define CART_IMAGE_HISTORY 10
extern char cart_fns[2][512];
extern char cart_fns[2][MAX_IMAGE_PATH_LEN];
extern char *cart_image_history[2][CART_IMAGE_HISTORY];
extern void cart_load(int drive, char *fn);

View File

@@ -157,7 +157,7 @@ void pc_cas_advance(pc_cassette_t *cas);
extern pc_cassette_t *cassette;
extern char cassette_fname[512];
extern char cassette_fname[MAX_IMAGE_PATH_LEN];
extern char cassette_mode[512];
extern char * cassette_image_history[CASSETTE_IMAGE_HISTORY];
extern unsigned long cassette_pos;

View File

@@ -323,8 +323,8 @@ typedef struct cdrom {
void *priv;
char image_path[1024];
char prev_image_path[1280];
char image_path[MAX_IMAGE_PATH_LEN];
char prev_image_path[MAX_IMAGE_PATH_LEN + 256];
uint32_t sound_on;
uint32_t cdrom_capacity;

View File

@@ -96,7 +96,7 @@ typedef struct DRIVE {
} DRIVE;
extern DRIVE drives[FDD_NUM];
extern char floppyfns[FDD_NUM][512];
extern char floppyfns[FDD_NUM][MAX_IMAGE_PATH_LEN];
extern char *fdd_image_history[FDD_NUM][FLOPPY_IMAGE_HISTORY];
extern pc_timer_t fdd_poll_time[FDD_NUM];
extern int ui_writeprot[FDD_NUM];

View File

@@ -161,7 +161,7 @@ typedef struct hard_disk_t {
void *priv;
char fn[1024]; /* Name of current image file */
char fn[MAX_IMAGE_PATH_LEN]; /* Name of current image file */
/* Differential VHD parent file */
char vhd_parent[1280];

View File

@@ -113,8 +113,8 @@ typedef struct mo_drive_t {
FILE *fp;
void *priv;
char image_path[1024];
char prev_image_path[1024];
char image_path[MAX_IMAGE_PATH_LEN];
char prev_image_path[MAX_IMAGE_PATH_LEN + 256];
char *image_history[MO_IMAGE_HISTORY];

View File

@@ -91,8 +91,8 @@ typedef struct rdisk_drive_t {
FILE *fp;
void *priv;
char image_path[1024];
char prev_image_path[1024];
char image_path[MAX_IMAGE_PATH_LEN];
char prev_image_path[MAX_IMAGE_PATH_LEN + 256];
char *image_history[RDISK_IMAGE_HISTORY];