admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap all fopen access - go through FCEUD_UTF8fopen isntead

Browse Source
This commit is contained in:
twinaphex
2021-06-05 21:07:55 +02:00
parent e154706586
commit 3dbf430262
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/boards/copyfami_hwi.c
View File

@@ -173,7 +173,7 @@ static int32 FetchNewCHRBank(int32 slot) {
CHR1KGetCmd[1] = slot << 2; CHR1KGetCmd[1] = slot << 2;
SENDGET(CHR1KGetCmd, chr_data.buf[bank * 1024], 1024); SENDGET(CHR1KGetCmd, chr_data.buf[bank * 1024], 1024);
sprintf(name, "%04x.chr", bank); sprintf(name, "%04x.chr", bank);
ofile = fopen(name, "wb"); ofile = FCEUD_UTF8fopen(name, "wb");
fwrite((void*)&chr_data.buf[bank * 1024], 1, 1024, ofile); fwrite((void*)&chr_data.buf[bank * 1024], 1, 1024, ofile);
fclose(ofile); fclose(ofile);
return bank; return bank;
@@ -186,7 +186,7 @@ static int32 FetchNewPRGBank(int32 slot) {
PRG8KGetCmd[1] = 0x80 + (slot << 5); PRG8KGetCmd[1] = 0x80 + (slot << 5);
SENDGET(PRG8KGetCmd, prg_data.buf[bank * 8192], 8192); SENDGET(PRG8KGetCmd, prg_data.buf[bank * 8192], 8192);
sprintf(name, "%04x.prg", bank); sprintf(name, "%04x.prg", bank);
ofile = fopen(name, "wb"); ofile = FCEUD_UTF8fopen(name, "wb");
fwrite((void*)&prg_data.buf[bank * 8192], 1, 8192, ofile); fwrite((void*)&prg_data.buf[bank * 8192], 1, 8192, ofile);
fclose(ofile); fclose(ofile);
return bank; return bank;

3
src/drivers/libretro/libretro.c
View File

@@ -6,6 +6,7 @@
#include <ctype.h> #include <ctype.h>
#include <libretro.h> #include <libretro.h>
#include <compat/fopen_utf8.h>
#include <streams/memory_stream.h> #include <streams/memory_stream.h>
#include <libretro_dipswitch.h> #include <libretro_dipswitch.h>
#include <libretro_core_options.h> #include <libretro_core_options.h>
@@ -291,7 +292,7 @@ void FCEUD_SoundToggle (void)
FILE *FCEUD_UTF8fopen(const char *n, const char *m) FILE *FCEUD_UTF8fopen(const char *n, const char *m)
{ {
if (n) if (n)
return fopen(n, m); return fopen_utf8(n, m);
return NULL; return NULL;
} }

8
src/file.c
View File

@@ -34,12 +34,6 @@
#include "driver.h" #include "driver.h"
#include "general.h" #include "general.h"
#include "compat/fopen_utf8.h"
#ifndef __GNUC__
#define strcasecmp strcmp
#endif
static MEMWRAP *MakeMemWrap(void *tz, int type) static MEMWRAP *MakeMemWrap(void *tz, int type)
{ {
MEMWRAP *tmp; MEMWRAP *tmp;
@@ -87,7 +81,7 @@ FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn,
fceufp->fp = MakeMemWrapBuffer(buffer, bufsize); fceufp->fp = MakeMemWrapBuffer(buffer, bufsize);
else else
{ {
void *t = fopen_utf8(path, mode); void *t = FCEUD_UTF8fopen(path, mode);
if (!t) if (!t)
{ {