*/
+#define UNICODE 1
+
#include "cross.h"
#include "compose.hpp"
#include "log.h"
#include "exceptions.h"
#include "dcpomatic_assert.h"
#include "util.h"
+#include <dcp/file.h>
#include <dcp/raw_convert.h>
#include <glib.h>
extern "C" {
#include <setupapi.h>
#include <fileapi.h>
#undef DATADIR
-#include <shlwapi.h>
+#include <knownfolders.h>
+#include <processenv.h>
#include <shellapi.h>
+#include <shlobj.h>
+#include <shlwapi.h>
#include <fcntl.h>
#include <fstream>
#include <map>
return;
}
- auto o = fopen_boost (out, "w");
+ dcp::File o(out, "w");
if (!o) {
LOG_ERROR_NC (N_("ffprobe call failed (could not create output file)"));
return;
if (!ReadFile(child_stderr_read, buffer, sizeof(buffer), &read, 0) || read == 0) {
break;
}
- fwrite (buffer, read, 1, o);
+ o.write(buffer, read, 1);
}
- fclose (o);
+ o.close();
WaitForSingleObject (process_info.hProcess, INFINITE);
CloseHandle (process_info.hProcess);
boost::filesystem::path
-xsd_path ()
-{
- return directory_containing_executable().parent_path() / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
+libdcp_resources_path ()
{
- return directory_containing_executable().parent_path() / "tags";
+ return resources_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.
-*/
-FILE *
-fopen_boost (boost::filesystem::path p, string t)
-{
- wstring w (t.begin(), t.end());
- /* 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 ()
{
wchar_to_utf8 (wchar_t const * s)
{
int const length = (wcslen(s) + 1) * 2;
- char* utf8 = new char[length];
- WideCharToMultiByte (CP_UTF8, 0, s, -1, utf8, length, 0, 0);
- string u (utf8);
- delete[] utf8;
+ std::vector<char> utf8(length);
+ WideCharToMultiByte (CP_UTF8, 0, s, -1, utf8.data(), length, 0, 0);
+ string u (utf8.data());
return u;
}
boost::filesystem::path
home_directory ()
{
- return boost::filesystem::path(getenv("HOMEDRIVE")) / boost::filesystem::path(getenv("HOMEPATH"));
+ PWSTR wide_path;
+ auto result = SHGetKnownFolderPath(FOLDERID_Documents, 0, nullptr, &wide_path);
+
+ if (result != S_OK) {
+ CoTaskMemFree(wide_path);
+ return boost::filesystem::path("c:\\");
+ }
+
+ auto path = wchar_to_utf8(wide_path);
+ CoTaskMemFree(wide_path);
+ return path;
}
DCPOMATIC_ASSERT (_mount_points.size() == 1);
string const device_name = String::compose ("\\\\.\\%1", _mount_points.front());
string const truncated = device_name.substr (0, device_name.length() - 1);
- //LOG_DISK("Actually opening %1", _device);
- //HANDLE device = CreateFileA (_device.c_str(), (GENERIC_READ | GENERIC_WRITE), FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
LOG_DISK("Actually opening %1", truncated);
HANDLE device = CreateFileA (truncated.c_str(), (GENERIC_READ | GENERIC_WRITE), FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
if (device == INVALID_HANDLE_VALUE) {
boost::filesystem::path
-config_path ()
+config_path (optional<string> version)
{
boost::filesystem::path p;
p /= g_get_user_config_dir ();
p /= "dcpomatic2";
+ if (version) {
+ p /= *version;
+ }
return p;
}
return (reinterpret_cast<int64_t>(r) <= 32);
}
+
+ArgFixer::ArgFixer(int, char**)
+{
+ auto cmd_line = GetCommandLineW();
+ auto wide_argv = CommandLineToArgvW(cmd_line, &_argc);
+
+ _argv_strings.resize(_argc);
+ _argv = new char*[_argc];
+ for (int i = 0; i < _argc; ++i) {
+ _argv_strings[i] = wchar_to_utf8(wide_argv[i]);
+ _argv[i] = const_cast<char*>(_argv_strings[i].c_str());
+ }
+}
+
projects / dcpomatic.git / blobdiff