Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 17:00:53 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

This worked by pure luck (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-06-24 21:24:28 +02:00
parent c3d4433f39
commit b3491464e4
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osd/modules/file/posixdir.cpp
View File

@ -99,7 +99,7 @@ public:
virtual const entry *read() override;
bool open(std::string const &dirname);
virtual bool opendir(std::string const &dirname) override;
private:
typedef std::unique_ptr<DIR, int (*)(DIR *)> dir_ptr;
@ -183,10 +183,10 @@ const osd::directory::entry *posix_directory::read()
//============================================================
// posix_directory::open
// posix_directory::opendir
//============================================================
bool posix_directory::open(std::string const &dirname)
bool posix_directory::opendir(std::string const &dirname)
{
assert(!m_fd);
@ -205,10 +205,10 @@ bool posix_directory::open(std::string const &dirname)
directory::ptr directory::open(std::string const &dirname)
{
ptr dir;
try { dir.reset(new posix_directory); }
try { dir = std::make_unique<posix_directory>(); }
catch (...) { return nullptr; }
if (!dir->open(dirname))
if (!dir->opendir(dirname))
return nullptr;
return dir;

14
src/osd/modules/file/windir.cpp
View File

@ -40,7 +40,7 @@ public:
virtual const entry *read() override;
bool open(std::string const &dirname);
virtual bool opendir(std::string const &dirname) override;
private:
HANDLE m_find; // handle to the finder
@ -106,10 +106,10 @@ const directory::entry *win_directory::read()
//============================================================
// win_directory::open
// win_directory::opendir
//============================================================
bool win_directory::open(std::string const &dirname)
bool win_directory::opendir(std::string const &dirname)
{
assert(m_find == INVALID_HANDLE_VALUE);
@ -121,7 +121,7 @@ bool win_directory::open(std::string const &dirname)
// append \*.* to the directory name
auto const dirfilter_size = _tcslen(t_dirname.get()) + 5;
std::unique_ptr<TCHAR []> dirfilter;
try { dirfilter.reset(new TCHAR[dirfilter_size]); }
try { dirfilter = std::make_unique<TCHAR[]>(dirfilter_size); }
catch (...) { return false; }
_sntprintf(dirfilter.get(), dirfilter_size, TEXT("%s\\*.*"), t_dirname.get());
@ -129,6 +129,8 @@ bool win_directory::open(std::string const &dirname)
m_find = FindFirstFileEx(dirfilter.get(), FindExInfoStandard, &m_data, FindExSearchNameMatch, nullptr, 0);
if (m_find == INVALID_HANDLE_VALUE)
return false;
return true;
}
} // anonymous namespace
@ -142,10 +144,10 @@ directory::ptr directory::open(std::string const &dirname)
{
// allocate memory to hold the osd_tool_directory structure
ptr dir;
try { dir.reset(new win_directory()); }
try { dir = std::make_unique<win_directory>(); }
catch (...) { return nullptr; }
if (!dir->open(dirname))
if (!dir->opendir(dirname))
return false;
return dir;

4
src/osd/osdcore.h
View File

@ -319,6 +319,7 @@ namespace osd
OTHER
};
entry() : name(nullptr), type(entry_type::NONE), size(0) {}
const char * name; // name of the entry
entry_type type; // type of the entry
std::uint64_t size; // size of the entry
@ -355,6 +356,9 @@ namespace osd
// present
// -----------------------------------------------------------------------------
virtual const entry *read() = 0;
protected:
virtual bool opendir(std::string const &dirname) = 0;
};
};