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

Merge remote-tracking branch 'mainline/master'

Browse Source
This commit is contained in:
therealmogminer@gmail.com 2016-06-26 16:44:55 +02:00
commit 488bb6cf5c
8 changed files with 148 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/genie.lua
View File

@ -1110,6 +1110,7 @@ configuration { "mingw*" }
"-static-libgcc",
"-static-libstdc++",
"-static",
"-Wl,--start-group",
}
links {
"user32",

2
scripts/src/lib.lua
View File

@ -80,6 +80,8 @@ project "utils"
MAME_DIR .. "src/lib/util/sha1.cpp",
MAME_DIR .. "src/lib/util/sha1.h",
MAME_DIR .. "src/lib/util/strformat.h",
MAME_DIR .. "src/lib/util/timeconv.cpp",
MAME_DIR .. "src/lib/util/timeconv.h",
MAME_DIR .. "src/lib/util/unicode.cpp",
MAME_DIR .. "src/lib/util/unicode.h",
MAME_DIR .. "src/lib/util/unzip.cpp",

2
src/frontend/mame/ui/text.cpp
View File

@ -332,7 +332,7 @@ void text_layout::truncate_wrap()
float elipsis_width = get_char_width(elipsis, style.size);
// where should we really truncate from?
while (truncate_position > 0 && m_current_line->character(truncate_position).xoffset + elipsis_width < width())
while (truncate_position > 0 && m_current_line->character(truncate_position).xoffset + elipsis_width > width())
truncate_position--;
// truncate!!!

82
src/lib/util/timeconv.cpp Normal file
View File

@ -0,0 +1,82 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb, Nathan Woods
/*********************************************************************
timeconv.cpp
Time conversion utility code
***************************************************************************/
#include "timeconv.h"
#include <ctime>
namespace util {
namespace {
/***************************************************************************
PROTOTYPES
***************************************************************************/
util::ntfs_duration calculate_ntfs_offset();
/***************************************************************************
GLOBAL VARIABLES
***************************************************************************/
util::ntfs_duration f_ntfs_offset(calculate_ntfs_offset());
/***************************************************************************
IMPLEMENTATION
***************************************************************************/
util::ntfs_duration calculate_ntfs_offset()
{
constexpr auto days_in_year(365);
constexpr auto days_in_four_years((days_in_year * 4) + 1);
constexpr auto days_in_century((days_in_four_years * 25) - 1);
constexpr auto days_in_four_centuries((days_in_century * 4) + 1);
constexpr ntfs_duration day(std::chrono::hours(24));
constexpr ntfs_duration year(day * days_in_year);
constexpr ntfs_duration four_years(day * days_in_four_years);
constexpr ntfs_duration century(day * days_in_century);
constexpr ntfs_duration four_centuries(day * days_in_four_centuries);
std::time_t const zero(0);
std::tm const epoch(*std::gmtime(&zero));
ntfs_duration result(day * epoch.tm_yday);
result += std::chrono::hours(epoch.tm_hour);
result += std::chrono::minutes(epoch.tm_min);
result += std::chrono::seconds(epoch.tm_sec);
int years(1900 - 1601 + epoch.tm_year);
result += four_centuries * (years / 400);
years %= 400;
result += century * (years / 100);
years %= 100;
result += four_years * (years / 4);
years %= 4;
result += year * years;
return result;
}
} // anonymous namespace
// -------------------------------------------------
// system_clock_time_point_from_ntfs_duration
// -------------------------------------------------
std::chrono::system_clock::time_point system_clock_time_point_from_ntfs_duration(ntfs_duration d)
{
return std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(d - f_ntfs_offset);
}
} // namespace util

53
src/lib/util/timeconv.h Normal file
View File

@ -0,0 +1,53 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb, Nathan Woods
/***************************************************************************
timeconv.h
Time conversion utility code
***************************************************************************/
#ifndef MAME_LIB_UTIL_TIMECONV_H
#define MAME_LIB_UTIL_TIMECONV_H
#pragma once
#include "osdcore.h"
#include <chrono>
namespace util {
/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_duration;
/***************************************************************************
INLINE FUNCTIONS
***************************************************************************/
// -------------------------------------------------
// ntfs_duration_from_filetime
// -------------------------------------------------
inline constexpr ntfs_duration ntfs_duration_from_filetime(std::uint32_t high, std::uint32_t low)
{
return ntfs_duration((std::uint64_t(high) << 32) | std::uint64_t(low));
}
/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/
std::chrono::system_clock::time_point system_clock_time_point_from_ntfs_duration(ntfs_duration d);
} // namespace util
#endif // MAME_LIB_UTIL_TIMECONV_H

46
src/lib/util/un7z.cpp
View File

@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
/***************************************************************************
un7z.c
un7z.cpp
Functions to manipulate data within 7z files.
@ -14,6 +14,7 @@
#include "corestr.h"
#include "unicode.h"
#include "timeconv.h"
#include "lzma/C/7z.h"
#include "lzma/C/7zAlloc.h"
@ -154,8 +155,6 @@ public:
archive_file::error decompress(void *buffer, std::uint32_t length);
private:
typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_duration;
m7z_file_impl(const m7z_file_impl &) = delete;
m7z_file_impl(m7z_file_impl &&) = delete;
m7z_file_impl &operator=(const m7z_file_impl &) = delete;
@ -171,10 +170,7 @@ private:
void make_utf8_name(int index);
void set_curr_modified();
static ntfs_duration calculate_ntfs_offset();
static constexpr std::size_t CACHE_SIZE = 8;
static const ntfs_duration s_ntfs_offset;
static std::array<ptr, CACHE_SIZE> s_cache;
static std::mutex s_cache_mutex;
@ -246,7 +242,6 @@ private:
GLOBAL VARIABLES
***************************************************************************/
const m7z_file_impl::ntfs_duration m7z_file_impl::s_ntfs_offset(calculate_ntfs_offset());
std::array<m7z_file_impl::ptr, m7z_file_impl::CACHE_SIZE> m7z_file_impl::s_cache;
std::mutex m7z_file_impl::s_cache_mutex;
@ -520,8 +515,8 @@ void m7z_file_impl::set_curr_modified()
if (SzBitWithVals_Check(&m_db.MTime, m_curr_file_idx))
{
CNtfsFileTime const &file_time(m_db.MTime.Vals[m_curr_file_idx]);
ntfs_duration const ticks((std::uint64_t(file_time.High) << 32) | std::uint64_t(file_time.Low));
m_curr_modified = std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(ticks - s_ntfs_offset);
auto ticks = ntfs_duration_from_filetime(file_time.High, file_time.Low);
m_curr_modified = system_clock_time_point_from_ntfs_duration(ticks);
}
else
{
@ -530,39 +525,6 @@ void m7z_file_impl::set_curr_modified()
}
m7z_file_impl::ntfs_duration m7z_file_impl::calculate_ntfs_offset()
{
constexpr auto days_in_year(365);
constexpr auto days_in_four_years((days_in_year * 4) + 1);
constexpr auto days_in_century((days_in_four_years * 25) - 1);
constexpr auto days_in_four_centuries((days_in_century * 4) + 1);
constexpr ntfs_duration day(std::chrono::hours(24));
constexpr ntfs_duration year(day * days_in_year);
constexpr ntfs_duration four_years(day * days_in_four_years);
constexpr ntfs_duration century(day * days_in_century);
constexpr ntfs_duration four_centuries(day * days_in_four_centuries);
std::time_t const zero(0);
std::tm const epoch(*std::gmtime(&zero));
ntfs_duration result(day * epoch.tm_yday);
result += std::chrono::hours(epoch.tm_hour);
result += std::chrono::minutes(epoch.tm_min);
result += std::chrono::seconds(epoch.tm_sec);
int years(1900 - 1601 + epoch.tm_year);
result += four_centuries * (years / 400);
years %= 400;
result += century * (years / 100);
years %= 100;
result += four_years * (years / 4);
years %= 4;
result += year * years;
return result;
}
} // anonymous namespace

