X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fcdrcimg%2Fcdrcimg.c;h=047357ac3519854e994e844c025e1ece2ccee6f0;hb=78de2879b23476890019dd434178b463b649da17;hp=007e96b96d02eccf2bf82197a1920aff3fd2efb2;hpb=4ee722a52cb0fb56260ccd3962537e5c772800e0;p=pcsx_rearmed.git

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 007e96b9..047357ac 100644
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -8,24 +8,19 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <compat/fopen_utf8.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#ifndef _WIN32
-#define CALLBACK
-#ifndef NO_DYLIB
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 #include <dlfcn.h>
 #endif
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
 
 #include "cdrcimg.h"
 
+#undef CALLBACK
+#define CALLBACK
+
 #define PFX "cdrcimg: "
 #define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__)
 
@@ -323,7 +318,7 @@ static long handle_eboot(void)
 	int i, ret;
 	FILE *f;
 
-	f = fopen_utf8(cd_fname, "rb");
+	f = fopen(cd_fname, "rb");
 	if (f == NULL) {
 		err("missing file: %s: ", cd_fname);
 		perror(NULL);
@@ -419,6 +414,8 @@ static long CDRopen(void)
 	char *ext;
 	FILE *f = NULL;
 
+	printf("%s cd_file=%d\n", __func__, cd_file == NULL ? 0 : 1);
+
 	if (cd_file != NULL)
 		return 0; // it's already open
 
@@ -462,7 +459,7 @@ static long CDRopen(void)
 		return -1;
 	}
 
-	f = fopen_utf8(table_fname, "rb");
+	f = fopen(table_fname, "rb");
 	if (f == NULL) {
 		err("missing file: %s: ", table_fname);
 		perror(NULL);
@@ -527,7 +524,7 @@ static long CDRopen(void)
 		break;
 	}
 
-	cd_file = fopen_utf8(cd_fname, "rb");
+	cd_file = fopen(cd_fname, "rb");
 	if (cd_file == NULL) {
 		err("failed to open: %s: ", table_fname);
 		perror(NULL);