claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite the emulator to use UTF-8 internally

Browse Source
This commit is contained in:
David Hrdlička
2021-03-14 20:35:01 +01:00
parent 56d62de4fe
commit dfbbe08a07
146 changed files with 1507 additions and 1457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/include/86box/86box.h
View File

@@ -27,9 +27,9 @@
#define SCREEN_RES_Y 480
/* Filename and pathname info. */
#define CONFIG_FILE L"86box.cfg"
#define NVR_PATH L"nvr"
#define SCREENSHOT_PATH L"screenshots"
#define CONFIG_FILE "86box.cfg"
#define NVR_PATH "nvr"
#define SCREENSHOT_PATH "screenshots"
#if defined(ENABLE_BUSLOGIC_LOG) || \
@@ -72,7 +72,7 @@ extern int confirm_exit_cmdl; /* (O) do not ask for confirmation on quit if set
extern uint64_t unique_id;
extern uint64_t source_hwnd;
#endif
extern wchar_t log_path[1024]; /* (O) full path of logfile */
extern char log_path[1024]; /* (O) full path of logfile */
extern int window_w, window_h, /* (C) window size and */
@@ -132,9 +132,9 @@ extern int serial_do_log;
extern int nic_do_log;
#endif
extern wchar_t exe_path[2048]; /* path (dir) of executable */
extern wchar_t usr_path[1024]; /* path (dir) of user data */
extern wchar_t cfg_path[1024]; /* full path of config file */
extern char exe_path[2048]; /* path (dir) of executable */
extern char usr_path[1024]; /* path (dir) of user data */
extern char cfg_path[1024]; /* full path of config file */
#ifndef USE_NEW_DYNAREC
extern FILE *stdlog; /* file to log output to */
#endif
@@ -158,7 +158,7 @@ extern void set_screen_size_natural(void);
extern void pc_reload(wchar_t *fn);
#endif
extern int pc_init_modules(void);
extern int pc_init(int argc, wchar_t *argv[]);
extern int pc_init(int argc, char *argv[]);
extern void pc_close(void *threadid);
extern void pc_reset_hard_close(void);
extern void pc_reset_hard_init(void);

4
src/include/86box/cdrom.h
View File

@@ -108,7 +108,7 @@ typedef struct cdrom {
FILE* img_fp;
void *priv;
wchar_t image_path[1024],
char image_path[1024],
prev_image_path[1024];
uint32_t sound_on, cdrom_capacity,
@@ -156,7 +156,7 @@ extern void cdrom_insert(uint8_t id);
extern void cdrom_eject(uint8_t id);
extern void cdrom_reload(uint8_t id);
extern int cdrom_image_open(cdrom_t *dev, const wchar_t *fn);
extern int cdrom_image_open(cdrom_t *dev, const char *fn);
extern void cdrom_image_close(cdrom_t *dev);
extern void cdrom_image_reset(cdrom_t *dev);

8
src/include/86box/cdrom_image_backend.h
View File

@@ -52,7 +52,7 @@ typedef struct {
uint64_t (*get_length)(void *p);
void (*close)(void *p);
wchar_t fn[260];
char fn[260];
FILE *file;
} track_file_t;
@@ -72,7 +72,7 @@ typedef struct {
/* Binary file functions. */
extern void cdi_close(cd_img_t *cdi);
extern int cdi_set_device(cd_img_t *cdi, const wchar_t *path);
extern int cdi_set_device(cd_img_t *cdi, const char *path);
extern int cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out);
extern int cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out);
extern int cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF *start, uint8_t *attr);
@@ -85,8 +85,8 @@ extern int cdi_read_sector_sub(cd_img_t *cdi, uint8_t *buffer, uint32_t sector);
extern int cdi_get_sector_size(cd_img_t *cdi, uint32_t sector);
extern int cdi_is_mode2(cd_img_t *cdi, uint32_t sector);
extern int cdi_get_mode2_form(cd_img_t *cdi, uint32_t sector);
extern int cdi_load_iso(cd_img_t *cdi, const wchar_t *filename);
extern int cdi_load_cue(cd_img_t *cdi, const wchar_t *cuefile);
extern int cdi_load_iso(cd_img_t *cdi, const char *filename);
extern int cdi_load_cue(cd_img_t *cdi, const char *cuefile);
extern int cdi_has_data_track(cd_img_t *cdi);
extern int cdi_has_audio_track(cd_img_t *cdi);