44
src/lib/util/unzip.cpp
View File

@ -13,6 +13,7 @@
#include "corestr.h"
#include "hashing.h"
#include "osdcore.h"
#include "timeconv.h"
#include "lzma/C/LzmaDec.h"
@ -173,8 +174,6 @@ public:
archive_file::error decompress(void *buffer, std::uint32_t length);
private:
typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_duration;
zip_file_impl(const zip_file_impl &) = delete;
zip_file_impl(zip_file_impl &&) = delete;
zip_file_impl &operator=(const zip_file_impl &) = delete;
@ -228,9 +227,6 @@ private:
archive_file::error decompress_data_type_8(std::uint64_t offset, void *buffer, std::uint32_t length);
archive_file::error decompress_data_type_14(std::uint64_t offset, void *buffer, std::uint32_t length);
// precalculation
static ntfs_duration calculate_ntfs_offset();
struct file_header
{
std::uint16_t version_created; // version made by
@ -259,7 +255,6 @@ private:
static constexpr std::size_t DECOMPRESS_BUFSIZE = 16384;
static constexpr std::size_t CACHE_SIZE = 8; // number of open files to cache
static const ntfs_duration s_ntfs_offset;
static std::array<ptr, CACHE_SIZE> s_cache;
static std::mutex s_cache_mutex;
@ -646,7 +641,6 @@ private:
GLOBAL VARIABLES
***************************************************************************/
const zip_file_impl::ntfs_duration zip_file_impl::s_ntfs_offset(calculate_ntfs_offset());
std::array<zip_file_impl::ptr, zip_file_impl::CACHE_SIZE> zip_file_impl::s_cache;
std::mutex zip_file_impl::s_cache_mutex;
@ -768,7 +762,7 @@ int zip_file_impl::search(std::uint32_t search_crc, const std::string &search_fi
{
ntfs_times_reader const times(tag);
ntfs_duration const ticks(times.mtime());
m_header.modified = std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(ticks - s_ntfs_offset);
m_header.modified = system_clock_time_point_from_ntfs_duration(ticks);
}
}
}
@ -1408,40 +1402,6 @@ archive_file::error zip_file_impl::decompress_data_type_14(std::uint64_t offset,
}
}
zip_file_impl::ntfs_duration zip_file_impl::calculate_ntfs_offset()
{
constexpr auto days_in_year(365);
constexpr auto days_in_four_years((days_in_year * 4) + 1);
constexpr auto days_in_century((days_in_four_years * 25) - 1);
constexpr auto days_in_four_centuries((days_in_century * 4) + 1);
constexpr ntfs_duration day(std::chrono::hours(24));
constexpr ntfs_duration year(day * days_in_year);
constexpr ntfs_duration four_years(day * days_in_four_years);
constexpr ntfs_duration century(day * days_in_century);
constexpr ntfs_duration four_centuries(day * days_in_four_centuries);
std::time_t const zero(0);
std::tm const epoch(*std::gmtime(&zero));
ntfs_duration result(day * epoch.tm_yday);
result += std::chrono::hours(epoch.tm_hour);
result += std::chrono::minutes(epoch.tm_min);
result += std::chrono::seconds(epoch.tm_sec);
int years(1900 - 1601 + epoch.tm_year);
result += four_centuries * (years / 400);
years %= 400;
result += century * (years / 100);
years %= 100;
result += four_years * (years / 4);
years %= 4;
result += year * years;
return result;
}
} // anonymous namespace

5
src/osd/windows/winutil.cpp
View File

@ -17,6 +17,7 @@
// MAMEOS headers
#include "winutil.h"
#include "strconv.h"
#include "timeconv.h"
//============================================================
@ -41,8 +42,8 @@ osd::directory::entry::entry_type win_attributes_to_entry_type(DWORD attributes)
std::chrono::system_clock::time_point win_time_point_from_filetime(LPFILETIME file_time)
{
return std::chrono::system_clock::time_point(std::chrono::system_clock::duration(
(static_cast<__int64>(file_time->dwHighDateTime) << 32) | file_time->dwLowDateTime));
auto converted_file_time = util::ntfs_duration_from_filetime(file_time->dwHighDateTime, file_time->dwLowDateTime);
return util::system_clock_time_point_from_ntfs_duration(converted_file_time);
}