Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed off by one issue and other cleanups requested by Vas

Browse Source
This commit is contained in:
Nathan Woods 2016-07-25 07:49:26 -04:00
parent ab73291e47
commit 4a9e9742fd
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/osd/modules/file/winfile.cpp
View File

@ -116,17 +116,6 @@ private:
}; };
template <typename T>
class osd_disposer
{
public:
osd_disposer(T *&ptr) : m_ptr(ptr) { }
~osd_disposer() { if (m_ptr) osd_free(m_ptr); }
private:
T *&m_ptr;
};
//============================================================ //============================================================
// INLINE FUNCTIONS // INLINE FUNCTIONS
@ -186,6 +175,11 @@ osd_file::error osd_file::open(std::string const &orig_path, UINT32 openflags, p
// convert path to TCHAR // convert path to TCHAR
auto t_path = tstring_from_utf8(path.c_str()); auto t_path = tstring_from_utf8(path.c_str());
// convert the path into something Windows compatible (the actual interesting part appears
// to have been commented out???)
for (auto iter = t_path.begin(); iter != t_path.end(); iter++)
*iter = /* ('/' == *iter) ? '\\' : */ *iter;
// select the file open modes // select the file open modes
DWORD disposition, access, sharemode; DWORD disposition, access, sharemode;
if (openflags & OPEN_FLAG_WRITE) if (openflags & OPEN_FLAG_WRITE)
@ -213,13 +207,16 @@ osd_file::error osd_file::open(std::string const &orig_path, UINT32 openflags, p
// create the path if necessary // create the path if necessary
if ((ERROR_PATH_NOT_FOUND == err) && (openflags & OPEN_FLAG_CREATE) && (openflags & OPEN_FLAG_CREATE_PATHS)) if ((ERROR_PATH_NOT_FOUND == err) && (openflags & OPEN_FLAG_CREATE) && (openflags & OPEN_FLAG_CREATE_PATHS))
{ {
TCHAR *pathsep = _tcsrchr(&t_path[0], '\\'); // the code below assumes these are the same
if (pathsep != nullptr) assert(std::string::npos == std::wstring::npos);
auto pathsep = t_path.rfind('\\');
if (pathsep != std::string::npos)
{ {
// create the path up to the file // create the path up to the file
*pathsep = 0; t_path[pathsep] = 0;
err = create_path_recursive(&t_path[0]); err = create_path_recursive(&t_path[0]);
*pathsep = '\\'; t_path[pathsep] = '\\';
// attempt to reopen the file // attempt to reopen the file
if (err == NO_ERROR) if (err == NO_ERROR)

2
src/osd/modules/font/font_windows.cpp
View File

@ -86,7 +86,7 @@ bool osd_font_windows::open(std::string const &font_path, std::string const &_na
// copy in the face name // copy in the face name
std::basic_string<TCHAR> face = tstring_from_utf8(name.c_str()); std::basic_string<TCHAR> face = tstring_from_utf8(name.c_str());
_tcsncpy(logfont.lfFaceName, face.c_str(), sizeof(logfont.lfFaceName) / sizeof(TCHAR)); _tcsncpy(logfont.lfFaceName, face.c_str(), ARRAY_LENGTH(logfont.lfFaceName));
logfont.lfFaceName[sizeof(logfont.lfFaceName) / sizeof(TCHAR)-1] = 0; logfont.lfFaceName[sizeof(logfont.lfFaceName) / sizeof(TCHAR)-1] = 0;
// create the font // create the font

2
src/osd/modules/lib/osdlib_win32.cpp
View File

@ -277,7 +277,7 @@ static char *get_clipboard_text_by_format(UINT format, std::string (*convert)(LP
// copy the string // copy the string
result = (char *) osd_malloc(s.size() + 1); result = (char *) osd_malloc(s.size() + 1);
if (result != nullptr) if (result != nullptr)
memcpy(result, s.data(), s.size() * sizeof(*result)); memcpy(result, s.data(), (s.size() + 1) * sizeof(*result));
// unlock the data // unlock the data
GlobalUnlock(data_handle); GlobalUnlock(data_handle);

4
src/osd/strconv.cpp
View File

@ -25,9 +25,9 @@ std::string &astring_from_utf8(std::string &dst, const char *s)
std::basic_string<WCHAR> wstring = wstring_from_utf8(s); std::basic_string<WCHAR> wstring = wstring_from_utf8(s);
// convert UTF-16 to "ANSI code page" string // convert UTF-16 to "ANSI code page" string
int char_count = WideCharToMultiByte(CP_ACP, 0, wstring.c_str(), -1, nullptr, 0, nullptr, nullptr); int char_count = WideCharToMultiByte(CP_ACP, 0, wstring.c_str(), wstring.size() + 1, nullptr, 0, nullptr, nullptr);
dst.resize(char_count - 1); dst.resize(char_count - 1);
WideCharToMultiByte(CP_ACP, 0, wstring.c_str(), -1, &dst[0], char_count - 1, nullptr, nullptr); WideCharToMultiByte(CP_ACP, 0, wstring.c_str(), wstring.size() + 1, &dst[0], char_count - 1, nullptr, nullptr);
return dst; return dst;
} }