From 7dd8c96ffc34ccd8e80681caa219800da2f0d77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 10 Sep 2022 13:32:46 +0200 Subject: [PATCH 1/4] config: Refactor the INI parser out --- src/CMakeLists.txt | 2 +- src/config.c | 1802 +++++++++++------------------------- src/device.c | 1 + src/include/86box/config.h | 44 +- src/include/86box/ini.h | 81 ++ src/ini.c | 795 ++++++++++++++++ src/network/net_slirp.c | 1 + src/qt/qt_deviceconfig.cpp | 1 + src/sound/midi_rtmidi.cpp | 1 + 9 files changed, 1446 insertions(+), 1282 deletions(-) create mode 100644 src/include/86box/ini.h create mode 100644 src/ini.c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 01de9a473..18302d6fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ endif() add_executable(86Box 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c dma.c ddma.c discord.c nmi.c pic.c pit.c pit_fast.c port_6x.c port_92.c ppi.c pci.c - mca.c usb.c fifo8.c device.c nvr.c nvr_at.c nvr_ps2.c machine_status.c) + mca.c usb.c fifo8.c device.c nvr.c nvr_at.c nvr_ps2.c machine_status.c ini.c) if(CMAKE_SYSTEM_NAME MATCHES "Linux") add_compile_definitions(_FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _LARGEFILE64_SOURCE=1) diff --git a/src/config.c b/src/config.c index 0cc782854..01710ebc4 100644 --- a/src/config.c +++ b/src/config.c @@ -41,6 +41,7 @@ #include <86box/cassette.h> #include <86box/cartridge.h> #include <86box/nvr.h> +#include <86box/ini.h> #include <86box/config.h> #include <86box/isamem.h> #include <86box/isartc.h> @@ -74,53 +75,7 @@ static int cx, cy, cw, ch; - - -typedef struct _list_ { - struct _list_ *next; -} list_t; - -typedef struct { - list_t list; - - char name[128]; - - list_t entry_head; -} section_t; - -typedef struct { - list_t list; - - char name[128]; - char data[512]; - wchar_t wdata[512]; -} entry_t; - -#define list_add(new, head) \ - { \ - list_t *next = head; \ - \ - while (next->next != NULL) \ - next = next->next; \ - \ - (next)->next = new; \ - (new)->next = NULL; \ - } - -#define list_delete(old, head) \ - { \ - list_t *next = head; \ - \ - while ((next)->next != old) { \ - next = (next)->next; \ - } \ - \ - (next)->next = (old)->next; \ - if ((next) == (head)) \ - (head)->next = (old)->next; \ - } - -static list_t config_head; +static ini_t config; /* TODO: Backwards compatibility, get rid of this when enough time has passed. */ static int backwards_compat = 0; @@ -144,432 +99,55 @@ config_log(const char *fmt, ...) # define config_log(fmt, ...) #endif -static section_t * -find_section(char *name) -{ - section_t *sec; - char blank[] = ""; - - sec = (section_t *) config_head.next; - if (name == NULL) - name = blank; - - while (sec != NULL) { - if (!strncmp(sec->name, name, sizeof(sec->name))) - return (sec); - - sec = (section_t *) sec->list.next; - } - - return (NULL); -} - -void * -config_find_section(char *name) -{ - return (void *) find_section(name); -} - -void -config_rename_section(void *priv, char *name) -{ - section_t *sec = (section_t *) priv; - - memset(sec->name, 0x00, sizeof(sec->name)); - memcpy(sec->name, name, MIN(128, strlen(name) + 1)); -} - -static entry_t * -find_entry(section_t *section, char *name) -{ - entry_t *ent; - - ent = (entry_t *) section->entry_head.next; - - while (ent != NULL) { - if (!strncmp(ent->name, name, sizeof(ent->name))) - return (ent); - - ent = (entry_t *) ent->list.next; - } - - return (NULL); -} - -static int -entries_num(section_t *section) -{ - entry_t *ent; - int i = 0; - - ent = (entry_t *) section->entry_head.next; - - while (ent != NULL) { - if (strlen(ent->name) > 0) - i++; - - ent = (entry_t *) ent->list.next; - } - - return (i); -} - -static void -delete_section_if_empty(char *head) -{ - section_t *section; - - section = find_section(head); - if (section == NULL) - return; - - if (entries_num(section) == 0) { - list_delete(§ion->list, &config_head); - free(section); - } -} - -static section_t * -create_section(char *name) -{ - section_t *ns = malloc(sizeof(section_t)); - - memset(ns, 0x00, sizeof(section_t)); - memcpy(ns->name, name, strlen(name) + 1); - list_add(&ns->list, &config_head); - - return (ns); -} - -static entry_t * -create_entry(section_t *section, char *name) -{ - entry_t *ne = malloc(sizeof(entry_t)); - - memset(ne, 0x00, sizeof(entry_t)); - memcpy(ne->name, name, strlen(name) + 1); - list_add(&ne->list, §ion->entry_head); - - return (ne); -} - -#if 0 -static void -config_free(void) -{ - section_t *sec, *ns; - entry_t *ent; - - sec = (section_t *)config_head.next; - while (sec != NULL) { - ns = (section_t *)sec->list.next; - ent = (entry_t *)sec->entry_head.next; - - while (ent != NULL) { - entry_t *nent = (entry_t *)ent->list.next; - - free(ent); - ent = nent; - } - - free(sec); - sec = ns; - } -} -#endif - -static int -config_detect_bom(char *fn) -{ - FILE *f; - unsigned char bom[4] = { 0, 0, 0, 0 }; - -#if defined(ANSI_CFG) || !defined(_WIN32) - f = plat_fopen(fn, "rt"); -#else - f = plat_fopen(fn, "rt, ccs=UTF-8"); -#endif - if (f == NULL) - return (0); - (void) !fread(bom, 1, 3, f); - if (bom[0] == 0xEF && bom[1] == 0xBB && bom[2] == 0xBF) { - fclose(f); - return 1; - } - fclose(f); - return 0; -} - -#ifdef __HAIKU__ -/* Local version of fgetws to avoid a crash */ -static wchar_t * -config_fgetws(wchar_t *str, int count, FILE *stream) -{ - int i = 0; - if (feof(stream)) - return NULL; - for (i = 0; i < count; i++) { - wint_t curChar = fgetwc(stream); - if (curChar == WEOF) { - if (i + 1 < count) - str[i + 1] = 0; - return feof(stream) ? str : NULL; - } - str[i] = curChar; - if (curChar == '\n') - break; - } - if (i + 1 < count) - str[i + 1] = 0; - return str; -} -#endif - -/* Read and parse the configuration file into memory. */ -static int -config_read(char *fn) -{ - char sname[128], ename[128]; - wchar_t buff[1024]; - section_t *sec, *ns; - entry_t *ne; - int c, d, bom; - FILE *f; - - bom = config_detect_bom(fn); -#if defined(ANSI_CFG) || !defined(_WIN32) - f = plat_fopen(fn, "rt"); -#else - f = plat_fopen(fn, "rt, ccs=UTF-8"); -#endif - if (f == NULL) - return (0); - - sec = malloc(sizeof(section_t)); - memset(sec, 0x00, sizeof(section_t)); - memset(&config_head, 0x00, sizeof(list_t)); - list_add(&sec->list, &config_head); - if (bom) - fseek(f, 3, SEEK_SET); - - while (1) { - memset(buff, 0x00, sizeof(buff)); -#ifdef __HAIKU__ - config_fgetws(buff, sizeof_w(buff), f); -#else - (void) !fgetws(buff, sizeof_w(buff), f); -#endif - if (feof(f)) - break; - - /* Make sure there are no stray newlines or hard-returns in there. */ - if (wcslen(buff) > 0) - if (buff[wcslen(buff) - 1] == L'\n') - buff[wcslen(buff) - 1] = L'\0'; - if (wcslen(buff) > 0) - if (buff[wcslen(buff) - 1] == L'\r') - buff[wcslen(buff) - 1] = L'\0'; - - /* Skip any leading whitespace. */ - c = 0; - while ((buff[c] == L' ') || (buff[c] == L'\t')) - c++; - - /* Skip empty lines. */ - if (buff[c] == L'\0') - continue; - - /* Skip lines that (only) have a comment. */ - if ((buff[c] == L'#') || (buff[c] == L';')) - continue; - - if (buff[c] == L'[') { /*Section*/ - c++; - d = 0; - while (buff[c] != L']' && buff[c]) - (void) !wctomb(&(sname[d++]), buff[c++]); - sname[d] = L'\0'; - - /* Is the section name properly terminated? */ - if (buff[c] != L']') - continue; - - /* Create a new section and insert it. */ - ns = malloc(sizeof(section_t)); - memset(ns, 0x00, sizeof(section_t)); - memcpy(ns->name, sname, 128); - list_add(&ns->list, &config_head); - - /* New section is now the current one. */ - sec = ns; - continue; - } - - /* Get the variable name. */ - d = 0; - while ((buff[c] != L'=') && (buff[c] != L' ') && buff[c]) - (void) !wctomb(&(ename[d++]), buff[c++]); - ename[d] = L'\0'; - - /* Skip incomplete lines. */ - if (buff[c] == L'\0') - continue; - - /* Look for =, skip whitespace. */ - while ((buff[c] == L'=' || buff[c] == L' ') && buff[c]) - c++; - - /* Skip incomplete lines. */ - if (buff[c] == L'\0') - continue; - - /* This is where the value part starts. */ - d = c; - - /* Allocate a new variable entry.. */ - ne = malloc(sizeof(entry_t)); - memset(ne, 0x00, sizeof(entry_t)); - memcpy(ne->name, ename, 128); - wcsncpy(ne->wdata, &buff[d], sizeof_w(ne->wdata) - 1); - ne->wdata[sizeof_w(ne->wdata) - 1] = L'\0'; -#ifdef _WIN32 /* Make sure the string is converted to UTF-8 rather than a legacy codepage */ - c16stombs(ne->data, ne->wdata, sizeof(ne->data)); -#else - wcstombs(ne->data, ne->wdata, sizeof(ne->data)); -#endif - ne->data[sizeof(ne->data) - 1] = '\0'; - - /* .. and insert it. */ - list_add(&ne->list, &sec->entry_head); - } - - (void) fclose(f); - - if (do_dump_config) - config_dump(); - - return (1); -} - -/* - * Write the in-memory configuration to disk. - * This is a public function, because the Settings UI - * want to directly write the configuration after it - * has changed it. - */ -void -config_write(char *fn) -{ - wchar_t wtemp[512]; - section_t *sec; - FILE *f; - int fl = 0; - -#if defined(ANSI_CFG) || !defined(_WIN32) - f = plat_fopen(fn, "wt"); -#else - f = plat_fopen(fn, "wt, ccs=UTF-8"); -#endif - if (f == NULL) - return; - - sec = (section_t *) config_head.next; - while (sec != NULL) { - entry_t *ent; - - if (sec->name[0]) { - mbstowcs(wtemp, sec->name, strlen(sec->name) + 1); - if (fl) - fwprintf(f, L"\n[%ls]\n", wtemp); - else - fwprintf(f, L"[%ls]\n", wtemp); - fl++; - } - - ent = (entry_t *) sec->entry_head.next; - while (ent != NULL) { - if (ent->name[0] != '\0') { - mbstowcs(wtemp, ent->name, 128); - if (ent->wdata[0] == L'\0') - fwprintf(f, L"%ls = \n", wtemp); - else - fwprintf(f, L"%ls = %ls\n", wtemp, ent->wdata); - fl++; - } - - ent = (entry_t *) ent->list.next; - } - - sec = (section_t *) sec->list.next; - } - - (void) fclose(f); -} - -#if NOT_USED -static void -config_new(void) -{ -# if defined(ANSI_CFG) || !defined(_WIN32) - FILE *f = _wfopen(config_file, L"wt"); -# else - FILE *f = _wfopen(config_file, L"wt, ccs=UTF-8"); -# endif - - if (file != NULL) - (void) fclose(f); -} -#endif - /* Load "General" section. */ static void load_general(void) { - char *cat = "General"; + ini_section_t cat = ini_find_section(config, "General"); char temp[512]; char *p; - vid_resize = config_get_int(cat, "vid_resize", 0); + vid_resize = ini_section_get_int(cat, "vid_resize", 0); if (vid_resize & ~3) vid_resize &= 3; memset(temp, '\0', sizeof(temp)); - p = config_get_string(cat, "vid_renderer", "default"); + p = ini_section_get_string(cat, "vid_renderer", "default"); vid_api = plat_vidapi(p); - config_delete_var(cat, "vid_api"); + ini_section_delete_var(cat, "vid_api"); - video_fullscreen_scale = config_get_int(cat, "video_fullscreen_scale", 0); + video_fullscreen_scale = ini_section_get_int(cat, "video_fullscreen_scale", 0); - video_fullscreen_first = config_get_int(cat, "video_fullscreen_first", 1); + video_fullscreen_first = ini_section_get_int(cat, "video_fullscreen_first", 1); - video_filter_method = config_get_int(cat, "video_filter_method", 1); + video_filter_method = ini_section_get_int(cat, "video_filter_method", 1); - force_43 = !!config_get_int(cat, "force_43", 0); - scale = config_get_int(cat, "scale", 1); + force_43 = !!ini_section_get_int(cat, "force_43", 0); + scale = ini_section_get_int(cat, "scale", 1); if (scale > 3) scale = 3; - dpi_scale = config_get_int(cat, "dpi_scale", 1); + dpi_scale = ini_section_get_int(cat, "dpi_scale", 1); - enable_overscan = !!config_get_int(cat, "enable_overscan", 0); - vid_cga_contrast = !!config_get_int(cat, "vid_cga_contrast", 0); - video_grayscale = config_get_int(cat, "video_grayscale", 0); - video_graytype = config_get_int(cat, "video_graytype", 0); + enable_overscan = !!ini_section_get_int(cat, "enable_overscan", 0); + vid_cga_contrast = !!ini_section_get_int(cat, "vid_cga_contrast", 0); + video_grayscale = ini_section_get_int(cat, "video_grayscale", 0); + video_graytype = ini_section_get_int(cat, "video_graytype", 0); - rctrl_is_lalt = config_get_int(cat, "rctrl_is_lalt", 0); - update_icons = config_get_int(cat, "update_icons", 1); + rctrl_is_lalt = ini_section_get_int(cat, "rctrl_is_lalt", 0); + update_icons = ini_section_get_int(cat, "update_icons", 1); - window_remember = config_get_int(cat, "window_remember", 0); + window_remember = ini_section_get_int(cat, "window_remember", 0); if (window_remember || (vid_resize & 2)) { if (!window_remember) - config_delete_var(cat, "window_remember"); + ini_section_delete_var(cat, "window_remember"); } else { - config_delete_var(cat, "window_remember"); + ini_section_delete_var(cat, "window_remember"); window_w = window_h = window_x = window_y = 0; } if (vid_resize & 2) { - p = config_get_string(cat, "window_fixed_res", NULL); + p = ini_section_get_string(cat, "window_fixed_res", NULL); if (p == NULL) p = "120x120"; sscanf(p, "%ix%i", &fixed_size_x, &fixed_size_y); @@ -582,70 +160,73 @@ load_general(void) if (fixed_size_y > 2048) fixed_size_y = 2048; } else { - config_delete_var(cat, "window_fixed_res"); + ini_section_delete_var(cat, "window_fixed_res"); fixed_size_x = fixed_size_y = 120; } - sound_gain = config_get_int(cat, "sound_gain", 0); + sound_gain = ini_section_get_int(cat, "sound_gain", 0); - kbd_req_capture = config_get_int(cat, "kbd_req_capture", 0); - hide_status_bar = config_get_int(cat, "hide_status_bar", 0); - hide_tool_bar = config_get_int(cat, "hide_tool_bar", 0); + kbd_req_capture = ini_section_get_int(cat, "kbd_req_capture", 0); + hide_status_bar = ini_section_get_int(cat, "hide_status_bar", 0); + hide_tool_bar = ini_section_get_int(cat, "hide_tool_bar", 0); - confirm_reset = config_get_int(cat, "confirm_reset", 1); - confirm_exit = config_get_int(cat, "confirm_exit", 1); - confirm_save = config_get_int(cat, "confirm_save", 1); + confirm_reset = ini_section_get_int(cat, "confirm_reset", 1); + confirm_exit = ini_section_get_int(cat, "confirm_exit", 1); + confirm_save = ini_section_get_int(cat, "confirm_save", 1); - p = config_get_string(cat, "language", NULL); + p = ini_section_get_string(cat, "language", NULL); if (p != NULL) lang_id = plat_language_code(p); - mouse_sensitivity = config_get_double(cat, "mouse_sensitivity", 1.0); + mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0); if (mouse_sensitivity < 0.5) mouse_sensitivity = 0.5; else if (mouse_sensitivity > 2.0) mouse_sensitivity = 2.0; - p = config_get_string(cat, "iconset", NULL); + p = ini_section_get_string(cat, "iconset", NULL); if (p != NULL) strcpy(icon_set, p); else strcpy(icon_set, ""); - enable_discord = !!config_get_int(cat, "enable_discord", 0); + enable_discord = !!ini_section_get_int(cat, "enable_discord", 0); - open_dir_usr_path = config_get_int(cat, "open_dir_usr_path", 0); + open_dir_usr_path = ini_section_get_int(cat, "open_dir_usr_path", 0); - video_framerate = config_get_int(cat, "video_gl_framerate", -1); - video_vsync = config_get_int(cat, "video_gl_vsync", 0); - strncpy(video_shader, config_get_string(cat, "video_gl_shader", ""), sizeof(video_shader)); + video_framerate = ini_section_get_int(cat, "video_gl_framerate", -1); + video_vsync = ini_section_get_int(cat, "video_gl_vsync", 0); + strncpy(video_shader, ini_section_get_string(cat, "video_gl_shader", ""), sizeof(video_shader)); - window_remember = config_get_int(cat, "window_remember", 0); + window_remember = ini_section_get_int(cat, "window_remember", 0); if (window_remember) { - p = config_get_string(cat, "window_coordinates", NULL); + p = ini_section_get_string(cat, "window_coordinates", NULL); if (p == NULL) p = "0, 0, 0, 0"; sscanf(p, "%i, %i, %i, %i", &cw, &ch, &cx, &cy); } else { cw = ch = cx = cy = 0; - config_delete_var(cat, "window_remember"); + ini_section_delete_var(cat, "window_remember"); } - config_delete_var(cat, "window_coordinates"); + ini_section_delete_var(cat, "window_coordinates"); } /* Load monitor section. */ static void load_monitor(int monitor_index) { - char cat[512], temp[512]; + ini_section_t cat; + char name[512], temp[512]; char *p = NULL; - sprintf(cat, "Monitor #%i", monitor_index + 1); + sprintf(name, "Monitor #%i", monitor_index + 1); sprintf(temp, "%i, %i, %i, %i", cx, cy, cw, ch); - p = config_get_string(cat, "window_coordinates", NULL); + cat = ini_find_section(config, name); + + p = ini_section_get_string(cat, "window_coordinates", NULL); if (p == NULL) p = temp; @@ -654,7 +235,7 @@ load_monitor(int monitor_index) sscanf(p, "%i, %i, %i, %i", &monitor_settings[monitor_index].mon_window_x, &monitor_settings[monitor_index].mon_window_y, &monitor_settings[monitor_index].mon_window_w, &monitor_settings[monitor_index].mon_window_h); - monitor_settings[monitor_index].mon_window_maximized = !!config_get_int(cat, "window_maximized", 0); + monitor_settings[monitor_index].mon_window_maximized = !!ini_section_get_int(cat, "window_maximized", 0); } else { monitor_settings[monitor_index].mon_window_maximized = 0; } @@ -664,12 +245,12 @@ load_monitor(int monitor_index) static void load_machine(void) { - char *cat = "Machine"; + ini_section_t cat = ini_find_section(config, "Machine"); char *p, *migrate_from = NULL; int c, i, j, speed, legacy_mfg, legacy_cpu; double multi; - p = config_get_string(cat, "machine", NULL); + p = ini_section_get_string(cat, "machine", NULL); if (p != NULL) { migrate_from = p; if (!strcmp(p, "8500ttc")) /* migrate typo... */ @@ -754,7 +335,7 @@ load_machine(void) machine = 0; /* This is for backwards compatibility. */ - p = config_get_string(cat, "model", NULL); + p = ini_section_get_string(cat, "model", NULL); if (p != NULL) { migrate_from = p; if (!strcmp(p, "p55r2p4")) /* migrate typo */ @@ -763,7 +344,7 @@ load_machine(void) machine = machine_get_machine_from_internal_name(p); migrate_from = NULL; } - config_delete_var(cat, "model"); + ini_section_delete_var(cat, "model"); } if (machine >= machine_count()) machine = machine_count() - 1; @@ -808,9 +389,9 @@ load_machine(void) } } - cpu_override = config_get_int(cat, "cpu_override", 0); + cpu_override = ini_section_get_int(cat, "cpu_override", 0); cpu_f = NULL; - p = config_get_string(cat, "cpu_family", NULL); + p = ini_section_get_string(cat, "cpu_family", NULL); if (p) { if (!strcmp(p, "enh_am486dx2")) /* migrate modified names */ cpu_f = cpu_get_family("am486dx2_slenh"); @@ -823,8 +404,8 @@ load_machine(void) cpu_f = NULL; } else { /* Backwards compatibility with the previous CPU model system. */ - legacy_mfg = config_get_int(cat, "cpu_manufacturer", 0); - legacy_cpu = config_get_int(cat, "cpu", 0); + legacy_mfg = ini_section_get_int(cat, "cpu_manufacturer", 0); + legacy_cpu = ini_section_get_int(cat, "cpu", 0); /* Check if either legacy ID is present, and if they are within bounds. */ if (((legacy_mfg > 0) || (legacy_cpu > 0)) && (legacy_mfg >= 0) && (legacy_mfg < 4) && (legacy_cpu >= 0)) { @@ -852,17 +433,17 @@ load_machine(void) cpu_f = cpu_get_family(legacy_table_entry->family); if (cpu_f) { /* Save the new values. */ - config_set_string(cat, "cpu_family", (char *) legacy_table_entry->family); - config_set_int(cat, "cpu_speed", legacy_table_entry->rspeed); - config_set_double(cat, "cpu_multi", legacy_table_entry->multi); + ini_section_set_string(cat, "cpu_family", (char *) legacy_table_entry->family); + ini_section_set_int(cat, "cpu_speed", legacy_table_entry->rspeed); + ini_section_set_double(cat, "cpu_multi", legacy_table_entry->multi); } } } } if (cpu_f) { - speed = config_get_int(cat, "cpu_speed", 0); - multi = config_get_double(cat, "cpu_multi", 0); + speed = ini_section_get_int(cat, "cpu_speed", 0); + multi = ini_section_get_double(cat, "cpu_multi", 0); /* Find the configured CPU. */ cpu = 0; @@ -902,12 +483,12 @@ load_machine(void) } cpu_s = (CPU *) &cpu_f->cpus[cpu]; - cpu_waitstates = config_get_int(cat, "cpu_waitstates", 0); + cpu_waitstates = ini_section_get_int(cat, "cpu_waitstates", 0); - p = (char *) config_get_string(cat, "fpu_type", "none"); + p = (char *) ini_section_get_string(cat, "fpu_type", "none"); fpu_type = fpu_get_type(cpu_f, cpu, p); - mem_size = config_get_int(cat, "mem_size", 64); + mem_size = ini_section_get_int(cat, "mem_size", 64); #if 0 if (mem_size < ((machine_has_bus(machine, MACHINE_AT) && (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram)) @@ -917,9 +498,9 @@ load_machine(void) if (mem_size > 2097152) mem_size = 2097152; - cpu_use_dynarec = !!config_get_int(cat, "cpu_use_dynarec", 0); + cpu_use_dynarec = !!ini_section_get_int(cat, "cpu_use_dynarec", 0); - p = config_get_string(cat, "time_sync", NULL); + p = ini_section_get_string(cat, "time_sync", NULL); if (p != NULL) { if (!strcmp(p, "disabled")) time_sync = TIME_SYNC_DISABLED; @@ -930,28 +511,28 @@ load_machine(void) else time_sync = TIME_SYNC_ENABLED; } else - time_sync = !!config_get_int(cat, "enable_sync", 1); + time_sync = !!ini_section_get_int(cat, "enable_sync", 1); - pit_mode = config_get_int(cat, "pit_mode", -1); + pit_mode = ini_section_get_int(cat, "pit_mode", -1); /* Remove this after a while.. */ - config_delete_var(cat, "nvr_path"); - config_delete_var(cat, "enable_sync"); + ini_section_delete_var(cat, "nvr_path"); + ini_section_delete_var(cat, "enable_sync"); } /* Load "Video" section. */ static void load_video(void) { - char *cat = "Video"; + ini_section_t cat = ini_find_section(config, "Video"); char *p; int free_p = 0; if (machine_has_flags(machine, MACHINE_VIDEO_ONLY)) { - config_delete_var(cat, "gfxcard"); + ini_section_delete_var(cat, "gfxcard"); gfxcard = VID_INTERNAL; } else { - p = config_get_string(cat, "gfxcard", NULL); + p = ini_section_get_string(cat, "gfxcard", NULL); if (p == NULL) { if (machine_has_flags(machine, MACHINE_VIDEO)) { p = (char *) malloc((strlen("internal") + 1) * sizeof(char)); @@ -970,13 +551,13 @@ load_video(void) free(p); } - voodoo_enabled = !!config_get_int(cat, "voodoo", 0); - ibm8514_enabled = !!config_get_int(cat, "8514a", 0); - xga_enabled = !!config_get_int(cat, "xga", 0); - show_second_monitors = !!config_get_int(cat, "show_second_monitors", 1); - video_fullscreen_scale_maximized = !!config_get_int(cat, "video_fullscreen_scale_maximized", 0); + voodoo_enabled = !!ini_section_get_int(cat, "voodoo", 0); + ibm8514_enabled = !!ini_section_get_int(cat, "8514a", 0); + xga_enabled = !!ini_section_get_int(cat, "xga", 0); + show_second_monitors = !!ini_section_get_int(cat, "show_second_monitors", 1); + video_fullscreen_scale_maximized = !!ini_section_get_int(cat, "video_fullscreen_scale_maximized", 0); - p = config_get_string(cat, "gfxcard_2", NULL); + p = ini_section_get_string(cat, "gfxcard_2", NULL); if (!p) p = "none"; gfxcard_2 = video_get_video_from_internal_name(p); @@ -986,18 +567,18 @@ load_video(void) static void load_input_devices(void) { - char *cat = "Input devices"; + ini_section_t cat = ini_find_section(config, "Input devices"); char temp[512]; int c, d; char *p; - p = config_get_string(cat, "mouse_type", NULL); + p = ini_section_get_string(cat, "mouse_type", NULL); if (p != NULL) mouse_type = mouse_get_from_internal_name(p); else mouse_type = 0; - p = config_get_string(cat, "joystick_type", NULL); + p = ini_section_get_string(cat, "joystick_type", NULL); if (p != NULL) { if (!strcmp(p, "standard_2button")) /* migrate renamed types */ joystick_type = joystick_get_from_internal_name("2axis_2button"); @@ -1014,10 +595,10 @@ load_input_devices(void) if (!joystick_type) { /* Try to read an integer for backwards compatibility with old configs */ - if (!strcmp(p, "0")) /* workaround for config_get_int returning 0 on non-integer data */ + if (!strcmp(p, "0")) /* workaround for ini_section_get_int returning 0 on non-integer data */ joystick_type = joystick_get_from_internal_name("2axis_2button"); else { - c = config_get_int(cat, "joystick_type", 8); + c = ini_section_get_int(cat, "joystick_type", 8); switch (c) { case 1: joystick_type = joystick_get_from_internal_name("2axis_4button"); @@ -1051,20 +632,20 @@ load_input_devices(void) for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) { sprintf(temp, "joystick_%i_nr", c); - joystick_state[c].plat_joystick_nr = config_get_int(cat, temp, 0); + joystick_state[c].plat_joystick_nr = ini_section_get_int(cat, temp, 0); if (joystick_state[c].plat_joystick_nr) { for (d = 0; d < joystick_get_axis_count(joystick_type); d++) { sprintf(temp, "joystick_%i_axis_%i", c, d); - joystick_state[c].axis_mapping[d] = config_get_int(cat, temp, d); + joystick_state[c].axis_mapping[d] = ini_section_get_int(cat, temp, d); } for (d = 0; d < joystick_get_button_count(joystick_type); d++) { sprintf(temp, "joystick_%i_button_%i", c, d); - joystick_state[c].button_mapping[d] = config_get_int(cat, temp, d); + joystick_state[c].button_mapping[d] = ini_section_get_int(cat, temp, d); } for (d = 0; d < joystick_get_pov_count(joystick_type); d++) { sprintf(temp, "joystick_%i_pov_%i", c, d); - p = config_get_string(cat, temp, "0, 0"); + p = ini_section_get_string(cat, temp, "0, 0"); joystick_state[c].pov_mapping[d][0] = joystick_state[c].pov_mapping[d][1] = 0; sscanf(p, "%i, %i", &joystick_state[c].pov_mapping[d][0], &joystick_state[c].pov_mapping[d][1]); } @@ -1076,11 +657,11 @@ load_input_devices(void) static void load_sound(void) { - char *cat = "Sound"; + ini_section_t cat = ini_find_section(config, "Sound"); char temp[512]; char *p; - p = config_get_string(cat, "sndcard", NULL); + p = ini_section_get_string(cat, "sndcard", NULL); /* FIXME: Hack to not break configs with the Sound Blaster 128 PCI set. */ if ((p != NULL) && (!strcmp(p, "sbpci128") || !strcmp(p, "sb128pci"))) p = "es1371"; @@ -1089,26 +670,26 @@ load_sound(void) else sound_card_current = 0; - p = config_get_string(cat, "midi_device", NULL); + p = ini_section_get_string(cat, "midi_device", NULL); if (p != NULL) midi_output_device_current = midi_out_device_get_from_internal_name(p); else midi_output_device_current = 0; - p = config_get_string(cat, "midi_in_device", NULL); + p = ini_section_get_string(cat, "midi_in_device", NULL); if (p != NULL) midi_input_device_current = midi_in_device_get_from_internal_name(p); else midi_input_device_current = 0; - mpu401_standalone_enable = !!config_get_int(cat, "mpu401_standalone", 0); + mpu401_standalone_enable = !!ini_section_get_int(cat, "mpu401_standalone", 0); - SSI2001 = !!config_get_int(cat, "ssi2001", 0); - GAMEBLASTER = !!config_get_int(cat, "gameblaster", 0); - GUS = !!config_get_int(cat, "gus", 0); + SSI2001 = !!ini_section_get_int(cat, "ssi2001", 0); + GAMEBLASTER = !!ini_section_get_int(cat, "gameblaster", 0); + GUS = !!ini_section_get_int(cat, "gus", 0); memset(temp, '\0', sizeof(temp)); - p = config_get_string(cat, "sound_type", "float"); + p = ini_section_get_string(cat, "sound_type", "float"); if (strlen(p) > 511) fatal("load_sound(): strlen(p) > 511\n"); else @@ -1118,7 +699,7 @@ load_sound(void) else sound_is_float = 0; - p = config_get_string(cat, "fm_driver", "nuked"); + p = ini_section_get_string(cat, "fm_driver", "nuked"); if (!strcmp(p, "ymfm")) { fm_driver = FM_DRV_YMFM; } else { @@ -1130,17 +711,17 @@ load_sound(void) static void load_network(void) { - char *cat = "Network"; + ini_section_t cat = ini_find_section(config, "Network"); char *p; char temp[512]; int c = 0, min = 0; /* Handle legacy configuration which supported only one NIC */ - p = config_get_string(cat, "net_card", NULL); + p = ini_section_get_string(cat, "net_card", NULL); if (p != NULL) { net_cards_conf[c].device_num = network_card_get_from_internal_name(p); - p = config_get_string(cat, "net_type", NULL); + p = ini_section_get_string(cat, "net_type", NULL); if (p != NULL) { if (!strcmp(p, "pcap") || !strcmp(p, "1")) net_cards_conf[c].net_type = NET_TYPE_PCAP; @@ -1152,7 +733,7 @@ load_network(void) net_cards_conf[c].net_type = NET_TYPE_NONE; } - p = config_get_string(cat, "net_host_device", NULL); + p = ini_section_get_string(cat, "net_host_device", NULL); if (p != NULL) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if (network_ndev == 1) { @@ -1171,13 +752,13 @@ load_network(void) min++; } - config_delete_var(cat, "net_card"); - config_delete_var(cat, "net_type"); - config_delete_var(cat, "net_host_device"); + ini_section_delete_var(cat, "net_card"); + ini_section_delete_var(cat, "net_type"); + ini_section_delete_var(cat, "net_host_device"); for (c = min; c < NET_CARD_MAX; c++) { sprintf(temp, "net_%02i_card", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) { net_cards_conf[c].device_num = network_card_get_from_internal_name(p); } else { @@ -1185,7 +766,7 @@ load_network(void) } sprintf(temp, "net_%02i_net_type", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) { if (!strcmp(p, "pcap") || !strcmp(p, "1")) { net_cards_conf[c].net_type = NET_TYPE_PCAP; @@ -1199,7 +780,7 @@ load_network(void) } sprintf(temp, "net_%02i_host_device", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if (network_ndev == 1) { @@ -1216,7 +797,7 @@ load_network(void) } sprintf(temp, "net_%02i_link", c +1); - net_cards_conf[c].link_state = config_get_int(cat, temp, + net_cards_conf[c].link_state = ini_section_get_int(cat, temp, (NET_LINK_10_HD|NET_LINK_10_FD|NET_LINK_100_HD|NET_LINK_100_FD|NET_LINK_1000_HD|NET_LINK_1000_FD)); } @@ -1226,77 +807,77 @@ load_network(void) static void load_ports(void) { - char *cat = "Ports (COM & LPT)"; + ini_section_t cat = ini_find_section(config, "Ports (COM & LPT)"); char *p; char temp[512]; int c, d; for (c = 0; c < SERIAL_MAX; c++) { sprintf(temp, "serial%d_enabled", c + 1); - com_ports[c].enabled = !!config_get_int(cat, temp, (c >= 2) ? 0 : 1); + com_ports[c].enabled = !!ini_section_get_int(cat, temp, (c >= 2) ? 0 : 1); /* sprintf(temp, "serial%d_device", c + 1); - p = (char *) config_get_string(cat, temp, "none"); + p = (char *) ini_section_get_string(cat, temp, "none"); com_ports[c].device = com_device_get_from_internal_name(p); */ } for (c = 0; c < PARALLEL_MAX; c++) { sprintf(temp, "lpt%d_enabled", c + 1); - lpt_ports[c].enabled = !!config_get_int(cat, temp, (c == 0) ? 1 : 0); + lpt_ports[c].enabled = !!ini_section_get_int(cat, temp, (c == 0) ? 1 : 0); sprintf(temp, "lpt%d_device", c + 1); - p = (char *) config_get_string(cat, temp, "none"); + p = (char *) ini_section_get_string(cat, temp, "none"); lpt_ports[c].device = lpt_device_get_from_internal_name(p); } /* Legacy config compatibility. */ - d = config_get_int(cat, "lpt_enabled", 2); + d = ini_section_get_int(cat, "lpt_enabled", 2); if (d < 2) { for (c = 0; c < PARALLEL_MAX; c++) lpt_ports[c].enabled = d; } - config_delete_var(cat, "lpt_enabled"); + ini_section_delete_var(cat, "lpt_enabled"); } /* Load "Storage Controllers" section. */ static void load_storage_controllers(void) { - char *cat = "Storage controllers"; + ini_section_t cat = ini_find_section(config, "Storage controllers"); char *p, temp[512]; int c, min = 0; int free_p = 0; /* TODO: Backwards compatibility, get rid of this when enough time has passed. */ - backwards_compat2 = (find_section(cat) == NULL); + backwards_compat2 = (cat == NULL); /* TODO: Backwards compatibility, get rid of this when enough time has passed. */ - p = config_get_string(cat, "scsicard", NULL); + p = ini_section_get_string(cat, "scsicard", NULL); if (p != NULL) { scsi_card_current[0] = scsi_card_get_from_internal_name(p); min++; } - config_delete_var(cat, "scsi_card"); + ini_section_delete_var(cat, "scsi_card"); for (c = min; c < SCSI_BUS_MAX; c++) { sprintf(temp, "scsicard_%d", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) scsi_card_current[c] = scsi_card_get_from_internal_name(p); else scsi_card_current[c] = 0; } - p = config_get_string(cat, "fdc", NULL); + p = ini_section_get_string(cat, "fdc", NULL); if (p != NULL) fdc_type = fdc_card_get_from_internal_name(p); else fdc_type = FDC_INTERNAL; - p = config_get_string(cat, "hdc", NULL); + p = ini_section_get_string(cat, "hdc", NULL); if (p == NULL) { if (machine_has_flags(machine, MACHINE_HDC)) { p = (char *) malloc((strlen("internal") + 1) * sizeof(char)); @@ -1325,30 +906,30 @@ load_storage_controllers(void) p = NULL; } - ide_ter_enabled = !!config_get_int(cat, "ide_ter", 0); - ide_qua_enabled = !!config_get_int(cat, "ide_qua", 0); + ide_ter_enabled = !!ini_section_get_int(cat, "ide_ter", 0); + ide_qua_enabled = !!ini_section_get_int(cat, "ide_qua", 0); /* TODO: Re-enable by default after we actually have a proper machine flag for this. */ - cassette_enable = !!config_get_int(cat, "cassette_enabled", 0); - p = config_get_string(cat, "cassette_file", ""); + cassette_enable = !!ini_section_get_int(cat, "cassette_enabled", 0); + p = ini_section_get_string(cat, "cassette_file", ""); if (strlen(p) > 511) fatal("load_storage_controllers(): strlen(p) > 511\n"); else strncpy(cassette_fname, p, MIN(512, strlen(p) + 1)); - p = config_get_string(cat, "cassette_mode", ""); + p = ini_section_get_string(cat, "cassette_mode", ""); if (strlen(p) > 511) fatal("load_storage_controllers(): strlen(p) > 511\n"); else strncpy(cassette_mode, p, MIN(512, strlen(p) + 1)); - cassette_pos = config_get_int(cat, "cassette_position", 0); - cassette_srate = config_get_int(cat, "cassette_srate", 44100); - cassette_append = !!config_get_int(cat, "cassette_append", 0); - cassette_pcm = config_get_int(cat, "cassette_pcm", 0); - cassette_ui_writeprot = !!config_get_int(cat, "cassette_writeprot", 0); + cassette_pos = ini_section_get_int(cat, "cassette_position", 0); + cassette_srate = ini_section_get_int(cat, "cassette_srate", 44100); + cassette_append = !!ini_section_get_int(cat, "cassette_append", 0); + cassette_pcm = ini_section_get_int(cat, "cassette_pcm", 0); + cassette_ui_writeprot = !!ini_section_get_int(cat, "cassette_writeprot", 0); for (c = 0; c < 2; c++) { sprintf(temp, "cartridge_%02i_fn", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); #if 0 /* @@ -1378,7 +959,7 @@ load_storage_controllers(void) static void load_hard_disks(void) { - char *cat = "Hard disks"; + ini_section_t cat = ini_find_section(config, "Hard disks"); char temp[512], tmp2[512]; char s[512]; int c; @@ -1389,7 +970,7 @@ load_hard_disks(void) memset(temp, '\0', sizeof(temp)); for (c = 0; c < HDD_NUM; c++) { sprintf(temp, "hdd_%02i_parameters", c + 1); - p = config_get_string(cat, temp, "0, 0, 0, 0, none"); + p = ini_section_get_string(cat, temp, "0, 0, 0, 0, none"); sscanf(p, "%u, %u, %u, %i, %s", &hdd[c].spt, &hdd[c].hpc, &hdd[c].tracks, (int *) &hdd[c].wp, s); @@ -1448,35 +1029,35 @@ load_hard_disks(void) sprintf(tmp2, "ramdisk"); break; } - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); hdd[c].speed_preset = hdd_preset_get_from_internal_name(p); /* MFM/RLL */ sprintf(temp, "hdd_%02i_mfm_channel", c + 1); if (hdd[c].bus == HDD_BUS_MFM) - hdd[c].mfm_channel = !!config_get_int(cat, temp, c & 1); + hdd[c].mfm_channel = !!ini_section_get_int(cat, temp, c & 1); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); /* XTA */ sprintf(temp, "hdd_%02i_xta_channel", c + 1); if (hdd[c].bus == HDD_BUS_XTA) - hdd[c].xta_channel = !!config_get_int(cat, temp, c & 1); + hdd[c].xta_channel = !!ini_section_get_int(cat, temp, c & 1); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); /* ESDI */ sprintf(temp, "hdd_%02i_esdi_channel", c + 1); if (hdd[c].bus == HDD_BUS_ESDI) - hdd[c].esdi_channel = !!config_get_int(cat, temp, c & 1); + hdd[c].esdi_channel = !!ini_section_get_int(cat, temp, c & 1); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); /* IDE */ sprintf(temp, "hdd_%02i_ide_channel", c + 1); if (hdd[c].bus == HDD_BUS_IDE) { sprintf(tmp2, "%01u:%01u", c >> 1, c & 1); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%01u", &board, &dev); board &= 3; dev &= 1; @@ -1485,19 +1066,19 @@ load_hard_disks(void) if (hdd[c].ide_channel > 7) hdd[c].ide_channel = 7; } else { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } /* SCSI */ if (hdd[c].bus == HDD_BUS_SCSI) { sprintf(temp, "hdd_%02i_scsi_location", c + 1); sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%02u", &board, &dev); if (board >= SCSI_BUS_MAX) { /* Invalid bus - check legacy ID */ sprintf(temp, "hdd_%02i_scsi_id", c + 1); - hdd[c].scsi_id = config_get_int(cat, temp, c + 2); + hdd[c].scsi_id = ini_section_get_int(cat, temp, c + 2); if (hdd[c].scsi_id > 15) hdd[c].scsi_id = 15; @@ -1508,16 +1089,16 @@ load_hard_disks(void) } } else { sprintf(temp, "hdd_%02i_scsi_location", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "hdd_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); memset(hdd[c].fn, 0x00, sizeof(hdd[c].fn)); memset(hdd[c].prev_fn, 0x00, sizeof(hdd[c].prev_fn)); sprintf(temp, "hdd_%02i_fn", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); #if 0 /* @@ -1551,26 +1132,26 @@ load_hard_disks(void) /* If disk is empty or invalid, mark it for deletion. */ if (!hdd_is_valid(c)) { sprintf(temp, "hdd_%02i_parameters", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_preide_channels", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_ide_channels", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_fn", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "hdd_%02i_mfm_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } } @@ -1579,7 +1160,7 @@ load_hard_disks(void) static void load_floppy_drives(void) { - char *cat = "Floppy drives"; + ini_section_t cat = ini_find_section(config, "Floppy drives"); char temp[512], *p; int c; @@ -1588,15 +1169,15 @@ load_floppy_drives(void) for (c = 0; c < FDD_NUM; c++) { sprintf(temp, "fdd_%02i_type", c + 1); - p = config_get_string(cat, temp, (c < 2) ? "525_2dd" : "none"); + p = ini_section_get_string(cat, temp, (c < 2) ? "525_2dd" : "none"); fdd_set_type(c, fdd_get_from_internal_name(p)); if (fdd_get_type(c) > 13) fdd_set_type(c, 13); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "fdd_%02i_fn", c + 1); - p = config_get_string(cat, temp, ""); - config_delete_var(cat, temp); + p = ini_section_get_string(cat, temp, ""); + ini_section_delete_var(cat, temp); #if 0 /* @@ -1623,42 +1204,42 @@ load_floppy_drives(void) /* if (*wp != L'\0') config_log("Floppy%d: %ls\n", c, floppyfns[c]); */ sprintf(temp, "fdd_%02i_writeprot", c + 1); - ui_writeprot[c] = !!config_get_int(cat, temp, 0); - config_delete_var(cat, temp); + ui_writeprot[c] = !!ini_section_get_int(cat, temp, 0); + ini_section_delete_var(cat, temp); sprintf(temp, "fdd_%02i_turbo", c + 1); - fdd_set_turbo(c, !!config_get_int(cat, temp, 0)); - config_delete_var(cat, temp); + fdd_set_turbo(c, !!ini_section_get_int(cat, temp, 0)); + ini_section_delete_var(cat, temp); sprintf(temp, "fdd_%02i_check_bpb", c + 1); - fdd_set_check_bpb(c, !!config_get_int(cat, temp, 1)); - config_delete_var(cat, temp); + fdd_set_check_bpb(c, !!ini_section_get_int(cat, temp, 1)); + ini_section_delete_var(cat, temp); } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Load "Floppy and CD-ROM Drives" section. */ static void load_floppy_and_cdrom_drives(void) { - char *cat = "Floppy and CD-ROM drives"; + ini_section_t cat = ini_find_section(config, "Floppy and CD-ROM drives"); char temp[512], tmp2[512], *p; char s[512]; unsigned int board = 0, dev = 0; int c, d = 0; /* TODO: Backwards compatibility, get rid of this when enough time has passed. */ - backwards_compat = (find_section(cat) == NULL); + backwards_compat = (cat == NULL); memset(temp, 0x00, sizeof(temp)); for (c = 0; c < FDD_NUM; c++) { sprintf(temp, "fdd_%02i_type", c + 1); - p = config_get_string(cat, temp, (c < 2) ? "525_2dd" : "none"); + p = ini_section_get_string(cat, temp, (c < 2) ? "525_2dd" : "none"); fdd_set_type(c, fdd_get_from_internal_name(p)); if (fdd_get_type(c) > 13) fdd_set_type(c, 13); sprintf(temp, "fdd_%02i_fn", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); #if 0 /* @@ -1685,43 +1266,43 @@ load_floppy_and_cdrom_drives(void) /* if (*wp != L'\0') config_log("Floppy%d: %ls\n", c, floppyfns[c]); */ sprintf(temp, "fdd_%02i_writeprot", c + 1); - ui_writeprot[c] = !!config_get_int(cat, temp, 0); + ui_writeprot[c] = !!ini_section_get_int(cat, temp, 0); sprintf(temp, "fdd_%02i_turbo", c + 1); - fdd_set_turbo(c, !!config_get_int(cat, temp, 0)); + fdd_set_turbo(c, !!ini_section_get_int(cat, temp, 0)); sprintf(temp, "fdd_%02i_check_bpb", c + 1); - fdd_set_check_bpb(c, !!config_get_int(cat, temp, 1)); + fdd_set_check_bpb(c, !!ini_section_get_int(cat, temp, 1)); /* Check whether each value is default, if yes, delete it so that only non-default values will later be saved. */ if (fdd_get_type(c) == ((c < 2) ? 2 : 0)) { sprintf(temp, "fdd_%02i_type", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (strlen(floppyfns[c]) == 0) { sprintf(temp, "fdd_%02i_fn", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (ui_writeprot[c] == 0) { sprintf(temp, "fdd_%02i_writeprot", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (fdd_get_turbo(c) == 0) { sprintf(temp, "fdd_%02i_turbo", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (fdd_get_check_bpb(c) == 1) { sprintf(temp, "fdd_%02i_check_bpb", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } } memset(temp, 0x00, sizeof(temp)); for (c = 0; c < CDROM_NUM; c++) { sprintf(temp, "cdrom_%02i_host_drive", c + 1); - cdrom[c].host_drive = config_get_int(cat, temp, 0); + cdrom[c].host_drive = ini_section_get_int(cat, temp, 0); cdrom[c].prev_host_drive = cdrom[c].host_drive; sprintf(temp, "cdrom_%02i_parameters", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) sscanf(p, "%01u, %s", &d, s); else if (c == 0) @@ -1733,7 +1314,7 @@ load_floppy_and_cdrom_drives(void) cdrom[c].bus_type = hdd_string_to_bus(s, 1); sprintf(temp, "cdrom_%02i_speed", c + 1); - cdrom[c].speed = config_get_int(cat, temp, 8); + cdrom[c].speed = ini_section_get_int(cat, temp, 8); /* Default values, needed for proper operation of the Settings dialog. */ cdrom[c].ide_channel = cdrom[c].scsi_device_id = c + 2; @@ -1741,7 +1322,7 @@ load_floppy_and_cdrom_drives(void) if (cdrom[c].bus_type == CDROM_BUS_ATAPI) { sprintf(temp, "cdrom_%02i_ide_channel", c + 1); sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%01u", &board, &dev); board &= 3; dev &= 1; @@ -1752,12 +1333,12 @@ load_floppy_and_cdrom_drives(void) } else if (cdrom[c].bus_type == CDROM_BUS_SCSI) { sprintf(temp, "cdrom_%02i_scsi_location", c + 1); sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%02u", &board, &dev); if (board >= SCSI_BUS_MAX) { /* Invalid bus - check legacy ID */ sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - cdrom[c].scsi_device_id = config_get_int(cat, temp, c + 2); + cdrom[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2); if (cdrom[c].scsi_device_id > 15) cdrom[c].scsi_device_id = 15; @@ -1770,19 +1351,19 @@ load_floppy_and_cdrom_drives(void) if (cdrom[c].bus_type != CDROM_BUS_ATAPI) { sprintf(temp, "cdrom_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (cdrom[c].bus_type != CDROM_BUS_SCSI) { sprintf(temp, "cdrom_%02i_scsi_location", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_image_path", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); #if 0 /* @@ -1812,28 +1393,28 @@ load_floppy_and_cdrom_drives(void) /* If the CD-ROM is disabled, delete all its variables. */ if (cdrom[c].bus_type == CDROM_BUS_DISABLED) { sprintf(temp, "cdrom_%02i_host_drive", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_parameters", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_image_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "cdrom_%02i_iso_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); for (int i = 0; i < MAX_PREV_IMAGES; i++) { cdrom[c].image_history[i] = (char *) calloc(MAX_IMAGE_PATH_LEN + 1, sizeof(char)); sprintf(temp, "cdrom_%02i_image_history_%02i", c + 1, i + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if(p) { sprintf(cdrom[c].image_history[i], "%s", p); } @@ -1845,7 +1426,7 @@ load_floppy_and_cdrom_drives(void) static void load_other_removable_devices(void) { - char *cat = "Other removable devices"; + ini_section_t cat = ini_find_section(config, "Other removable devices"); char temp[512], tmp2[512], *p; char s[512]; unsigned int board = 0, dev = 0; @@ -1856,32 +1437,32 @@ load_other_removable_devices(void) memset(temp, 0x00, sizeof(temp)); for (c = 0; c < CDROM_NUM; c++) { sprintf(temp, "cdrom_%02i_host_drive", c + 1); - cdrom[c].host_drive = config_get_int(cat, temp, 0); + cdrom[c].host_drive = ini_section_get_int(cat, temp, 0); cdrom[c].prev_host_drive = cdrom[c].host_drive; - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_parameters", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) sscanf(p, "%01u, %s", &d, s); else sscanf("0, none", "%01u, %s", &d, s); cdrom[c].sound_on = d; cdrom[c].bus_type = hdd_string_to_bus(s, 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_speed", c + 1); - cdrom[c].speed = config_get_int(cat, temp, 8); - config_delete_var(cat, temp); + cdrom[c].speed = ini_section_get_int(cat, temp, 8); + ini_section_delete_var(cat, temp); /* Default values, needed for proper operation of the Settings dialog. */ cdrom[c].ide_channel = cdrom[c].scsi_device_id = c + 2; - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); if (cdrom[c].bus_type == CDROM_BUS_ATAPI) { sprintf(temp, "cdrom_%02i_ide_channel", c + 1); sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%01u", &board, &dev); board &= 3; dev &= 1; @@ -1890,20 +1471,20 @@ load_other_removable_devices(void) if (cdrom[c].ide_channel > 7) cdrom[c].ide_channel = 7; - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else if (cdrom[c].bus_type == CDROM_BUS_SCSI) { sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - cdrom[c].scsi_device_id = config_get_int(cat, temp, c + 2); + cdrom[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2); if (cdrom[c].scsi_device_id > 15) cdrom[c].scsi_device_id = 15; - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "cdrom_%02i_image_path", c + 1); - p = config_get_string(cat, temp, ""); - config_delete_var(cat, temp); + p = ini_section_get_string(cat, temp, ""); + ini_section_delete_var(cat, temp); #if 0 /* @@ -1936,7 +1517,7 @@ load_other_removable_devices(void) memset(temp, 0x00, sizeof(temp)); for (c = 0; c < ZIP_NUM; c++) { sprintf(temp, "zip_%02i_parameters", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) sscanf(p, "%01u, %s", &zip_drives[c].is_250, s); else @@ -1949,7 +1530,7 @@ load_other_removable_devices(void) if (zip_drives[c].bus_type == ZIP_BUS_ATAPI) { sprintf(temp, "zip_%02i_ide_channel", c + 1); sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%01u", &board, &dev); board &= 3; dev &= 1; @@ -1960,12 +1541,12 @@ load_other_removable_devices(void) } else if (zip_drives[c].bus_type == ZIP_BUS_SCSI) { sprintf(temp, "zip_%02i_scsi_location", c + 1); sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%02u", &board, &dev); if (board >= SCSI_BUS_MAX) { /* Invalid bus - check legacy ID */ sprintf(temp, "zip_%02i_scsi_id", c + 1); - zip_drives[c].scsi_device_id = config_get_int(cat, temp, c + 2); + zip_drives[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2); if (zip_drives[c].scsi_device_id > 15) zip_drives[c].scsi_device_id = 15; @@ -1978,19 +1559,19 @@ load_other_removable_devices(void) if (zip_drives[c].bus_type != ZIP_BUS_ATAPI) { sprintf(temp, "zip_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (zip_drives[c].bus_type != ZIP_BUS_SCSI) { sprintf(temp, "zip_%02i_scsi_location", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "zip_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_image_path", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); #if 0 /* @@ -2014,29 +1595,29 @@ load_other_removable_devices(void) /* If the CD-ROM is disabled, delete all its variables. */ if (zip_drives[c].bus_type == ZIP_BUS_DISABLED) { sprintf(temp, "zip_%02i_host_drive", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_parameters", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_image_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "zip_%02i_iso_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } memset(temp, 0x00, sizeof(temp)); for (c = 0; c < MO_NUM; c++) { sprintf(temp, "mo_%02i_parameters", c + 1); - p = config_get_string(cat, temp, NULL); + p = ini_section_get_string(cat, temp, NULL); if (p != NULL) sscanf(p, "%u, %s", &mo_drives[c].type, s); else @@ -2049,7 +1630,7 @@ load_other_removable_devices(void) if (mo_drives[c].bus_type == MO_BUS_ATAPI) { sprintf(temp, "mo_%02i_ide_channel", c + 1); sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%01u", &board, &dev); board &= 3; dev &= 1; @@ -2060,12 +1641,12 @@ load_other_removable_devices(void) } else if (mo_drives[c].bus_type == MO_BUS_SCSI) { sprintf(temp, "mo_%02i_scsi_location", c + 1); sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2); - p = config_get_string(cat, temp, tmp2); + p = ini_section_get_string(cat, temp, tmp2); sscanf(p, "%01u:%02u", &board, &dev); if (board >= SCSI_BUS_MAX) { /* Invalid bus - check legacy ID */ sprintf(temp, "mo_%02i_scsi_id", c + 1); - mo_drives[c].scsi_device_id = config_get_int(cat, temp, c + 2); + mo_drives[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2); if (mo_drives[c].scsi_device_id > 15) mo_drives[c].scsi_device_id = 15; @@ -2078,42 +1659,42 @@ load_other_removable_devices(void) if (mo_drives[c].bus_type != MO_BUS_ATAPI) { sprintf(temp, "mo_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } if (mo_drives[c].bus_type != MO_BUS_SCSI) { sprintf(temp, "mo_%02i_scsi_location", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "mo_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_image_path", c + 1); - p = config_get_string(cat, temp, ""); + p = ini_section_get_string(cat, temp, ""); strncpy(mo_drives[c].image_path, p, sizeof(mo_drives[c].image_path) - 1); /* If the CD-ROM is disabled, delete all its variables. */ if (mo_drives[c].bus_type == MO_BUS_DISABLED) { sprintf(temp, "mo_%02i_host_drive", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_parameters", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_ide_channel", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_image_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "mo_%02i_iso_path", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } } @@ -2121,27 +1702,27 @@ load_other_removable_devices(void) static void load_other_peripherals(void) { - char *cat = "Other peripherals"; + ini_section_t cat = ini_find_section(config, "Other peripherals"); char *p; char temp[512]; int c, free_p = 0; if (backwards_compat2) { - p = config_get_string(cat, "scsicard", NULL); + p = ini_section_get_string(cat, "scsicard", NULL); if (p != NULL) scsi_card_current[0] = scsi_card_get_from_internal_name(p); else scsi_card_current[0] = 0; - config_delete_var(cat, "scsicard"); + ini_section_delete_var(cat, "scsicard"); - p = config_get_string(cat, "fdc", NULL); + p = ini_section_get_string(cat, "fdc", NULL); if (p != NULL) fdc_type = fdc_card_get_from_internal_name(p); else fdc_type = FDC_INTERNAL; - config_delete_var(cat, "fdc"); + ini_section_delete_var(cat, "fdc"); - p = config_get_string(cat, "hdc", NULL); + p = ini_section_get_string(cat, "hdc", NULL); if (p == NULL) { if (machine_has_flags(machine, MACHINE_HDC)) { p = (char *) malloc((strlen("internal") + 1) * sizeof(char)); @@ -2164,31 +1745,31 @@ load_other_peripherals(void) hdc_current = hdc_get_from_internal_name("ide_vlb_2ch"); else hdc_current = hdc_get_from_internal_name(p); - config_delete_var(cat, "hdc"); + ini_section_delete_var(cat, "hdc"); if (free_p) { free(p); p = NULL; } - ide_ter_enabled = !!config_get_int(cat, "ide_ter", 0); - config_delete_var(cat, "ide_ter"); - ide_qua_enabled = !!config_get_int(cat, "ide_qua", 0); - config_delete_var(cat, "ide_qua"); + ide_ter_enabled = !!ini_section_get_int(cat, "ide_ter", 0); + ini_section_delete_var(cat, "ide_ter"); + ide_qua_enabled = !!ini_section_get_int(cat, "ide_qua", 0); + ini_section_delete_var(cat, "ide_qua"); } backwards_compat2 = 0; - bugger_enabled = !!config_get_int(cat, "bugger_enabled", 0); - postcard_enabled = !!config_get_int(cat, "postcard_enabled", 0); + bugger_enabled = !!ini_section_get_int(cat, "bugger_enabled", 0); + postcard_enabled = !!ini_section_get_int(cat, "postcard_enabled", 0); for (c = 0; c < ISAMEM_MAX; c++) { sprintf(temp, "isamem%d_type", c); - p = config_get_string(cat, temp, "none"); + p = ini_section_get_string(cat, temp, "none"); isamem_type[c] = isamem_get_from_internal_name(p); } - p = config_get_string(cat, "isartc_type", "none"); + p = ini_section_get_string(cat, "isartc_type", "none"); isartc_type = isartc_get_from_internal_name(p); } @@ -2207,7 +1788,10 @@ config_load(void) #endif memset(zip_drives, 0, sizeof(zip_drive_t)); - if (!config_read(cfg_path)) { + config = ini_read(cfg_path); + + if (!config) { + config = ini_new(); config_changed = 1; cpu_f = (cpu_family_t *) &cpu_families[0]; @@ -2297,171 +1881,171 @@ config_load(void) static void save_general(void) { - char *cat = "General"; + ini_section_t cat = ini_find_or_create_section(config, "General"); char temp[512], buffer[512] = { 0 }; char *va_name; - config_set_int(cat, "vid_resize", vid_resize); + ini_section_set_int(cat, "vid_resize", vid_resize); if (vid_resize == 0) - config_delete_var(cat, "vid_resize"); + ini_section_delete_var(cat, "vid_resize"); va_name = plat_vidapi_name(vid_api); if (!strcmp(va_name, "default")) - config_delete_var(cat, "vid_renderer"); + ini_section_delete_var(cat, "vid_renderer"); else - config_set_string(cat, "vid_renderer", va_name); + ini_section_set_string(cat, "vid_renderer", va_name); if (video_fullscreen_scale == 0) - config_delete_var(cat, "video_fullscreen_scale"); + ini_section_delete_var(cat, "video_fullscreen_scale"); else - config_set_int(cat, "video_fullscreen_scale", video_fullscreen_scale); + ini_section_set_int(cat, "video_fullscreen_scale", video_fullscreen_scale); if (video_fullscreen_first == 1) - config_delete_var(cat, "video_fullscreen_first"); + ini_section_delete_var(cat, "video_fullscreen_first"); else - config_set_int(cat, "video_fullscreen_first", video_fullscreen_first); + ini_section_set_int(cat, "video_fullscreen_first", video_fullscreen_first); if (video_filter_method == 1) - config_delete_var(cat, "video_filter_method"); + ini_section_delete_var(cat, "video_filter_method"); else - config_set_int(cat, "video_filter_method", video_filter_method); + ini_section_set_int(cat, "video_filter_method", video_filter_method); if (force_43 == 0) - config_delete_var(cat, "force_43"); + ini_section_delete_var(cat, "force_43"); else - config_set_int(cat, "force_43", force_43); + ini_section_set_int(cat, "force_43", force_43); if (scale == 1) - config_delete_var(cat, "scale"); + ini_section_delete_var(cat, "scale"); else - config_set_int(cat, "scale", scale); + ini_section_set_int(cat, "scale", scale); if (dpi_scale == 1) - config_delete_var(cat, "dpi_scale"); + ini_section_delete_var(cat, "dpi_scale"); else - config_set_int(cat, "dpi_scale", dpi_scale); + ini_section_set_int(cat, "dpi_scale", dpi_scale); if (enable_overscan == 0) - config_delete_var(cat, "enable_overscan"); + ini_section_delete_var(cat, "enable_overscan"); else - config_set_int(cat, "enable_overscan", enable_overscan); + ini_section_set_int(cat, "enable_overscan", enable_overscan); if (vid_cga_contrast == 0) - config_delete_var(cat, "vid_cga_contrast"); + ini_section_delete_var(cat, "vid_cga_contrast"); else - config_set_int(cat, "vid_cga_contrast", vid_cga_contrast); + ini_section_set_int(cat, "vid_cga_contrast", vid_cga_contrast); if (video_grayscale == 0) - config_delete_var(cat, "video_grayscale"); + ini_section_delete_var(cat, "video_grayscale"); else - config_set_int(cat, "video_grayscale", video_grayscale); + ini_section_set_int(cat, "video_grayscale", video_grayscale); if (video_graytype == 0) - config_delete_var(cat, "video_graytype"); + ini_section_delete_var(cat, "video_graytype"); else - config_set_int(cat, "video_graytype", video_graytype); + ini_section_set_int(cat, "video_graytype", video_graytype); if (rctrl_is_lalt == 0) - config_delete_var(cat, "rctrl_is_lalt"); + ini_section_delete_var(cat, "rctrl_is_lalt"); else - config_set_int(cat, "rctrl_is_lalt", rctrl_is_lalt); + ini_section_set_int(cat, "rctrl_is_lalt", rctrl_is_lalt); if (update_icons == 1) - config_delete_var(cat, "update_icons"); + ini_section_delete_var(cat, "update_icons"); else - config_set_int(cat, "update_icons", update_icons); + ini_section_set_int(cat, "update_icons", update_icons); if (window_remember || (vid_resize & 2)) { if (window_remember) - config_set_int(cat, "window_remember", window_remember); + ini_section_set_int(cat, "window_remember", window_remember); else - config_delete_var(cat, "window_remember"); + ini_section_delete_var(cat, "window_remember"); } else - config_delete_var(cat, "window_remember"); + ini_section_delete_var(cat, "window_remember"); if (vid_resize & 2) { sprintf(temp, "%ix%i", fixed_size_x, fixed_size_y); - config_set_string(cat, "window_fixed_res", temp); + ini_section_set_string(cat, "window_fixed_res", temp); } else - config_delete_var(cat, "window_fixed_res"); + ini_section_delete_var(cat, "window_fixed_res"); if (sound_gain != 0) - config_set_int(cat, "sound_gain", sound_gain); + ini_section_set_int(cat, "sound_gain", sound_gain); else - config_delete_var(cat, "sound_gain"); + ini_section_delete_var(cat, "sound_gain"); if (kbd_req_capture != 0) - config_set_int(cat, "kbd_req_capture", kbd_req_capture); + ini_section_set_int(cat, "kbd_req_capture", kbd_req_capture); else - config_delete_var(cat, "kbd_req_capture"); + ini_section_delete_var(cat, "kbd_req_capture"); if (hide_status_bar != 0) - config_set_int(cat, "hide_status_bar", hide_status_bar); + ini_section_set_int(cat, "hide_status_bar", hide_status_bar); else - config_delete_var(cat, "hide_status_bar"); + ini_section_delete_var(cat, "hide_status_bar"); if (hide_tool_bar != 0) - config_set_int(cat, "hide_tool_bar", hide_tool_bar); + ini_section_set_int(cat, "hide_tool_bar", hide_tool_bar); else - config_delete_var(cat, "hide_tool_bar"); + ini_section_delete_var(cat, "hide_tool_bar"); if (confirm_reset != 1) - config_set_int(cat, "confirm_reset", confirm_reset); + ini_section_set_int(cat, "confirm_reset", confirm_reset); else - config_delete_var(cat, "confirm_reset"); + ini_section_delete_var(cat, "confirm_reset"); if (confirm_exit != 1) - config_set_int(cat, "confirm_exit", confirm_exit); + ini_section_set_int(cat, "confirm_exit", confirm_exit); else - config_delete_var(cat, "confirm_exit"); + ini_section_delete_var(cat, "confirm_exit"); if (confirm_save != 1) - config_set_int(cat, "confirm_save", confirm_save); + ini_section_set_int(cat, "confirm_save", confirm_save); else - config_delete_var(cat, "confirm_save"); + ini_section_delete_var(cat, "confirm_save"); if (mouse_sensitivity != 1.0) - config_set_double(cat, "mouse_sensitivity", mouse_sensitivity); + ini_section_set_double(cat, "mouse_sensitivity", mouse_sensitivity); else - config_delete_var(cat, "mouse_sensitivity"); + ini_section_delete_var(cat, "mouse_sensitivity"); if (lang_id == DEFAULT_LANGUAGE) - config_delete_var(cat, "language"); + ini_section_delete_var(cat, "language"); else { plat_language_code_r(lang_id, buffer, 511); - config_set_string(cat, "language", buffer); + ini_section_set_string(cat, "language", buffer); } if (!strcmp(icon_set, "")) - config_delete_var(cat, "iconset"); + ini_section_delete_var(cat, "iconset"); else - config_set_string(cat, "iconset", icon_set); + ini_section_set_string(cat, "iconset", icon_set); if (enable_discord) - config_set_int(cat, "enable_discord", enable_discord); + ini_section_set_int(cat, "enable_discord", enable_discord); else - config_delete_var(cat, "enable_discord"); + ini_section_delete_var(cat, "enable_discord"); if (open_dir_usr_path) - config_set_int(cat, "open_dir_usr_path", open_dir_usr_path); + ini_section_set_int(cat, "open_dir_usr_path", open_dir_usr_path); else - config_delete_var(cat, "open_dir_usr_path"); + ini_section_delete_var(cat, "open_dir_usr_path"); if (video_framerate != -1) - config_set_int(cat, "video_gl_framerate", video_framerate); + ini_section_set_int(cat, "video_gl_framerate", video_framerate); else - config_delete_var(cat, "video_gl_framerate"); + ini_section_delete_var(cat, "video_gl_framerate"); if (video_vsync != 0) - config_set_int(cat, "video_gl_vsync", video_vsync); + ini_section_set_int(cat, "video_gl_vsync", video_vsync); else - config_delete_var(cat, "video_gl_vsync"); + ini_section_delete_var(cat, "video_gl_vsync"); if (strlen(video_shader) > 0) - config_set_string(cat, "video_gl_shader", video_shader); + ini_section_set_string(cat, "video_gl_shader", video_shader); else - config_delete_var(cat, "video_gl_shader"); + ini_section_delete_var(cat, "video_gl_shader"); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save monitor section. */ @@ -2477,15 +2061,15 @@ save_monitor(int monitor_index) monitor_settings[monitor_index].mon_window_x, monitor_settings[monitor_index].mon_window_y, monitor_settings[monitor_index].mon_window_w, monitor_settings[monitor_index].mon_window_h); - config_set_string(cat, "window_coordinates", temp); + ini_section_set_string(cat, "window_coordinates", temp); if (monitor_settings[monitor_index].mon_window_maximized != 0) { - config_set_int(cat, "window_maximized", monitor_settings[monitor_index].mon_window_maximized); + ini_section_set_int(cat, "window_maximized", monitor_settings[monitor_index].mon_window_maximized); } else { - config_delete_var(cat, "window_maximized"); + ini_section_delete_var(cat, "window_maximized"); } } else { - config_delete_var(cat, "window_coordinates"); - config_delete_var(cat, "window_maximized"); + ini_section_delete_var(cat, "window_coordinates"); + ini_section_delete_var(cat, "window_maximized"); } } @@ -2493,24 +2077,24 @@ save_monitor(int monitor_index) static void save_machine(void) { - char *cat = "Machine"; + ini_section_t cat = ini_find_or_create_section(config, "Machine"); char *p; int c, i = 0, legacy_mfg, legacy_cpu = -1, closest_legacy_cpu = -1; p = machine_get_internal_name(); - config_set_string(cat, "machine", p); + ini_section_set_string(cat, "machine", p); - config_set_string(cat, "cpu_family", (char *) cpu_f->internal_name); - config_set_int(cat, "cpu_speed", cpu_f->cpus[cpu].rspeed); - config_set_double(cat, "cpu_multi", cpu_f->cpus[cpu].multi); + ini_section_set_string(cat, "cpu_family", (char *) cpu_f->internal_name); + ini_section_set_int(cat, "cpu_speed", cpu_f->cpus[cpu].rspeed); + ini_section_set_double(cat, "cpu_multi", cpu_f->cpus[cpu].multi); if (cpu_override) - config_set_int(cat, "cpu_override", cpu_override); + ini_section_set_int(cat, "cpu_override", cpu_override); else - config_delete_var(cat, "cpu_override"); + ini_section_delete_var(cat, "cpu_override"); /* Forwards compatibility with the previous CPU model system. */ - config_delete_var(cat, "cpu_manufacturer"); - config_delete_var(cat, "cpu"); + ini_section_delete_var(cat, "cpu_manufacturer"); + ini_section_delete_var(cat, "cpu"); /* Look for a machine entry on the legacy table. */ c = 0; @@ -2554,193 +2138,193 @@ save_machine(void) /* Set legacy values if a match was found. */ if (legacy_cpu > -1) { if (legacy_mfg) - config_set_int(cat, "cpu_manufacturer", legacy_mfg); + ini_section_set_int(cat, "cpu_manufacturer", legacy_mfg); if (legacy_cpu) - config_set_int(cat, "cpu", legacy_cpu); + ini_section_set_int(cat, "cpu", legacy_cpu); } } if (cpu_waitstates == 0) - config_delete_var(cat, "cpu_waitstates"); + ini_section_delete_var(cat, "cpu_waitstates"); else - config_set_int(cat, "cpu_waitstates", cpu_waitstates); + ini_section_set_int(cat, "cpu_waitstates", cpu_waitstates); if (fpu_type == 0) - config_delete_var(cat, "fpu_type"); + ini_section_delete_var(cat, "fpu_type"); else - config_set_string(cat, "fpu_type", (char *) fpu_get_internal_name(cpu_f, cpu, fpu_type)); + ini_section_set_string(cat, "fpu_type", (char *) fpu_get_internal_name(cpu_f, cpu, fpu_type)); // Write the mem_size explicitly to the setttings in order to help managers to display it without having the actual machine table - config_delete_var(cat, "mem_size"); - config_set_int(cat, "mem_size", mem_size); + ini_section_delete_var(cat, "mem_size"); + ini_section_set_int(cat, "mem_size", mem_size); - config_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec); + ini_section_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec); if (time_sync & TIME_SYNC_ENABLED) if (time_sync & TIME_SYNC_UTC) - config_set_string(cat, "time_sync", "utc"); + ini_section_set_string(cat, "time_sync", "utc"); else - config_set_string(cat, "time_sync", "local"); + ini_section_set_string(cat, "time_sync", "local"); else - config_set_string(cat, "time_sync", "disabled"); + ini_section_set_string(cat, "time_sync", "disabled"); if (pit_mode == -1) - config_delete_var(cat, "pit_mode"); + ini_section_delete_var(cat, "pit_mode"); else - config_set_int(cat, "pit_mode", pit_mode); + ini_section_set_int(cat, "pit_mode", pit_mode); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Video" section. */ static void save_video(void) { - char *cat = "Video"; + ini_section_t cat = ini_find_or_create_section(config, "Video"); - config_set_string(cat, "gfxcard", + ini_section_set_string(cat, "gfxcard", video_get_internal_name(gfxcard)); if (voodoo_enabled == 0) - config_delete_var(cat, "voodoo"); + ini_section_delete_var(cat, "voodoo"); else - config_set_int(cat, "voodoo", voodoo_enabled); + ini_section_set_int(cat, "voodoo", voodoo_enabled); if (ibm8514_enabled == 0) - config_delete_var(cat, "8514a"); + ini_section_delete_var(cat, "8514a"); else - config_set_int(cat, "8514a", ibm8514_enabled); + ini_section_set_int(cat, "8514a", ibm8514_enabled); if (xga_enabled == 0) - config_delete_var(cat, "xga"); + ini_section_delete_var(cat, "xga"); else - config_set_int(cat, "xga", xga_enabled); + ini_section_set_int(cat, "xga", xga_enabled); if (gfxcard_2 == 0) - config_delete_var(cat, "gfxcard_2"); + ini_section_delete_var(cat, "gfxcard_2"); else - config_set_string(cat, "gfxcard_2", video_get_internal_name(gfxcard_2)); + ini_section_set_string(cat, "gfxcard_2", video_get_internal_name(gfxcard_2)); if (show_second_monitors == 1) - config_delete_var(cat, "show_second_monitors"); + ini_section_delete_var(cat, "show_second_monitors"); else - config_set_int(cat, "show_second_monitors", show_second_monitors); + ini_section_set_int(cat, "show_second_monitors", show_second_monitors); if (video_fullscreen_scale_maximized == 0) - config_delete_var(cat, "video_fullscreen_scale_maximized"); + ini_section_delete_var(cat, "video_fullscreen_scale_maximized"); else - config_set_int(cat, "video_fullscreen_scale_maximized", video_fullscreen_scale_maximized); + ini_section_set_int(cat, "video_fullscreen_scale_maximized", video_fullscreen_scale_maximized); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Input Devices" section. */ static void save_input_devices(void) { - char *cat = "Input devices"; + ini_section_t cat = ini_find_or_create_section(config, "Input devices"); char temp[512], tmp2[512]; int c, d; - config_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type)); + ini_section_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type)); if (!joystick_type) { - config_delete_var(cat, "joystick_type"); + ini_section_delete_var(cat, "joystick_type"); for (c = 0; c < 16; c++) { sprintf(tmp2, "joystick_%i_nr", c); - config_delete_var(cat, tmp2); + ini_section_delete_var(cat, tmp2); for (d = 0; d < 16; d++) { sprintf(tmp2, "joystick_%i_axis_%i", c, d); - config_delete_var(cat, tmp2); + ini_section_delete_var(cat, tmp2); } for (d = 0; d < 16; d++) { sprintf(tmp2, "joystick_%i_button_%i", c, d); - config_delete_var(cat, tmp2); + ini_section_delete_var(cat, tmp2); } for (d = 0; d < 16; d++) { sprintf(tmp2, "joystick_%i_pov_%i", c, d); - config_delete_var(cat, tmp2); + ini_section_delete_var(cat, tmp2); } } } else { - config_set_string(cat, "joystick_type", joystick_get_internal_name(joystick_type)); + ini_section_set_string(cat, "joystick_type", joystick_get_internal_name(joystick_type)); for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) { sprintf(tmp2, "joystick_%i_nr", c); - config_set_int(cat, tmp2, joystick_state[c].plat_joystick_nr); + ini_section_set_int(cat, tmp2, joystick_state[c].plat_joystick_nr); if (joystick_state[c].plat_joystick_nr) { for (d = 0; d < joystick_get_axis_count(joystick_type); d++) { sprintf(tmp2, "joystick_%i_axis_%i", c, d); - config_set_int(cat, tmp2, joystick_state[c].axis_mapping[d]); + ini_section_set_int(cat, tmp2, joystick_state[c].axis_mapping[d]); } for (d = 0; d < joystick_get_button_count(joystick_type); d++) { sprintf(tmp2, "joystick_%i_button_%i", c, d); - config_set_int(cat, tmp2, joystick_state[c].button_mapping[d]); + ini_section_set_int(cat, tmp2, joystick_state[c].button_mapping[d]); } for (d = 0; d < joystick_get_pov_count(joystick_type); d++) { sprintf(tmp2, "joystick_%i_pov_%i", c, d); sprintf(temp, "%i, %i", joystick_state[c].pov_mapping[d][0], joystick_state[c].pov_mapping[d][1]); - config_set_string(cat, tmp2, temp); + ini_section_set_string(cat, tmp2, temp); } } } } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Sound" section. */ static void save_sound(void) { - char *cat = "Sound"; + ini_section_t cat = ini_find_or_create_section(config, "Sound"); if (sound_card_current == 0) - config_delete_var(cat, "sndcard"); + ini_section_delete_var(cat, "sndcard"); else - config_set_string(cat, "sndcard", sound_card_get_internal_name(sound_card_current)); + ini_section_set_string(cat, "sndcard", sound_card_get_internal_name(sound_card_current)); if (!strcmp(midi_out_device_get_internal_name(midi_output_device_current), "none")) - config_delete_var(cat, "midi_device"); + ini_section_delete_var(cat, "midi_device"); else - config_set_string(cat, "midi_device", midi_out_device_get_internal_name(midi_output_device_current)); + ini_section_set_string(cat, "midi_device", midi_out_device_get_internal_name(midi_output_device_current)); if (!strcmp(midi_in_device_get_internal_name(midi_input_device_current), "none")) - config_delete_var(cat, "midi_in_device"); + ini_section_delete_var(cat, "midi_in_device"); else - config_set_string(cat, "midi_in_device", midi_in_device_get_internal_name(midi_input_device_current)); + ini_section_set_string(cat, "midi_in_device", midi_in_device_get_internal_name(midi_input_device_current)); if (mpu401_standalone_enable == 0) - config_delete_var(cat, "mpu401_standalone"); + ini_section_delete_var(cat, "mpu401_standalone"); else - config_set_int(cat, "mpu401_standalone", mpu401_standalone_enable); + ini_section_set_int(cat, "mpu401_standalone", mpu401_standalone_enable); if (SSI2001 == 0) - config_delete_var(cat, "ssi2001"); + ini_section_delete_var(cat, "ssi2001"); else - config_set_int(cat, "ssi2001", SSI2001); + ini_section_set_int(cat, "ssi2001", SSI2001); if (GAMEBLASTER == 0) - config_delete_var(cat, "gameblaster"); + ini_section_delete_var(cat, "gameblaster"); else - config_set_int(cat, "gameblaster", GAMEBLASTER); + ini_section_set_int(cat, "gameblaster", GAMEBLASTER); if (GUS == 0) - config_delete_var(cat, "gus"); + ini_section_delete_var(cat, "gus"); else - config_set_int(cat, "gus", GUS); + ini_section_set_int(cat, "gus", GUS); if (sound_is_float == 1) - config_delete_var(cat, "sound_type"); + ini_section_delete_var(cat, "sound_type"); else - config_set_string(cat, "sound_type", (sound_is_float == 1) ? "float" : "int16"); + ini_section_set_string(cat, "sound_type", (sound_is_float == 1) ? "float" : "int16"); - config_set_string(cat, "fm_driver", (fm_driver == FM_DRV_NUKED) ? "nuked" : "ymfm"); + ini_section_set_string(cat, "fm_driver", (fm_driver == FM_DRV_NUKED) ? "nuked" : "ymfm"); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Network" section. */ @@ -2749,77 +2333,77 @@ save_network(void) { int c = 0; char temp[512]; - char *cat = "Network"; + ini_section_t cat = ini_find_or_create_section(config, "Network"); - config_delete_var(cat, "net_type"); - config_delete_var(cat, "net_host_device"); - config_delete_var(cat, "net_card"); + ini_section_delete_var(cat, "net_type"); + ini_section_delete_var(cat, "net_host_device"); + ini_section_delete_var(cat, "net_card"); for (c = 0; c < NET_CARD_MAX; c++) { sprintf(temp, "net_%02i_card", c + 1); if (net_cards_conf[c].device_num == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, network_card_get_internal_name(net_cards_conf[c].device_num)); + ini_section_set_string(cat, temp, network_card_get_internal_name(net_cards_conf[c].device_num)); } sprintf(temp, "net_%02i_net_type", c + 1); if (net_cards_conf[c].net_type == NET_TYPE_NONE) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, + ini_section_set_string(cat, temp, (net_cards_conf[c].net_type == NET_TYPE_SLIRP) ? "slirp" : "pcap"); } sprintf(temp, "net_%02i_host_device", c + 1); if (net_cards_conf[c].host_dev_name[0] != '\0') { if (!strcmp(net_cards_conf[c].host_dev_name, "none")) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, net_cards_conf[c].host_dev_name); + ini_section_set_string(cat, temp, net_cards_conf[c].host_dev_name); } else { - /* config_set_string(cat, temp, "none"); */ - config_delete_var(cat, temp); + /* ini_section_set_string(cat, temp, "none"); */ + ini_section_delete_var(cat, temp); } sprintf(temp, "net_%02i_link", c + 1); if (net_cards_conf[c].link_state == (NET_LINK_10_HD|NET_LINK_10_FD|NET_LINK_100_HD|NET_LINK_100_FD|NET_LINK_1000_HD|NET_LINK_1000_FD)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_int(cat, temp, net_cards_conf[c].link_state); + ini_section_set_int(cat, temp, net_cards_conf[c].link_state); } } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Ports" section. */ static void save_ports(void) { - char *cat = "Ports (COM & LPT)"; + ini_section_t cat = ini_find_or_create_section(config, "Ports (COM & LPT)"); char temp[512]; int c, d; for (c = 0; c < SERIAL_MAX; c++) { sprintf(temp, "serial%d_enabled", c + 1); if (((c < 2) && com_ports[c].enabled) || ((c >= 2) && !com_ports[c].enabled)) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_int(cat, temp, com_ports[c].enabled); + ini_section_set_int(cat, temp, com_ports[c].enabled); /* sprintf(temp, "serial%d_type", c + 1); if (!com_ports[c].enabled)) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); // else -// config_set_string(cat, temp, (char *) serial_type[c]) +// ini_section_set_string(cat, temp, (char *) serial_type[c]) sprintf(temp, "serial%d_device", c + 1); if (com_ports[c].device == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, + ini_section_set_string(cat, temp, (char *) com_device_get_internal_name(com_ports[c].device)); */ } @@ -2828,108 +2412,108 @@ save_ports(void) sprintf(temp, "lpt%d_enabled", c + 1); d = (c == 0) ? 1 : 0; if (lpt_ports[c].enabled == d) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_int(cat, temp, lpt_ports[c].enabled); + ini_section_set_int(cat, temp, lpt_ports[c].enabled); sprintf(temp, "lpt%d_device", c + 1); if (lpt_ports[c].device == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, + ini_section_set_string(cat, temp, (char *) lpt_device_get_internal_name(lpt_ports[c].device)); } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Storage Controllers" section. */ static void save_storage_controllers(void) { - char *cat = "Storage controllers"; + ini_section_t cat = ini_find_or_create_section(config, "Storage controllers"); char temp[512]; int c; - config_delete_var(cat, "scsicard"); + ini_section_delete_var(cat, "scsicard"); for (c = 0; c < SCSI_BUS_MAX; c++) { sprintf(temp, "scsicard_%d", c + 1); if (scsi_card_current[c] == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, + ini_section_set_string(cat, temp, scsi_card_get_internal_name(scsi_card_current[c])); } if (fdc_type == FDC_INTERNAL) - config_delete_var(cat, "fdc"); + ini_section_delete_var(cat, "fdc"); else - config_set_string(cat, "fdc", + ini_section_set_string(cat, "fdc", fdc_card_get_internal_name(fdc_type)); - config_set_string(cat, "hdc", + ini_section_set_string(cat, "hdc", hdc_get_internal_name(hdc_current)); if (ide_ter_enabled == 0) - config_delete_var(cat, "ide_ter"); + ini_section_delete_var(cat, "ide_ter"); else - config_set_int(cat, "ide_ter", ide_ter_enabled); + ini_section_set_int(cat, "ide_ter", ide_ter_enabled); if (ide_qua_enabled == 0) - config_delete_var(cat, "ide_qua"); + ini_section_delete_var(cat, "ide_qua"); else - config_set_int(cat, "ide_qua", ide_qua_enabled); + ini_section_set_int(cat, "ide_qua", ide_qua_enabled); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); if (cassette_enable == 0) - config_delete_var(cat, "cassette_enabled"); + ini_section_delete_var(cat, "cassette_enabled"); else - config_set_int(cat, "cassette_enabled", cassette_enable); + ini_section_set_int(cat, "cassette_enabled", cassette_enable); if (strlen(cassette_fname) == 0) - config_delete_var(cat, "cassette_file"); + ini_section_delete_var(cat, "cassette_file"); else - config_set_string(cat, "cassette_file", cassette_fname); + ini_section_set_string(cat, "cassette_file", cassette_fname); if (strlen(cassette_mode) == 0) - config_delete_var(cat, "cassette_mode"); + ini_section_delete_var(cat, "cassette_mode"); else - config_set_string(cat, "cassette_mode", cassette_mode); + ini_section_set_string(cat, "cassette_mode", cassette_mode); if (cassette_pos == 0) - config_delete_var(cat, "cassette_position"); + ini_section_delete_var(cat, "cassette_position"); else - config_set_int(cat, "cassette_position", cassette_pos); + ini_section_set_int(cat, "cassette_position", cassette_pos); if (cassette_srate == 44100) - config_delete_var(cat, "cassette_srate"); + ini_section_delete_var(cat, "cassette_srate"); else - config_set_int(cat, "cassette_srate", cassette_srate); + ini_section_set_int(cat, "cassette_srate", cassette_srate); if (cassette_append == 0) - config_delete_var(cat, "cassette_append"); + ini_section_delete_var(cat, "cassette_append"); else - config_set_int(cat, "cassette_append", cassette_append); + ini_section_set_int(cat, "cassette_append", cassette_append); if (cassette_pcm == 0) - config_delete_var(cat, "cassette_pcm"); + ini_section_delete_var(cat, "cassette_pcm"); else - config_set_int(cat, "cassette_pcm", cassette_pcm); + ini_section_set_int(cat, "cassette_pcm", cassette_pcm); if (cassette_ui_writeprot == 0) - config_delete_var(cat, "cassette_writeprot"); + ini_section_delete_var(cat, "cassette_writeprot"); else - config_set_int(cat, "cassette_writeprot", cassette_ui_writeprot); + ini_section_set_int(cat, "cassette_writeprot", cassette_ui_writeprot); for (c = 0; c < 2; c++) { sprintf(temp, "cartridge_%02i_fn", c + 1); if (strlen(cart_fns[c]) == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, cart_fns[c]); + ini_section_set_string(cat, temp, cart_fns[c]); } } @@ -2937,43 +2521,43 @@ save_storage_controllers(void) static void save_other_peripherals(void) { - char *cat = "Other peripherals"; + ini_section_t cat = ini_find_or_create_section(config, "Other peripherals"); char temp[512]; int c; if (bugger_enabled == 0) - config_delete_var(cat, "bugger_enabled"); + ini_section_delete_var(cat, "bugger_enabled"); else - config_set_int(cat, "bugger_enabled", bugger_enabled); + ini_section_set_int(cat, "bugger_enabled", bugger_enabled); if (postcard_enabled == 0) - config_delete_var(cat, "postcard_enabled"); + ini_section_delete_var(cat, "postcard_enabled"); else - config_set_int(cat, "postcard_enabled", postcard_enabled); + ini_section_set_int(cat, "postcard_enabled", postcard_enabled); for (c = 0; c < ISAMEM_MAX; c++) { sprintf(temp, "isamem%d_type", c); if (isamem_type[c] == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, + ini_section_set_string(cat, temp, (char *) isamem_get_internal_name(isamem_type[c])); } if (isartc_type == 0) - config_delete_var(cat, "isartc_type"); + ini_section_delete_var(cat, "isartc_type"); else - config_set_string(cat, "isartc_type", + ini_section_set_string(cat, "isartc_type", isartc_get_internal_name(isartc_type)); - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Hard Disks" section. */ static void save_hard_disks(void) { - char *cat = "Hard disks"; + ini_section_t cat = ini_find_or_create_section(config, "Hard disks"); char temp[32], tmp2[512]; char *p; int c; @@ -2985,268 +2569,268 @@ save_hard_disks(void) p = hdd_bus_to_string(hdd[c].bus, 0); sprintf(tmp2, "%u, %u, %u, %i, %s", hdd[c].spt, hdd[c].hpc, hdd[c].tracks, hdd[c].wp, p); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } else { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } sprintf(temp, "hdd_%02i_mfm_channel", c + 1); if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_MFM)) - config_set_int(cat, temp, hdd[c].mfm_channel); + ini_section_set_int(cat, temp, hdd[c].mfm_channel); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_xta_channel", c + 1); if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_XTA)) - config_set_int(cat, temp, hdd[c].xta_channel); + ini_section_set_int(cat, temp, hdd[c].xta_channel); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_esdi_channel", c + 1); if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_ESDI)) - config_set_int(cat, temp, hdd[c].esdi_channel); + ini_section_set_int(cat, temp, hdd[c].esdi_channel); else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_ide_channel", c + 1); if (!hdd_is_valid(c) || (hdd[c].bus != HDD_BUS_IDE)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { sprintf(tmp2, "%01u:%01u", hdd[c].ide_channel >> 1, hdd[c].ide_channel & 1); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "hdd_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_scsi_location", c + 1); if (hdd[c].bus != HDD_BUS_SCSI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%02u", hdd[c].scsi_id >> 4, hdd[c].scsi_id & 15); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "hdd_%02i_fn", c + 1); if (hdd_is_valid(c) && (strlen(hdd[c].fn) != 0)) { path_normalize(hdd[c].fn); if (!strnicmp(hdd[c].fn, usr_path, strlen(usr_path))) - config_set_string(cat, temp, &hdd[c].fn[strlen(usr_path)]); + ini_section_set_string(cat, temp, &hdd[c].fn[strlen(usr_path)]); else - config_set_string(cat, temp, hdd[c].fn); + ini_section_set_string(cat, temp, hdd[c].fn); } else - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "hdd_%02i_speed", c + 1); if (!hdd_is_valid(c) || (hdd[c].bus != HDD_BUS_IDE && hdd[c].bus != HDD_BUS_ESDI)) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, hdd_preset_get_internal_name(hdd[c].speed_preset)); + ini_section_set_string(cat, temp, hdd_preset_get_internal_name(hdd[c].speed_preset)); } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Floppy Drives" section. */ static void save_floppy_and_cdrom_drives(void) { - char *cat = "Floppy and CD-ROM drives"; + ini_section_t cat = ini_find_or_create_section(config, "Floppy and CD-ROM drives"); char temp[512], tmp2[512]; int c; for (c = 0; c < FDD_NUM; c++) { sprintf(temp, "fdd_%02i_type", c + 1); if (fdd_get_type(c) == ((c < 2) ? 2 : 0)) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_string(cat, temp, + ini_section_set_string(cat, temp, fdd_get_internal_name(fdd_get_type(c))); sprintf(temp, "fdd_%02i_fn", c + 1); if (strlen(floppyfns[c]) == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); ui_writeprot[c] = 0; sprintf(temp, "fdd_%02i_writeprot", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, floppyfns[c]); + ini_section_set_string(cat, temp, floppyfns[c]); } sprintf(temp, "fdd_%02i_writeprot", c + 1); if (ui_writeprot[c] == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_int(cat, temp, ui_writeprot[c]); + ini_section_set_int(cat, temp, ui_writeprot[c]); sprintf(temp, "fdd_%02i_turbo", c + 1); if (fdd_get_turbo(c) == 0) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_int(cat, temp, fdd_get_turbo(c)); + ini_section_set_int(cat, temp, fdd_get_turbo(c)); sprintf(temp, "fdd_%02i_check_bpb", c + 1); if (fdd_get_check_bpb(c) == 1) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else - config_set_int(cat, temp, fdd_get_check_bpb(c)); + ini_section_set_int(cat, temp, fdd_get_check_bpb(c)); } for (c = 0; c < CDROM_NUM; c++) { sprintf(temp, "cdrom_%02i_host_drive", c + 1); if ((cdrom[c].bus_type == 0) || (cdrom[c].host_drive != 200)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_int(cat, temp, cdrom[c].host_drive); + ini_section_set_int(cat, temp, cdrom[c].host_drive); } sprintf(temp, "cdrom_%02i_speed", c + 1); if ((cdrom[c].bus_type == 0) || (cdrom[c].speed == 8)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_int(cat, temp, cdrom[c].speed); + ini_section_set_int(cat, temp, cdrom[c].speed); } sprintf(temp, "cdrom_%02i_parameters", c + 1); if (cdrom[c].bus_type == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { sprintf(tmp2, "%u, %s", cdrom[c].sound_on, hdd_bus_to_string(cdrom[c].bus_type, 1)); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "cdrom_%02i_ide_channel", c + 1); if (cdrom[c].bus_type != CDROM_BUS_ATAPI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%01u", cdrom[c].ide_channel >> 1, cdrom[c].ide_channel & 1); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_scsi_location", c + 1); if (cdrom[c].bus_type != CDROM_BUS_SCSI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%02u", cdrom[c].scsi_device_id >> 4, cdrom[c].scsi_device_id & 15); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "cdrom_%02i_image_path", c + 1); if ((cdrom[c].bus_type == 0) || (strlen(cdrom[c].image_path) == 0)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, cdrom[c].image_path); + ini_section_set_string(cat, temp, cdrom[c].image_path); } for (int i = 0; i < MAX_PREV_IMAGES; i++) { sprintf(temp, "cdrom_%02i_image_history_%02i", c + 1, i + 1); if((cdrom[c].image_history[i] == 0) || strlen(cdrom[c].image_history[i]) == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, cdrom[c].image_history[i]); + ini_section_set_string(cat, temp, cdrom[c].image_history[i]); } } } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } /* Save "Other Removable Devices" section. */ static void save_other_removable_devices(void) { - char *cat = "Other removable devices"; + ini_section_t cat = ini_find_or_create_section(config, "Other removable devices"); char temp[512], tmp2[512]; int c; for (c = 0; c < ZIP_NUM; c++) { sprintf(temp, "zip_%02i_parameters", c + 1); if (zip_drives[c].bus_type == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { sprintf(tmp2, "%u, %s", zip_drives[c].is_250, hdd_bus_to_string(zip_drives[c].bus_type, 1)); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "zip_%02i_ide_channel", c + 1); if (zip_drives[c].bus_type != ZIP_BUS_ATAPI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%01u", zip_drives[c].ide_channel >> 1, zip_drives[c].ide_channel & 1); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "zip_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "zip_%02i_scsi_location", c + 1); if (zip_drives[c].bus_type != ZIP_BUS_SCSI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%02u", zip_drives[c].scsi_device_id >> 4, zip_drives[c].scsi_device_id & 15); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "zip_%02i_image_path", c + 1); if ((zip_drives[c].bus_type == 0) || (strlen(zip_drives[c].image_path) == 0)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, zip_drives[c].image_path); + ini_section_set_string(cat, temp, zip_drives[c].image_path); } } for (c = 0; c < MO_NUM; c++) { sprintf(temp, "mo_%02i_parameters", c + 1); if (mo_drives[c].bus_type == 0) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { sprintf(tmp2, "%u, %s", mo_drives[c].type, hdd_bus_to_string(mo_drives[c].bus_type, 1)); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "mo_%02i_ide_channel", c + 1); if (mo_drives[c].bus_type != MO_BUS_ATAPI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%01u", mo_drives[c].ide_channel >> 1, mo_drives[c].ide_channel & 1); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "mo_%02i_scsi_id", c + 1); - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); sprintf(temp, "mo_%02i_scsi_location", c + 1); if (mo_drives[c].bus_type != MO_BUS_SCSI) - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); else { sprintf(tmp2, "%01u:%02u", mo_drives[c].scsi_device_id >> 4, mo_drives[c].scsi_device_id & 15); - config_set_string(cat, temp, tmp2); + ini_section_set_string(cat, temp, tmp2); } sprintf(temp, "mo_%02i_image_path", c + 1); if ((mo_drives[c].bus_type == 0) || (strlen(mo_drives[c].image_path) == 0)) { - config_delete_var(cat, temp); + ini_section_delete_var(cat, temp); } else { - config_set_string(cat, temp, mo_drives[c].image_path); + ini_section_set_string(cat, temp, mo_drives[c].image_path); } } - delete_section_if_empty(cat); + ini_delete_section_if_empty(config, cat); } void @@ -3269,317 +2853,11 @@ config_save(void) save_other_removable_devices(); /* Other removable devices */ save_other_peripherals(); /* Other peripherals */ - config_write(cfg_path); + ini_write(config, cfg_path); } -void -config_dump(void) +ini_t +config_get_ini(void) { - section_t *sec; - - sec = (section_t *) config_head.next; - while (sec != NULL) { - entry_t *ent; - - if (sec->name[0]) - config_log("[%s]\n", sec->name); - - ent = (entry_t *) sec->entry_head.next; - while (ent != NULL) { - config_log("%s = %s\n", ent->name, ent->data); - - ent = (entry_t *) ent->list.next; - } - - sec = (section_t *) sec->list.next; - } -} - -void -config_delete_var(char *head, char *name) -{ - section_t *section; - entry_t *entry; - - section = find_section(head); - if (section == NULL) - return; - - entry = find_entry(section, name); - if (entry != NULL) { - list_delete(&entry->list, §ion->entry_head); - free(entry); - } -} - -int -config_get_int(char *head, char *name, int def) -{ - section_t *section; - entry_t *entry; - int value; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - sscanf(entry->data, "%i", &value); - - return (value); -} - -double -config_get_double(char *head, char *name, double def) -{ - section_t *section; - entry_t *entry; - double value; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - sscanf(entry->data, "%lg", &value); - - return (value); -} - -int -config_get_hex16(char *head, char *name, int def) -{ - section_t *section; - entry_t *entry; - unsigned int value; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - sscanf(entry->data, "%04X", &value); - - return (value); -} - -int -config_get_hex20(char *head, char *name, int def) -{ - section_t *section; - entry_t *entry; - unsigned int value; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - sscanf(entry->data, "%05X", &value); - - return (value); -} - -int -config_get_mac(char *head, char *name, int def) -{ - section_t *section; - entry_t *entry; - unsigned int val0 = 0, val1 = 0, val2 = 0; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - sscanf(entry->data, "%02x:%02x:%02x", &val0, &val1, &val2); - - return ((val0 << 16) + (val1 << 8) + val2); -} - -char * -config_get_string(char *head, char *name, char *def) -{ - section_t *section; - entry_t *entry; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - return (entry->data); -} - -wchar_t * -config_get_wstring(char *head, char *name, wchar_t *def) -{ - section_t *section; - entry_t *entry; - - section = find_section(head); - if (section == NULL) - return (def); - - entry = find_entry(section, name); - if (entry == NULL) - return (def); - - return (entry->wdata); -} - -void -config_set_int(char *head, char *name, int val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - sprintf(ent->data, "%i", val); - mbstowcs(ent->wdata, ent->data, 512); -} - -void -config_set_double(char *head, char *name, double val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - sprintf(ent->data, "%lg", val); - mbstowcs(ent->wdata, ent->data, 512); -} - -void -config_set_hex16(char *head, char *name, int val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - sprintf(ent->data, "%04X", val); - mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); -} - -void -config_set_hex20(char *head, char *name, int val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - sprintf(ent->data, "%05X", val); - mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); -} - -void -config_set_mac(char *head, char *name, int val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - sprintf(ent->data, "%02x:%02x:%02x", - (val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff); - mbstowcs(ent->wdata, ent->data, 512); -} - -void -config_set_string(char *head, char *name, char *val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - if ((strlen(val) + 1) <= sizeof(ent->data)) - memcpy(ent->data, val, strlen(val) + 1); - else - memcpy(ent->data, val, sizeof(ent->data)); -#ifdef _WIN32 /* Make sure the string is converted from UTF-8 rather than a legacy codepage */ - mbstoc16s(ent->wdata, ent->data, sizeof_w(ent->wdata)); -#else - mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); -#endif -} - -void -config_set_wstring(char *head, char *name, wchar_t *val) -{ - section_t *section; - entry_t *ent; - - section = find_section(head); - if (section == NULL) - section = create_section(head); - - ent = find_entry(section, name); - if (ent == NULL) - ent = create_entry(section, name); - - memcpy(ent->wdata, val, sizeof_w(ent->wdata)); -#ifdef _WIN32 /* Make sure the string is converted to UTF-8 rather than a legacy codepage */ - c16stombs(ent->data, ent->wdata, sizeof(ent->data)); -#else - wcstombs(ent->data, ent->wdata, sizeof(ent->data)); -#endif + return config; } diff --git a/src/device.c b/src/device.c index c69acaad0..0eace721e 100644 --- a/src/device.c +++ b/src/device.c @@ -45,6 +45,7 @@ #include #define HAVE_STDARG_H #include <86box/86box.h> +#include <86box/ini.h> #include <86box/config.h> #include <86box/device.h> #include <86box/machine.h> diff --git a/src/include/86box/config.h b/src/include/86box/config.h index 86bf39dce..1cddddaab 100644 --- a/src/include/86box/config.h +++ b/src/include/86box/config.h @@ -136,27 +136,33 @@ typedef struct { extern void config_load(void); extern void config_save(void); -extern void config_write(char *fn); -extern void config_dump(void); -extern void config_delete_var(char *head, char *name); -extern int config_get_int(char *head, char *name, int def); -extern double config_get_double(char *head, char *name, double def); -extern int config_get_hex16(char *head, char *name, int def); -extern int config_get_hex20(char *head, char *name, int def); -extern int config_get_mac(char *head, char *name, int def); -extern char *config_get_string(char *head, char *name, char *def); -extern wchar_t *config_get_wstring(char *head, char *name, wchar_t *def); -extern void config_set_int(char *head, char *name, int val); -extern void config_set_double(char *head, char *name, double val); -extern void config_set_hex16(char *head, char *name, int val); -extern void config_set_hex20(char *head, char *name, int val); -extern void config_set_mac(char *head, char *name, int val); -extern void config_set_string(char *head, char *name, char *val); -extern void config_set_wstring(char *head, char *name, wchar_t *val); +#ifdef EMU_INI_H +extern ini_t config_get_ini(void); +#else +extern void *config_get_ini(void); +#endif -extern void *config_find_section(char *name); -extern void config_rename_section(void *priv, char *name); +#define config_delete_var(head, name) ini_delete_var(config_get_ini(), head, name) + +#define config_get_int(head, name, def) ini_get_int(config_get_ini(), head, name, def) +#define config_get_double(head, name, def) ini_get_double(config_get_ini(), head, name, def) +#define config_get_hex16(head, name, def) ini_get_hex16(config_get_ini(), head, name, def) +#define config_get_hex20(head, name, def) ini_get_hex20(config_get_ini(), head, name, def) +#define config_get_mac(head, name, def) ini_get_mac(config_get_ini(), head, name, def) +#define config_get_string(head, name, def) ini_get_string(config_get_ini(), head, name, def) +#define config_get_wstring(head, name, def) ini_get_wstring(config_get_ini(), head, name, def) + +#define config_set_int(head, name, val) ini_set_int(config_get_ini(), head, name, val) +#define config_set_double(head, name, val) ini_set_double(config_get_ini(), head, name, val) +#define config_set_hex16(head, name, val) ini_set_hex16(config_get_ini(), head, name, val) +#define config_set_hex20(head, name, val) ini_set_hex20(config_get_ini(), head, name, val) +#define config_set_mac(head, name, val) ini_set_mac(config_get_ini(), head, name, val) +#define config_set_string(head, name, val) ini_set_string(config_get_ini(), head, name, val) +#define config_set_wstring(head, name, val) ini_set_wstring(config_get_ini(), head, name, val) + +#define config_find_section(name) ini_find_section(config_get_ini(), name) +#define config_rename_section ini_rename_section #ifdef __cplusplus } diff --git a/src/include/86box/ini.h b/src/include/86box/ini.h new file mode 100644 index 000000000..43b71f357 --- /dev/null +++ b/src/include/86box/ini.h @@ -0,0 +1,81 @@ +/* + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. + * + * This file is part of the 86Box distribution. + * + * Configuration file handler header. + * + * + * + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, + * Overdoze, + * + * Copyright 2008-2017 Sarah Walker. + * Copyright 2016,2017 Miran Grca. + * + */ +#ifndef EMU_INI_H +#define EMU_INI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *ini_t; +typedef void *ini_section_t; + +extern ini_t ini_new(void); +extern ini_t ini_read(char *fn); +extern void ini_write(ini_t ini, char *fn); +extern void ini_dump(ini_t ini); +extern void ini_close(ini_t ini); + +extern void ini_section_delete_var(ini_section_t section, char *name); +extern int ini_section_get_int(ini_section_t section, char *name, int def); +extern double ini_section_get_double(ini_section_t section, char *name, double def); +extern int ini_section_get_hex16(ini_section_t section, char *name, int def); +extern int ini_section_get_hex20(ini_section_t section, char *name, int def); +extern int ini_section_get_mac(ini_section_t section, char *name, int def); +extern char *ini_section_get_string(ini_section_t section, char *name, char *def); +extern wchar_t *ini_section_get_wstring(ini_section_t section, char *name, wchar_t *def); +extern void ini_section_set_int(ini_section_t section, char *name, int val); +extern void ini_section_set_double(ini_section_t section, char *name, double val); +extern void ini_section_set_hex16(ini_section_t section, char *name, int val); +extern void ini_section_set_hex20(ini_section_t section, char *name, int val); +extern void ini_section_set_mac(ini_section_t section, char *name, int val); +extern void ini_section_set_string(ini_section_t section, char *name, char *val); +extern void ini_section_set_wstring(ini_section_t section, char *name, wchar_t *val); + +#define ini_delete_var(ini, head, name) ini_section_delete_var(ini_find_section(ini, head), name) + +#define ini_get_int(ini, head, name, def) ini_section_get_int(ini_find_section(ini, head), name, def) +#define ini_get_double(ini, head, name, def) ini_section_get_double(ini_find_section(ini, head), name, def) +#define ini_get_hex16(ini, head, name, def) ini_section_get_hex16(ini_find_section(ini, head), name, def) +#define ini_get_hex20(ini, head, name, def) ini_section_get_hex20(ini_find_section(ini, head), name, def) +#define ini_get_mac(ini, head, name, def) ini_section_get_mac(ini_find_section(ini, head), name, def) +#define ini_get_string(ini, head, name, def) ini_section_get_string(ini_find_section(ini, head), name, def) +#define ini_get_wstring(ini, head, name, def) ini_section_get_wstring(ini_find_section(ini, head), name, def) + +#define ini_set_int(ini, head, name, val) ini_section_set_int(ini_find_or_create_section(ini, head), name, val) +#define ini_set_double(ini, head, name, val) ini_section_set_double(ini_find_or_create_section(ini, head), name, val) +#define ini_set_hex16(ini, head, name, val) ini_section_set_hex16(ini_find_or_create_section(ini, head), name, val) +#define ini_set_hex20(ini, head, name, val) ini_section_set_hex20(ini_find_or_create_section(ini, head), name, val) +#define ini_set_mac(ini, head, name, val) ini_section_set_mac(ini_find_or_create_section(ini, head), name, val) +#define ini_set_string(ini, head, name, val) ini_section_set_string(ini_find_or_create_section(ini, head), name, val) +#define ini_set_wstring(ini, head, name, val) ini_section_set_wstring(ini_find_or_create_section(ini, head), name, val) + +extern ini_section_t ini_find_section(ini_t ini, char *name); +extern ini_section_t ini_find_or_create_section(ini_t ini, char *name); +extern void ini_rename_section(ini_section_t section, char *name); +extern void ini_delete_section_if_empty(ini_t ini, ini_section_t section); + +#ifdef __cplusplus +} +#endif + +#endif \ No newline at end of file diff --git a/src/ini.c b/src/ini.c new file mode 100644 index 000000000..167d3c67e --- /dev/null +++ b/src/ini.c @@ -0,0 +1,795 @@ +/* + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. + * + * This file is part of the 86Box distribution. + * + * Configuration file handler. + * + * + * + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, + * Overdoze, + * David Hrdlička, + * + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. + * Copyright 2017-2019 Fred N. van Kempen. + * Copyright 2018,2019 David Hrdlička. + * + * NOTE: Forcing config files to be in Unicode encoding breaks + * it on Windows XP, and possibly also Vista. Use the + * -DANSI_CFG for use on these systems. + */ + +#include +#include +#include +#include +#include +#include +#include +#define HAVE_STDARG_H +#include <86box/86box.h> +#include <86box/ini.h> +#include <86box/plat.h> + +typedef struct _list_ { + struct _list_ *next; +} list_t; + +typedef struct { + list_t list; + + char name[128]; + + list_t entry_head; +} section_t; + +typedef struct { + list_t list; + + char name[128]; + char data[512]; + wchar_t wdata[512]; +} entry_t; + +#define list_add(new, head) \ + { \ + list_t *next = head; \ + \ + while (next->next != NULL) \ + next = next->next; \ + \ + (next)->next = new; \ + (new)->next = NULL; \ + } + +#define list_delete(old, head) \ + { \ + list_t *next = head; \ + \ + while ((next)->next != old) { \ + next = (next)->next; \ + } \ + \ + (next)->next = (old)->next; \ + if ((next) == (head)) \ + (head)->next = (old)->next; \ + } + +#ifdef ENABLE_INI_LOG +int ini_do_log = ENABLE_INI_LOG; + +static void +ini_log(const char *fmt, ...) +{ + va_list ap; + + if (ini_do_log) { + va_start(ap, fmt); + pclog_ex(fmt, ap); + va_end(ap); + } +} +#else +# define ini_log(fmt, ...) +#endif + +static section_t * +find_section(list_t *head, char *name) +{ + section_t *sec = (section_t *) head->next; + char blank[] = ""; + + if (name == NULL) + name = blank; + + while (sec != NULL) { + if (!strncmp(sec->name, name, sizeof(sec->name))) + return (sec); + + sec = (section_t *) sec->list.next; + } + + return NULL; +} + +ini_section_t +ini_find_section(ini_t ini, char *name) +{ + if (ini == NULL) + return NULL; + + return (ini_section_t) find_section((list_t *) ini, name); +} + +void +ini_rename_section(ini_section_t section, char *name) +{ + section_t *sec = (section_t *) section; + + if (sec == NULL) + return; + + memset(sec->name, 0x00, sizeof(sec->name)); + memcpy(sec->name, name, MIN(128, strlen(name) + 1)); +} + +static entry_t * +find_entry(section_t *section, char *name) +{ + entry_t *ent; + + ent = (entry_t *) section->entry_head.next; + + while (ent != NULL) { + if (!strncmp(ent->name, name, sizeof(ent->name))) + return (ent); + + ent = (entry_t *) ent->list.next; + } + + return (NULL); +} + +static int +entries_num(section_t *section) +{ + entry_t *ent; + int i = 0; + + ent = (entry_t *) section->entry_head.next; + + while (ent != NULL) { + if (strlen(ent->name) > 0) + i++; + + ent = (entry_t *) ent->list.next; + } + + return (i); +} + +static void +delete_section_if_empty(list_t *head, section_t *section) +{ + if (section == NULL) + return; + + if (entries_num(section) == 0) { + list_delete(§ion->list, head); + free(section); + } +} + +void +ini_delete_section_if_empty(ini_t ini, ini_section_t section) +{ + if (ini == NULL || section == NULL) + return; + + delete_section_if_empty((list_t *) ini, (section_t *) section); +} + +static section_t * +create_section(list_t *head, char *name) +{ + section_t *ns = malloc(sizeof(section_t)); + + memset(ns, 0x00, sizeof(section_t)); + memcpy(ns->name, name, strlen(name) + 1); + list_add(&ns->list, head); + + return (ns); +} + +ini_section_t +ini_find_or_create_section(ini_t ini, char *name) +{ + if (ini == NULL) + return NULL; + + section_t *section = find_section((list_t *) ini, name); + if (section == NULL) + section = create_section((list_t *) ini, name); + + return (ini_section_t) section; +} + +static entry_t * +create_entry(section_t *section, char *name) +{ + entry_t *ne = malloc(sizeof(entry_t)); + + memset(ne, 0x00, sizeof(entry_t)); + memcpy(ne->name, name, strlen(name) + 1); + list_add(&ne->list, §ion->entry_head); + + return (ne); +} + +static void +ini_close(ini_t ini) +{ + section_t *sec, *ns; + entry_t *ent; + list_t *list = (list_t *) ini; + + if (list == NULL) + return; + + sec = (section_t *) list->next; + while (sec != NULL) { + ns = (section_t *) sec->list.next; + ent = (entry_t *) sec->entry_head.next; + + while (ent != NULL) { + entry_t *nent = (entry_t *) ent->list.next; + + free(ent); + ent = nent; + } + + free(sec); + sec = ns; + } + + free(list); +} + +static int +ini_detect_bom(char *fn) +{ + FILE *f; + unsigned char bom[4] = { 0, 0, 0, 0 }; + +#if defined(ANSI_CFG) || !defined(_WIN32) + f = plat_fopen(fn, "rt"); +#else + f = plat_fopen(fn, "rt, ccs=UTF-8"); +#endif + if (f == NULL) + return (0); + fread(bom, 1, 3, f); + if (bom[0] == 0xEF && bom[1] == 0xBB && bom[2] == 0xBF) { + fclose(f); + return 1; + } + fclose(f); + return 0; +} + +#ifdef __HAIKU__ +/* Local version of fgetws to avoid a crash */ +static wchar_t * +ini_fgetws(wchar_t *str, int count, FILE *stream) +{ + int i = 0; + if (feof(stream)) + return NULL; + for (i = 0; i < count; i++) { + wint_t curChar = fgetwc(stream); + if (curChar == WEOF) { + if (i + 1 < count) + str[i + 1] = 0; + return feof(stream) ? str : NULL; + } + str[i] = curChar; + if (curChar == '\n') + break; + } + if (i + 1 < count) + str[i + 1] = 0; + return str; +} +#endif + +/* Read and parse the configuration file into memory. */ +ini_t +ini_read(char *fn) +{ + char sname[128], ename[128]; + wchar_t buff[1024]; + section_t *sec, *ns; + entry_t *ne; + int c, d, bom; + FILE *f; + list_t *head; + + bom = ini_detect_bom(fn); +#if defined(ANSI_CFG) || !defined(_WIN32) + f = plat_fopen(fn, "rt"); +#else + f = plat_fopen(fn, "rt, ccs=UTF-8"); +#endif + if (f == NULL) + return NULL; + + head = malloc(sizeof(list_t)); + memset(head, 0x00, sizeof(list_t)); + + sec = malloc(sizeof(section_t)); + memset(sec, 0x00, sizeof(section_t)); + + list_add(&sec->list, head); + if (bom) + fseek(f, 3, SEEK_SET); + + while (1) { + memset(buff, 0x00, sizeof(buff)); +#ifdef __HAIKU__ + ini_fgetws(buff, sizeof_w(buff), f); +#else + (void) !fgetws(buff, sizeof_w(buff), f); +#endif + if (feof(f)) + break; + + /* Make sure there are no stray newlines or hard-returns in there. */ + if (wcslen(buff) > 0) + if (buff[wcslen(buff) - 1] == L'\n') + buff[wcslen(buff) - 1] = L'\0'; + if (wcslen(buff) > 0) + if (buff[wcslen(buff) - 1] == L'\r') + buff[wcslen(buff) - 1] = L'\0'; + + /* Skip any leading whitespace. */ + c = 0; + while ((buff[c] == L' ') || (buff[c] == L'\t')) + c++; + + /* Skip empty lines. */ + if (buff[c] == L'\0') + continue; + + /* Skip lines that (only) have a comment. */ + if ((buff[c] == L'#') || (buff[c] == L';')) + continue; + + if (buff[c] == L'[') { /*Section*/ + c++; + d = 0; + while (buff[c] != L']' && buff[c]) + (void) !wctomb(&(sname[d++]), buff[c++]); + sname[d] = L'\0'; + + /* Is the section name properly terminated? */ + if (buff[c] != L']') + continue; + + /* Create a new section and insert it. */ + ns = malloc(sizeof(section_t)); + memset(ns, 0x00, sizeof(section_t)); + memcpy(ns->name, sname, 128); + list_add(&ns->list, head); + + /* New section is now the current one. */ + sec = ns; + continue; + } + + /* Get the variable name. */ + d = 0; + while ((buff[c] != L'=') && (buff[c] != L' ') && buff[c]) + (void) !wctomb(&(ename[d++]), buff[c++]); + ename[d] = L'\0'; + + /* Skip incomplete lines. */ + if (buff[c] == L'\0') + continue; + + /* Look for =, skip whitespace. */ + while ((buff[c] == L'=' || buff[c] == L' ') && buff[c]) + c++; + + /* Skip incomplete lines. */ + if (buff[c] == L'\0') + continue; + + /* This is where the value part starts. */ + d = c; + + /* Allocate a new variable entry.. */ + ne = malloc(sizeof(entry_t)); + memset(ne, 0x00, sizeof(entry_t)); + memcpy(ne->name, ename, 128); + wcsncpy(ne->wdata, &buff[d], sizeof_w(ne->wdata) - 1); + ne->wdata[sizeof_w(ne->wdata) - 1] = L'\0'; +#ifdef _WIN32 /* Make sure the string is converted to UTF-8 rather than a legacy codepage */ + c16stombs(ne->data, ne->wdata, sizeof(ne->data)); +#else + wcstombs(ne->data, ne->wdata, sizeof(ne->data)); +#endif + ne->data[sizeof(ne->data) - 1] = '\0'; + + /* .. and insert it. */ + list_add(&ne->list, &sec->entry_head); + } + + (void) fclose(f); + + return (ini_t) head; +} + +/* Write the in-memory configuration to disk. */ +void +ini_write(ini_t ini, char *fn) +{ + wchar_t wtemp[512]; + list_t *list = (list_t *) ini; + section_t *sec; + FILE *f; + int fl = 0; + + if (list == NULL) + return; + + sec = (section_t *) list->next; + +#if defined(ANSI_CFG) || !defined(_WIN32) + f = plat_fopen(fn, "wt"); +#else + f = plat_fopen(fn, "wt, ccs=UTF-8"); +#endif + if (f == NULL) + return; + + while (sec != NULL) { + entry_t *ent; + + if (sec->name[0]) { + mbstowcs(wtemp, sec->name, strlen(sec->name) + 1); + if (fl) + fwprintf(f, L"\n[%ls]\n", wtemp); + else + fwprintf(f, L"[%ls]\n", wtemp); + fl++; + } + + ent = (entry_t *) sec->entry_head.next; + while (ent != NULL) { + if (ent->name[0] != '\0') { + mbstowcs(wtemp, ent->name, 128); + if (ent->wdata[0] == L'\0') + fwprintf(f, L"%ls = \n", wtemp); + else + fwprintf(f, L"%ls = %ls\n", wtemp, ent->wdata); + fl++; + } + + ent = (entry_t *) ent->list.next; + } + + sec = (section_t *) sec->list.next; + } + + (void) fclose(f); +} + +ini_t +ini_new() +{ + ini_t ini = malloc(sizeof(list_t)); + memset(ini, 0, sizeof(list_t)); + return ini; +} + +void +ini_dump(ini_t ini) +{ + section_t *sec = (section_t *) ini; + while (sec != NULL) { + entry_t *ent; + + if (sec->name[0]) + ini_log("[%s]\n", sec->name); + + ent = (entry_t *) sec->entry_head.next; + while (ent != NULL) { + ini_log("%s = %s\n", ent->name, ent->data); + + ent = (entry_t *) ent->list.next; + } + + sec = (section_t *) sec->list.next; + } +} + +void +ini_section_delete_var(ini_section_t self, char *name) +{ + section_t *section = (section_t *) self; + entry_t *entry; + + if (section == NULL) + return; + + entry = find_entry(section, name); + if (entry != NULL) { + list_delete(&entry->list, §ion->entry_head); + free(entry); + } +} + +int +ini_section_get_int(ini_section_t self, char *name, int def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + int value; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + sscanf(entry->data, "%i", &value); + + return (value); +} + +double +ini_section_get_double(ini_section_t self, char *name, double def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + double value; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + sscanf(entry->data, "%lg", &value); + + return (value); +} + +int +ini_section_get_hex16(ini_section_t self, char *name, int def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + unsigned int value; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + sscanf(entry->data, "%04X", &value); + + return (value); +} + +int +ini_section_get_hex20(ini_section_t self, char *name, int def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + unsigned int value; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + sscanf(entry->data, "%05X", &value); + + return (value); +} + +int +ini_section_get_mac(ini_section_t self, char *name, int def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + unsigned int val0 = 0, val1 = 0, val2 = 0; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + sscanf(entry->data, "%02x:%02x:%02x", &val0, &val1, &val2); + + return ((val0 << 16) + (val1 << 8) + val2); +} + +char * +ini_section_get_string(ini_section_t self, char *name, char *def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + return (entry->data); +} + +wchar_t * +ini_section_get_wstring(ini_section_t self, char *name, wchar_t *def) +{ + section_t *section = (section_t *) self; + entry_t *entry; + + if (section == NULL) + return (def); + + entry = find_entry(section, name); + if (entry == NULL) + return (def); + + return (entry->wdata); +} + +void +ini_section_set_int(ini_section_t self, char *name, int val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + sprintf(ent->data, "%i", val); + mbstowcs(ent->wdata, ent->data, 512); +} + +void +ini_section_set_double(ini_section_t self, char *name, double val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + sprintf(ent->data, "%lg", val); + mbstowcs(ent->wdata, ent->data, 512); +} + +void +ini_section_set_hex16(ini_section_t self, char *name, int val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + sprintf(ent->data, "%04X", val); + mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); +} + +void +ini_section_set_hex20(ini_section_t self, char *name, int val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + sprintf(ent->data, "%05X", val); + mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); +} + +void +ini_section_set_mac(ini_section_t self, char *name, int val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + sprintf(ent->data, "%02x:%02x:%02x", + (val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff); + mbstowcs(ent->wdata, ent->data, 512); +} + +void +ini_section_set_string(ini_section_t self, char *name, char *val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + if ((strlen(val) + 1) <= sizeof(ent->data)) + memcpy(ent->data, val, strlen(val) + 1); + else + memcpy(ent->data, val, sizeof(ent->data)); +#ifdef _WIN32 /* Make sure the string is converted from UTF-8 rather than a legacy codepage */ + mbstoc16s(ent->wdata, ent->data, sizeof_w(ent->wdata)); +#else + mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata)); +#endif +} + +void +ini_section_set_wstring(ini_section_t self, char *name, wchar_t *val) +{ + section_t *section = (section_t *) self; + entry_t *ent; + + if (section == NULL) + return; + + ent = find_entry(section, name); + if (ent == NULL) + ent = create_entry(section, name); + + memcpy(ent->wdata, val, sizeof_w(ent->wdata)); +#ifdef _WIN32 /* Make sure the string is converted to UTF-8 rather than a legacy codepage */ + c16stombs(ent->data, ent->wdata, sizeof(ent->data)); +#else + wcstombs(ent->data, ent->wdata, sizeof(ent->data)); +#endif +} diff --git a/src/network/net_slirp.c b/src/network/net_slirp.c index 24b75e208..0bbd534b3 100644 --- a/src/network/net_slirp.c +++ b/src/network/net_slirp.c @@ -35,6 +35,7 @@ #include <86box/timer.h> #include <86box/network.h> #include <86box/machine.h> +#include <86box/ini.h> #include <86box/config.h> #include <86box/video.h> #ifdef _WIN32 diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index 6ebc59b5d..7218aab6e 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.cpp @@ -28,6 +28,7 @@ extern "C" { #include <86box/86box.h> +#include <86box/ini.h> #include <86box/config.h> #include <86box/device.h> #include <86box/midi_rtmidi.h> diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index c60f224ab..16538cf9e 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -34,6 +34,7 @@ extern "C" #include <86box/device.h> #include <86box/midi.h> #include <86box/midi_rtmidi.h> +#include <86box/ini.h> #include <86box/config.h> // Disable c99-designator to avoid the warnings in rtmidi_*_device From 08f48b8b00256ad6b475b3099d12fbecbb6d4ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 10 Sep 2022 13:47:36 +0200 Subject: [PATCH 2/4] ini: Fix `ini_close` definition --- src/ini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ini.c b/src/ini.c index 167d3c67e..6c4565bb9 100644 --- a/src/ini.c +++ b/src/ini.c @@ -233,7 +233,7 @@ create_entry(section_t *section, char *name) return (ne); } -static void +void ini_close(ini_t ini) { section_t *sec, *ns; From 2cc7fc666bf38e68f00ad1be36abbc07a3e0f8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 10 Sep 2022 13:48:48 +0200 Subject: [PATCH 3/4] ini: Add to legacy makefile --- src/win/Makefile.mingw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 6d5fb92fe..cdc59e485 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -536,7 +536,7 @@ CXXFLAGS := $(CFLAGS) ######################################################################### MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \ nmi.o pic.o pit.o pit_fast.o port_6x.o port_92.o ppi.o pci.o mca.o fifo8.o \ - usb.o device.o nvr.o nvr_at.o nvr_ps2.o machine_status.o \ + usb.o device.o nvr.o nvr_at.o nvr_ps2.o machine_status.o ini.o \ $(VNCOBJ) MEMOBJ := catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o smram.o spd.o sst_flash.o From 70711759751380875c16a27058a8d98750760791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 10 Sep 2022 14:46:47 +0200 Subject: [PATCH 4/4] ini: Fix the legacy Windows UI --- src/win/win_devconf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index c5ddf9cb6..602aaa174 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -22,6 +22,7 @@ #include #include #include <86box/86box.h> +#include <86box/ini.h> #include <86box/config.h> #include <86box/device.h> #include <86box/plat.h>