ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDImage/CHD: Handle UTF-8 strings when opening

This commit is contained in:
Connor McLaughlin 2020-08-01 14:01:23 +10:00
parent 058bea9faf
commit 7067b8f6e3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/cd_image_chd.cpp
View File

@ -13,6 +13,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <map> #include <map>
#include <cerrno>
#include <optional> #include <optional>
Log_SetChannel(CDImageCHD); Log_SetChannel(CDImageCHD);
@ -59,6 +60,7 @@ private:
bool ReadHunk(u32 hunk_index); bool ReadHunk(u32 hunk_index);
std::FILE* m_fp = nullptr;
chd_file* m_chd = nullptr; chd_file* m_chd = nullptr;
u32 m_hunk_size = 0; u32 m_hunk_size = 0;
u32 m_sectors_per_hunk = 0; u32 m_sectors_per_hunk = 0;
@ -75,11 +77,21 @@ CDImageCHD::~CDImageCHD()
{ {
if (m_chd) if (m_chd)
chd_close(m_chd); chd_close(m_chd);
if (m_fp)
std::fclose(m_fp);
} }
bool CDImageCHD::Open(const char* filename) bool CDImageCHD::Open(const char* filename)
{ {
chd_error err = chd_open(filename, CHD_OPEN_READ, nullptr, &m_chd); Assert(!m_fp);
m_fp = FileSystem::OpenCFile(filename, "rb");
if (!m_fp)
{
Log_ErrorPrintf("Failed to open CHD '%s': errno %d", filename, errno);
return false;
}
chd_error err = chd_open_file(m_fp, CHD_OPEN_READ, nullptr, &m_chd);
if (err != CHDERR_NONE) if (err != CHDERR_NONE)
{ {
Log_ErrorPrintf("Failed to open CHD '%s': %s", filename, chd_error_string(err)); Log_ErrorPrintf("Failed to open CHD '%s': %s", filename, chd_error_string(err));