From b3491464e41b6afea81e188fe6a350d4f778854b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 24 Jun 2016 21:24:28 +0200
Subject: [PATCH] This worked by pure luck (nw)

---
 src/osd/modules/file/posixdir.cpp | 10 +++++-----
 src/osd/modules/file/windir.cpp   | 14 ++++++++------
 src/osd/osdcore.h                 |  4 ++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp
index d08d6869c6c..3141de45b16 100644
--- a/src/osd/modules/file/posixdir.cpp
+++ b/src/osd/modules/file/posixdir.cpp
@@ -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;
diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
index e6eecfab4a2..1694929492d 100644
--- a/src/osd/modules/file/windir.cpp
+++ b/src/osd/modules/file/windir.cpp
@@ -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;
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h
index 141f3db55d9..8c4b32b3a5d 100644
--- a/src/osd/osdcore.h
+++ b/src/osd/osdcore.h
@@ -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;
 	};
 };