2
src/include/86box/config.h
View File

@@ -139,7 +139,7 @@ typedef struct {
extern void config_load(void);
extern void config_save(void);
extern void config_write(wchar_t *fn);
extern void config_write(char *fn);
extern void config_dump(void);
extern void config_delete_var(char *head, char *name);

4
src/include/86box/fdd.h
View File

@@ -86,7 +86,7 @@ typedef struct {
extern DRIVE drives[FDD_NUM];
extern wchar_t floppyfns[FDD_NUM][512];
extern char floppyfns[FDD_NUM][512];
extern pc_timer_t fdd_poll_time[FDD_NUM];
extern int ui_writeprot[FDD_NUM];
@@ -96,7 +96,7 @@ extern int fdd_time;
extern int64_t floppytime;
extern void fdd_load(int drive, wchar_t *fn);
extern void fdd_load(int drive, char *fn);
extern void fdd_new(int drive, char *fn);
extern void fdd_close(int drive);
extern void fdd_init(void);

4
src/include/86box/fdd_86f.h
View File

@@ -54,7 +54,7 @@ extern d86f_handler_t d86f_handler[FDD_NUM];
extern void d86f_init(void);
extern void d86f_load(int drive, wchar_t *fn);
extern void d86f_load(int drive, char *fn);
extern void d86f_close(int drive);
extern void d86f_seek(int drive, int track);
extern int d86f_hole(int drive);
@@ -81,7 +81,7 @@ extern uint16_t d86f_prepare_sector(int drive, int side, int prev_pos, uint8_t *
int data_len, int gap2, int gap3, int flags);
extern void d86f_setup(int drive);
extern void d86f_destroy(int drive);
extern int d86f_export(int drive, wchar_t *fn);
extern int d86f_export(int drive, char *fn);
extern void d86f_unregister(int drive);
extern void d86f_common_handlers(int drive);
extern void d86f_set_version(int drive, uint16_t version);

2
src/include/86box/fdd_fdi.h
View File

@@ -24,7 +24,7 @@
extern void fdi_seek(int drive, int track);
extern void fdi_load(int drive, wchar_t *fn);
extern void fdi_load(int drive, char *fn);
extern void fdi_close(int drive);

2
src/include/86box/fdd_imd.h
View File

@@ -39,7 +39,7 @@
extern void imd_init(void);
extern void imd_load(int drive, wchar_t *fn);
extern void imd_load(int drive, char *fn);
extern void imd_close(int drive);

2
src/include/86box/fdd_img.h
View File

@@ -24,7 +24,7 @@
extern void img_init(void);
extern void img_load(int drive, wchar_t *fn);
extern void img_load(int drive, char *fn);
extern void img_close(int drive);

2
src/include/86box/fdd_json.h
View File

@@ -49,7 +49,7 @@
extern void json_init(void);
extern void json_load(int drive, wchar_t *fn);
extern void json_load(int drive, char *fn);
extern void json_close(int drive);

2
src/include/86box/fdd_mfm.h
View File

@@ -19,7 +19,7 @@
extern void mfm_seek(int drive, int track);
extern void mfm_load(int drive, wchar_t *fn);
extern void mfm_load(int drive, char *fn);
extern void mfm_close(int drive);

2
src/include/86box/fdd_td0.h
View File

@@ -21,7 +21,7 @@
extern void td0_init(void);
extern void td0_load(int drive, wchar_t *fn);
extern void td0_load(int drive, char *fn);
extern void td0_close(int drive);

8
src/include/86box/hdd.h
View File

@@ -92,7 +92,7 @@ typedef struct {
void *priv;
wchar_t fn[1024], /* Name of current image file */
char fn[1024], /* Name of current image file */
prev_fn[1024]; /* Name of previous image file */
uint32_t res0, pad1,
@@ -127,9 +127,9 @@ extern void hdd_image_unload(uint8_t id, int fn_preserve);
extern void hdd_image_close(uint8_t id);
extern void hdd_image_calc_chs(uint32_t *c, uint32_t *h, uint32_t *s, uint32_t size);
extern int image_is_hdi(const wchar_t *s);
extern int image_is_hdx(const wchar_t *s, int check_signature);
extern int image_is_vhd(const wchar_t *s, int check_signature);
extern int image_is_hdi(const char *s);
extern int image_is_hdx(const char *s, int check_signature);
extern int image_is_vhd(const char *s, int check_signature);
#endif /*EMU_HDD_H*/

4
src/include/86box/mo.h
View File

@@ -109,7 +109,7 @@ typedef struct {
FILE *f;
void *priv;
wchar_t image_path[1024],
char image_path[1024],
prev_image_path[1024];
uint32_t type, medium_size,
@@ -170,7 +170,7 @@ extern void mo_global_init(void);
extern void mo_hard_reset(void);
extern void mo_reset(scsi_common_t *sc);
extern int mo_load(mo_t *dev, wchar_t *fn);
extern int mo_load(mo_t *dev, char *fn);
extern void mo_close();
#ifdef __cplusplus

6
src/include/86box/nvr.h
View File

@@ -65,7 +65,7 @@
/* Define a generic RTC/NVRAM device. */
typedef struct _nvr_ {
wchar_t *fn; /* pathname of image file */
char *fn; /* pathname of image file */
uint16_t size; /* device configuration */
int8_t irq;
@@ -101,8 +101,8 @@ extern const device_t via_nvr_device;
extern void rtc_tick(void);
extern void nvr_init(nvr_t *);
extern wchar_t *nvr_path(wchar_t *str);
extern FILE *nvr_fopen(wchar_t *str, wchar_t *mode);
extern char *nvr_path(char *str);
extern FILE *nvr_fopen(char *str, char *mode);
extern int nvr_load(void);
extern void nvr_close(void);
extern void nvr_set_ven_save(void (*ven_save)(void));

48
src/include/86box/plat.h
View File

@@ -81,24 +81,24 @@ extern int unscaled_size_x, /* current unscaled size X */
unscaled_size_y; /* current unscaled size Y */
/* System-related functions. */
extern wchar_t *fix_exe_path(wchar_t *str);
extern FILE *plat_fopen(wchar_t *path, wchar_t *mode);
extern FILE *plat_fopen64(const wchar_t *path, const wchar_t *mode);
extern void plat_remove(wchar_t *path);
extern int plat_getcwd(wchar_t *bufp, int max);
extern int plat_chdir(wchar_t *path);
extern void plat_tempfile(wchar_t *bufp, wchar_t *prefix, wchar_t *suffix);
extern void plat_get_exe_name(wchar_t *s, int size);
extern wchar_t *plat_get_basename(const wchar_t *path);
extern void plat_get_dirname(wchar_t *dest, const wchar_t *path);
extern wchar_t *plat_get_filename(wchar_t *s);
extern wchar_t *plat_get_extension(wchar_t *s);
extern void plat_append_filename(wchar_t *dest, wchar_t *s1, wchar_t *s2);
extern void plat_put_backslash(wchar_t *s);
extern void plat_path_slash(wchar_t *path);
extern int plat_path_abs(wchar_t *path);
extern int plat_dir_check(wchar_t *path);
extern int plat_dir_create(wchar_t *path);
extern char *fix_exe_path(char *str);
extern FILE *plat_fopen(const char *path, const char *mode);
extern FILE *plat_fopen64(const char *path, const char *mode);
extern void plat_remove(char *path);
extern int plat_getcwd(char *bufp, int max);
extern int plat_chdir(char *path);
extern void plat_tempfile(char *bufp, char *prefix, char *suffix);
extern void plat_get_exe_name(char *s, int size);
extern char *plat_get_basename(const char *path);
extern void plat_get_dirname(char *dest, const char *path);
extern char *plat_get_filename(char *s);
extern char *plat_get_extension(char *s);
extern void plat_append_filename(char *dest, char *s1, char *s2);
extern void plat_put_backslash(char *s);
extern void plat_path_slash(char *path);
extern int plat_path_abs(char *path);
extern int plat_dir_check(char *path);
extern int plat_dir_create(char *path);
extern uint64_t plat_timer_read(void);
extern uint32_t plat_get_ticks(void);
extern void plat_delay_ms(uint32_t count);
@@ -128,15 +128,15 @@ extern void plat_power_off(void);
/* Platform-specific device support. */
extern void floppy_mount(uint8_t id, wchar_t *fn, uint8_t wp);
extern void floppy_mount(uint8_t id, char *fn, uint8_t wp);
extern void floppy_eject(uint8_t id);
extern void cdrom_mount(uint8_t id, wchar_t *fn);
extern void cdrom_mount(uint8_t id, char *fn);
extern void plat_cdrom_ui_update(uint8_t id, uint8_t reload);
extern void zip_eject(uint8_t id);
extern void zip_mount(uint8_t id, wchar_t *fn, uint8_t wp);
extern void zip_mount(uint8_t id, char *fn, uint8_t wp);
extern void zip_reload(uint8_t id);
extern void mo_eject(uint8_t id);
extern void mo_mount(uint8_t id, wchar_t *fn, uint8_t wp);
extern void mo_mount(uint8_t id, char *fn, uint8_t wp);
extern void mo_reload(uint8_t id);
extern int ioctl_open(uint8_t id, char d);
extern void ioctl_reset(uint8_t id);
@@ -170,6 +170,10 @@ extern void startblit(void);
extern void endblit(void);
extern void take_screenshot(void);
/* Conversion between UTF-8 and UTF-16. */
extern size_t mbstoc16s(uint16_t dst[], const char src[], int len);
extern size_t c16stombs(char dst[], const uint16_t src[], int len);
#ifdef MTR_ENABLED
extern void init_trace(void);
extern void shutdown_trace(void);

4
src/include/86box/png_struct.h
View File

@@ -52,10 +52,10 @@
extern "C" {
#endif
extern int png_write_gray(wchar_t *path, int invert,
extern int png_write_gray(char *path, int invert,
uint8_t *pix, int16_t w, int16_t h);
extern void png_write_rgb(wchar_t *fn,
extern void png_write_rgb(char *fn,
uint8_t *pix, int16_t w, int16_t h, uint16_t pitch, PALETTE palcol);
#ifdef __cplusplus

14
src/include/86box/printer.h
View File

@@ -48,14 +48,14 @@
# define PRINTER_H
#define FONT_FILE_DOTMATRIX L"dotmatrix.ttf"
#define FONT_FILE_DOTMATRIX "dotmatrix.ttf"
#define FONT_FILE_ROMAN L"roman.ttf"
#define FONT_FILE_SANSSERIF L"sansserif.ttf"
#define FONT_FILE_COURIER L"courier.ttf"
#define FONT_FILE_SCRIPT L"script.ttf"
#define FONT_FILE_OCRA L"ocra.ttf"
#define FONT_FILE_OCRB L"ocra.ttf"
#define FONT_FILE_ROMAN "roman.ttf"
#define FONT_FILE_SANSSERIF "sansserif.ttf"
#define FONT_FILE_COURIER "courier.ttf"
#define FONT_FILE_SCRIPT "script.ttf"
#define FONT_FILE_OCRA "ocra.ttf"
#define FONT_FILE_OCRB "ocra.ttf"
extern void

28
src/include/86box/rom.h
View File

@@ -45,35 +45,35 @@ extern uint8_t rom_read(uint32_t addr, void *p);
extern uint16_t rom_readw(uint32_t addr, void *p);
extern uint32_t rom_readl(uint32_t addr, void *p);
extern FILE *rom_fopen(wchar_t *fn, wchar_t *mode);
extern int rom_getfile(wchar_t *fn, wchar_t *s, int size);
extern int rom_present(wchar_t *fn);
extern FILE *rom_fopen(char *fn, char *mode);
extern int rom_getfile(char *fn, char *s, int size);
extern int rom_present(char *fn);
extern int rom_load_linear_oddeven(wchar_t *fn, uint32_t addr, int sz,
extern int rom_load_linear_oddeven(char *fn, uint32_t addr, int sz,
int off, uint8_t *ptr);
extern int rom_load_linear(wchar_t *fn, uint32_t addr, int sz,
extern int rom_load_linear(char *fn, uint32_t addr, int sz,
int off, uint8_t *ptr);
extern int rom_load_interleaved(wchar_t *fnl, wchar_t *fnh, uint32_t addr,
extern int rom_load_interleaved(char *fnl, char *fnh, uint32_t addr,
int sz, int off, uint8_t *ptr);
extern uint8_t bios_read(uint32_t addr, void *priv);
extern uint16_t bios_readw(uint32_t addr, void *priv);
extern uint32_t bios_readl(uint32_t addr, void *priv);
extern int bios_load(wchar_t *fn1, wchar_t *fn2, uint32_t addr, int sz,
extern int bios_load(char *fn1, char *fn2, uint32_t addr, int sz,
int off, int flags);
extern int bios_load_linear_combined(wchar_t *fn1, wchar_t *fn2,
extern int bios_load_linear_combined(char *fn1, char *fn2,
int sz, int off);
extern int bios_load_linear_combined2(wchar_t *fn1, wchar_t *fn2,
wchar_t *fn3, wchar_t *fn4, wchar_t *fn5,
extern int bios_load_linear_combined2(char *fn1, char *fn2,
char *fn3, char *fn4, char *fn5,
int sz, int off);
extern int rom_init(rom_t *rom, wchar_t *fn, uint32_t address, int size,
extern int rom_init(rom_t *rom, char *fn, uint32_t address, int size,
int mask, int file_offset, uint32_t flags);
extern int rom_init_oddeven(rom_t *rom, wchar_t *fn, uint32_t address, int size,
extern int rom_init_oddeven(rom_t *rom, char *fn, uint32_t address, int size,
int mask, int file_offset, uint32_t flags);
extern int rom_init_interleaved(rom_t *rom, wchar_t *fn_low,
wchar_t *fn_high, uint32_t address,
extern int rom_init_interleaved(rom_t *rom, char *fn_low,
char *fn_high, uint32_t address,
int size, int mask, int file_offset,
uint32_t flags);

2
src/include/86box/scsi_x54x.h
View File

@@ -450,7 +450,7 @@ typedef struct {
double media_period, ha_bps; /* bytes per second */
/* 8 bytes */
wchar_t *bios_path, /* path to BIOS image file */
char *bios_path, /* path to BIOS image file */
*mcode_path, /* path to microcode image file, needed by the AHA-1542CP */
*nvr_path; /* path to NVR image file */

4
src/include/86box/vid_ati_eeprom.h
View File

@@ -41,9 +41,9 @@ typedef struct ati_eeprom_t
int type;
int address;
wchar_t fn[256];
char fn[256];
} ati_eeprom_t;
void ati_eeprom_load(ati_eeprom_t *eeprom, wchar_t *fn, int type);
void ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type);
void ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat);
int ati_eeprom_read(ati_eeprom_t *eeprom);

4
src/include/86box/video.h
View File

@@ -172,8 +172,8 @@ extern uint8_t video_force_resize_get(void);
extern void video_force_resize_set(uint8_t res);
extern void video_update_timing(void);
extern void loadfont_ex(wchar_t *s, int format, int offset);
extern void loadfont(wchar_t *s, int format);
extern void loadfont_ex(char *s, int format, int offset);
extern void loadfont(char *s, int format);
extern int get_actual_size_x(void);
extern int get_actual_size_y(void);

1
src/include/86box/win.h
View File

@@ -103,6 +103,7 @@ extern LCID lang_id;
extern HICON hIcon[256];
extern RECT oldclip;
extern int sbar_height, user_resize;
extern int acp_utf8;
// extern int status_is_open;

4
src/include/86box/zip.h
View File

@@ -57,7 +57,7 @@ typedef struct {
FILE *f;
void *priv;
wchar_t image_path[1024],
char image_path[1024],
prev_image_path[1024];
uint32_t is_250, medium_size,
@@ -116,7 +116,7 @@ extern void zip_global_init(void);
extern void zip_hard_reset(void);
extern void zip_reset(scsi_common_t *sc);
extern int zip_load(zip_t *dev, wchar_t *fn);
extern int zip_load(zip_t *dev, char *fn);
extern void zip_close();
#ifdef __cplusplus