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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2021-04-01 00:19:39 -03:00
parent 49b6c8b8d2 880f2f0304
commit 6aff05366f
150 changed files with 1835 additions and 1602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/device/hwm_lm78.c
View File

@@ -102,14 +102,11 @@ lm78_log(const char *fmt, ...)
void
lm78_nvram(lm78_t *dev, uint8_t save)
{
size_t l = strlen(machine_get_internal_name_ex(machine)) + 1;
wchar_t *machine_name = (wchar_t *) malloc(l * sizeof(wchar_t));
mbstowcs(machine_name, machine_get_internal_name_ex(machine), l);
l = wcslen(machine_name) + 14;
wchar_t *nvr_path = (wchar_t *) malloc(l * sizeof(wchar_t));
swprintf(nvr_path, l, L"%ls_as99127f.nvr", machine_name);
size_t l = strlen(machine_get_internal_name_ex(machine)) + 14;
char *nvr_path = (char *) malloc(l);
sprintf(nvr_path, "%s_as99127f.nvr", machine_get_internal_name_ex(machine));
FILE *f = nvr_fopen(nvr_path, save ? L"wb": L"rb");
FILE *f = nvr_fopen(nvr_path, save ? "wb" : "rb");
if (f) {
if (save)
fwrite(&dev->as99127f.nvram, sizeof(dev->as99127f.nvram), 1, f);
@@ -118,7 +115,6 @@ lm78_nvram(lm78_t *dev, uint8_t save)
fclose(f);
}
free(machine_name);
free(nvr_path);
}

4
src/device/isartc.c
View File

@@ -559,7 +559,7 @@ isartc_init(const device_t *info)
dev->f_rd,NULL,NULL, dev->f_wr,NULL,NULL, dev);
/* Hook into the NVR backend. */
dev->nvr.fn = (wchar_t *)isartc_get_internal_name(isartc_type);
dev->nvr.fn = isartc_get_internal_name(isartc_type);
dev->nvr.irq = dev->irq;
nvr_init(&dev->nvr);
@@ -578,7 +578,7 @@ isartc_close(void *priv)
dev->f_rd,NULL,NULL, dev->f_wr,NULL,NULL, dev);
if (dev->nvr.fn != NULL)
free((wchar_t *)dev->nvr.fn);
free(dev->nvr.fn);
free(dev);
}