Replace more instances of fopen() with FileSystem::OpenFile()

src/common/byte_stream.cpp

@@ -1,6 +1,8 @@
 #include "byte_stream.h"
 #include "assert.h"
+#include "file_system.h"
 #include "log.h"
+#include "string_util.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstdio>
@@ -958,16 +960,14 @@ std::unique_ptr<ByteStream> ByteStream_OpenFileStream(const char* fileName, u32
 
     // fill in random characters
     _mktemp_s(temporaryFileName, fileNameLength + 8);
-
+    const std::wstring wideTemporaryFileName(StringUtil::UTF8StringToWideString(temporaryFileName));
-    // open the file
-    errno_t err;
-    FILE* pTemporaryFile;
 
     // massive hack here
     DWORD desiredAccess = GENERIC_WRITE;
     if (openMode & BYTESTREAM_OPEN_READ)
       desiredAccess |= GENERIC_READ;
-    HANDLE hFile = CreateFileA(temporaryFileName, desiredAccess, FILE_SHARE_DELETE, NULL, CREATE_NEW, 0, NULL);
+    HANDLE hFile =
+      CreateFileW(wideTemporaryFileName.c_str(), desiredAccess, FILE_SHARE_DELETE, NULL, CREATE_NEW, 0, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
       return nullptr;
 
@@ -976,16 +976,16 @@ std::unique_ptr<ByteStream> ByteStream_OpenFileStream(const char* fileName, u32
     if (fd < 0)
     {
       CloseHandle(hFile);
-      DeleteFileA(temporaryFileName);
+      DeleteFileW(wideTemporaryFileName.c_str());
       return nullptr;
     }
 
     // convert to a stream
-    pTemporaryFile = _fdopen(fd, modeString);
+    FILE* pTemporaryFile = _fdopen(fd, modeString);
-    if (pTemporaryFile == nullptr)
+    if (!pTemporaryFile)
     {
       _close(fd);
-      DeleteFileA(temporaryFileName);
+      DeleteFileW(wideTemporaryFileName.c_str());
       return nullptr;
     }
 
@@ -996,9 +996,8 @@ std::unique_ptr<ByteStream> ByteStream_OpenFileStream(const char* fileName, u32
     // do we need to copy the existing file into this one?
     if (!(openMode & BYTESTREAM_OPEN_TRUNCATE))
     {
-      FILE* pOriginalFile;
+      FILE* pOriginalFile = FileSystem::OpenCFile(fileName, "rb");
-      err = fopen_s(&pOriginalFile, fileName, "rb");
+      if (!pOriginalFile)
-      if (err != 0 || pOriginalFile == nullptr)
       {
         // this will delete the temporary file
         pStream->Discard();
@@ -1031,9 +1030,8 @@ std::unique_ptr<ByteStream> ByteStream_OpenFileStream(const char* fileName, u32
   else
   {
     // forward through
-    FILE* pFile;
+    FILE* pFile = FileSystem::OpenCFile(fileName, modeString);
-    errno_t err = fopen_s(&pFile, fileName, modeString);
+    if (!pFile)
-    if (err != 0 || pFile == NULL)
       return nullptr;
 
     return std::make_unique<FileByteStream>(pFile);

src/core/cpu_core.cpp

@@ -1,5 +1,6 @@
 #include "cpu_core.h"
 #include "common/align.h"
+#include "common/file_system.h"
 #include "common/log.h"
 #include "common/state_wrapper.h"
 #include "cpu_disasm.h"
@@ -53,7 +54,7 @@ void WriteToExecutionLog(const char* format, ...)
 
   if (!log_file_opened)
   {
-    log_file = std::fopen("cpu_log.txt", "wb");
+    log_file = FileSystem::OpenCFile("cpu_log.txt", "wb");
     log_file_opened = true;
   }
 

src/core/game_list.cpp

@@ -307,7 +307,7 @@ bool GameList::GetExeListEntry(const char* path, GameListEntry* entry)
   if (!FileSystem::StatFile(path, &ffd))
     return false;
 
-  std::FILE* fp = std::fopen(path, "rb");
+  std::FILE* fp = FileSystem::OpenCFile(path, "rb");
   if (!fp)
     return false;
 

src/core/system.cpp

@@ -3,6 +3,7 @@
 #include "bus.h"
 #include "cdrom.h"
 #include "common/audio_stream.h"
+#include "common/file_system.h"
 #include "common/log.h"
 #include "common/state_wrapper.h"
 #include "common/string_util.h"
@@ -878,7 +879,7 @@ void ResetPerformanceCounters()
 
 bool LoadEXE(const char* filename, std::vector<u8>& bios_image)
 {
-  std::FILE* fp = std::fopen(filename, "rb");
+  std::FILE* fp = FileSystem::OpenCFile(filename, "rb");
   if (!fp)
     return false;
 
@@ -997,7 +998,7 @@ bool LoadPSF(const char* filename, std::vector<u8>& bios_image)
 
 bool SetExpansionROM(const char* filename)
 {
-  std::FILE* fp = std::fopen(filename, "rb");
+  std::FILE* fp = FileSystem::OpenCFile(filename, "rb");
   if (!fp)
   {
     Log_ErrorPrintf("Failed to open '%s'", filename);