X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_windows.cc;h=ac92aa7eb730b8364673b8b8725b862453b7975f;hb=76e543bd7c85054ff857781707fa570f2b159360;hp=1fe5556484e6b7a505a447dd77cc4e8c5972cbf1;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index 1fe555648..ac92aa7eb 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "cross.h" #include "compose.hpp" #include "log.h" @@ -25,13 +26,13 @@ #include "config.h" #include "exceptions.h" #include "dcpomatic_assert.h" +#include "util.h" #include #include extern "C" { #include } #include -#include #include #include #include @@ -48,21 +49,24 @@ extern "C" { #include "i18n.h" + using std::pair; -using std::list; -using std::ifstream; -using std::string; -using std::wstring; -using std::make_pair; -using std::vector; using std::cerr; using std::cout; -using std::runtime_error; +using std::ifstream; +using std::list; +using std::make_pair; using std::map; +using std::runtime_error; using std::shared_ptr; +using std::string; +using std::vector; +using std::wstring; using boost::optional; -static std::vector > locked_volumes; + +static std::vector> locked_volumes; + /** @param s Number of seconds to sleep for */ void @@ -71,12 +75,14 @@ dcpomatic_sleep_seconds (int s) Sleep (s * 1000); } + void dcpomatic_sleep_milliseconds (int ms) { Sleep (ms); } + /** @return A string of CPU information (model name etc.) */ string cpu_info () @@ -111,6 +117,7 @@ cpu_info () return info; } + void run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) { @@ -151,7 +158,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) return; } - FILE* o = fopen_boost (out, "w"); + auto o = fopen_boost (out, "w"); if (!o) { LOG_ERROR_NC (N_("ffprobe call failed (could not create output file)")); return; @@ -176,11 +183,11 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) CloseHandle (child_stderr_read); } -list > + +list> mount_info () { - list > m; - return m; + return {}; } @@ -228,6 +235,41 @@ disk_writer_path () #endif +/** Windows can't "by default" cope with paths longer than 260 characters, so if you pass such a path to + * any boost::filesystem method it will fail. There is a "fix" for this, which is to prepend + * the string \\?\ to the path. This will make it work, so long as: + * - the path is absolute. + * - the path only uses backslashes. + * - individual path components are "short enough" (probably less than 255 characters) + * + * See https://www.boost.org/doc/libs/1_57_0/libs/filesystem/doc/reference.html under + * "Warning: Long paths on Windows" for some details. + * + * Our fopen_boost uses this method to get this fix, but any other calls to boost::filesystem + * will not unless this method is explicitly called to pre-process the pathname. + */ +boost::filesystem::path +fix_long_path (boost::filesystem::path long_path) +{ + using namespace boost::filesystem; + + path fixed = "\\\\?\\"; + if (boost::algorithm::starts_with(long_path.string(), fixed.string())) { + return long_path; + } + + /* We have to make the path canonical but we can't call canonical() on the long path + * as it will fail. So we'll sort of do it ourselves (possibly badly). + */ + if (long_path.is_absolute()) { + fixed += long_path.make_preferred(); + } else { + fixed += boost::filesystem::current_path() / long_path.make_preferred(); + } + return fixed; +} + + /* Apparently there is no way to create an ofstream using a UTF-8 filename under Windows. We are hence reduced to using fopen with this wrapper. @@ -236,16 +278,18 @@ FILE * fopen_boost (boost::filesystem::path p, string t) { wstring w (t.begin(), t.end()); - /* c_str() here should give a UTF-16 string */ - return _wfopen (p.c_str(), w.c_str ()); + /* c_str() on fixed here should give a UTF-16 string */ + return _wfopen (fix_long_path(p).c_str(), w.c_str()); } + int dcpomatic_fseek (FILE* stream, int64_t offset, int whence) { return _fseeki64 (stream, offset, whence); } + void Waker::nudge () { @@ -253,11 +297,13 @@ Waker::nudge () SetThreadExecutionState (ES_SYSTEM_REQUIRED); } + Waker::Waker () { } + Waker::~Waker () { @@ -267,7 +313,7 @@ Waker::~Waker () void start_tool (string executable) { - boost::filesystem::path batch = directory_containing_executable() / executable; + auto batch = directory_containing_executable() / executable; STARTUPINFO startup_info; ZeroMemory (&startup_info, sizeof (startup_info)); @@ -302,6 +348,7 @@ thread_id () return (uint64_t) GetCurrentThreadId (); } + static string wchar_to_utf8 (wchar_t const * s) { @@ -313,38 +360,42 @@ wchar_to_utf8 (wchar_t const * s) return u; } + int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags) { return avio_open (s, wchar_to_utf8(file.c_str()).c_str(), flags); } + void maybe_open_console () { if (Config::instance()->win32_console ()) { AllocConsole(); - HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); + auto handle_out = GetStdHandle(STD_OUTPUT_HANDLE); int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); - FILE* hf_out = _fdopen(hCrt, "w"); + auto hf_out = _fdopen(hCrt, "w"); setvbuf(hf_out, NULL, _IONBF, 1); *stdout = *hf_out; - HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); + auto handle_in = GetStdHandle(STD_INPUT_HANDLE); hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); - FILE* hf_in = _fdopen(hCrt, "r"); + auto hf_in = _fdopen(hCrt, "r"); setvbuf(hf_in, NULL, _IONBF, 128); *stdin = *hf_in; } } + boost::filesystem::path home_directory () { return boost::filesystem::path(getenv("HOMEDRIVE")) / boost::filesystem::path(getenv("HOMEPATH")); } + /** @return true if this process is a 32-bit one running on a 64-bit-capable OS */ bool running_32_on_64 () @@ -354,6 +405,7 @@ running_32_on_64 () return p; } + static optional get_friendly_name (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) { @@ -368,10 +420,12 @@ get_friendly_name (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) return wchar_to_utf8 (buffer); } + static const GUID GUID_DEVICE_INTERFACE_DISK = { 0x53F56307L, 0xB6BF, 0x11D0, { 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B } }; + static optional get_device_number (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) { @@ -380,7 +434,7 @@ get_device_number (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) SP_DEVICE_INTERFACE_DATA device_interface_data; device_interface_data.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - BOOL r = SetupDiEnumDeviceInterfaces (device_info, device_info_data, &GUID_DEVICE_INTERFACE_DISK, 0, &device_interface_data); + auto r = SetupDiEnumDeviceInterfaces (device_info, device_info_data, &GUID_DEVICE_INTERFACE_DISK, 0, &device_interface_data); if (!r) { LOG_DISK("SetupDiEnumDeviceInterfaces failed (%1)", GetLastError()); return optional(); @@ -408,7 +462,7 @@ get_device_number (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) /* Open it. We would not be allowed GENERIC_READ access here but specifying 0 for dwDesiredAccess allows us to query some metadata. */ - HANDLE device = CreateFileW ( + auto device = CreateFileW ( device_detail_data->DevicePath, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0 @@ -431,13 +485,15 @@ get_device_number (HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data) CloseHandle (device); if (!r) { - return optional(); + return {}; } return device_number.DeviceNumber; } -typedef map > MountPoints; + +typedef map> MountPoints; + /** Take a volume path (with a trailing \) and add any disk numbers related to that volume * to @ref disks. @@ -464,7 +520,7 @@ add_volume_mount_points (wchar_t* volume, MountPoints& mount_points) DCPOMATIC_ASSERT (len > 0); volume[len - 1] = L'\0'; - HANDLE handle = CreateFileW ( + auto handle = CreateFileW ( volume, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0 @@ -484,13 +540,14 @@ add_volume_mount_points (wchar_t* volume, MountPoints& mount_points) mount_points[extents.Extents[0].DiskNumber] = mp; } + MountPoints find_mount_points () { MountPoints mount_points; wchar_t volume_name[512]; - HANDLE volume = FindFirstVolumeW (volume_name, sizeof(volume_name) / sizeof(wchar_t)); + auto volume = FindFirstVolumeW (volume_name, sizeof(volume_name) / sizeof(wchar_t)); if (volume == INVALID_HANDLE_VALUE) { return MountPoints(); } @@ -507,15 +564,16 @@ find_mount_points () return mount_points; } + vector Drive::get () { vector drives; - MountPoints mount_points = find_mount_points (); + auto mount_points = find_mount_points (); /* Get a `device information set' containing information about all disks */ - HDEVINFO device_info = SetupDiGetClassDevsA (&GUID_DEVICE_INTERFACE_DISK, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + auto device_info = SetupDiGetClassDevsA (&GUID_DEVICE_INTERFACE_DISK, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); if (device_info == INVALID_HANDLE_VALUE) { LOG_DISK_NC ("SetupDiClassDevsA failed"); return drives; @@ -535,8 +593,8 @@ Drive::get () } ++i; - optional const friendly_name = get_friendly_name (device_info, &device_info_data); - optional device_number = get_device_number (device_info, &device_info_data); + auto const friendly_name = get_friendly_name (device_info, &device_info_data); + auto device_number = get_device_number (device_info, &device_info_data); if (!device_number) { continue; } @@ -563,8 +621,8 @@ Drive::get () LOG_DISK("Having a look through %1 locked volumes", locked_volumes.size()); bool locked = false; - for (vector >::const_iterator i = locked_volumes.begin(); i != locked_volumes.end(); ++i) { - if (i->second == physical_drive) { + for (auto const& i: locked_volumes) { + if (i.second == physical_drive) { locked = true; } } @@ -620,11 +678,12 @@ config_path () return p; } + void disk_write_finished () { - for (vector >::const_iterator i = locked_volumes.begin(); i != locked_volumes.end(); ++i) { - CloseHandle (i->first); + for (auto const& i: locked_volumes) { + CloseHandle (i.first); } }