commit 5873a382de44a7e3b608fdab7a5d44c9699ad3a8
Author: Enrico Forestieri <[email protected]>
Date: Sun Feb 23 22:48:35 2020 +0100
Fix FileName::realPath() on Windows
The realPath() implementation on Windows works only for files and
not for directories. By using an API available starting from Vista
it is possible to fix it in a simple way.
I also took into account using the Qt QFileInfo::canonicalFilePath(),
but it turns out to not work when a path component is a junction
(tested with Qt 5.14.1).
Due to this, it is not possible compiling or using LyX on Windows
versions earlier than Vista.
---
README | 2 +-
src/support/os.cpp | 4 ++++
src/support/os_win32.cpp | 38 +++++---------------------------------
src/support/os_win32.h | 8 ++++----
4 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/README b/README
index dfc57d3..222a993 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ What do I need to run LyX?
Either:
* a Unix-like system (including Windows with Cygwin)
- * Windows 2000 or newer
+ * Windows Vista or newer
* Mac OS 10.4 or newer
A decent LaTeX2e installation (e.g. TeX Live for Linux, MikTeX for
diff --git a/src/support/os.cpp b/src/support/os.cpp
index 7e8fb8a..616b9c6 100644
--- a/src/support/os.cpp
+++ b/src/support/os.cpp
@@ -11,6 +11,10 @@
#include <config.h>
+#ifdef _WIN32
+# define _WIN32_WINNT 0x0600
+#endif
+
#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index e15af13..82e57d2 100644
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -38,6 +38,7 @@
#include <io.h>
#include <direct.h> // _getdrive
+#include <fileapi.h> // GetFinalPathNameByHandle
#include <shlobj.h> // SHGetFolderPath
#include <windef.h>
#include <shellapi.h>
@@ -594,45 +595,18 @@ string real_path(string const & path)
// See http://msdn.microsoft.com/en-us/library/aa366789(VS.85).aspx
QString const qpath = get_long_path(toqstr(path));
HANDLE hpath = CreateFileW((wchar_t *) qpath.utf16(), GENERIC_READ,
- FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ FILE_SHARE_READ, NULL, OPEN_EXISTING,
+ FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (hpath == INVALID_HANDLE_VALUE) {
// The file cannot be accessed.
return path;
}
- // Get the file size.
- DWORD size_hi = 0;
- DWORD size_lo = GetFileSize(hpath, &size_hi);
-
- if (size_lo == 0 && size_hi == 0) {
- // A zero-length file cannot be mapped.
- CloseHandle(hpath);
- return path;
- }
-
- // Create a file mapping object.
- HANDLE hmap = CreateFileMapping(hpath, NULL, PAGE_READONLY, 0, 1, NULL);
-
- if (!hmap) {
- CloseHandle(hpath);
- return path;
- }
-
- // Create a file mapping to get the file name.
- void * pmem = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 1);
-
- if (!pmem) {
- CloseHandle(hmap);
- CloseHandle(hpath);
- return path;
- }
-
TCHAR realpath[MAX_PATH + 1];
- if (!GetMappedFileName(GetCurrentProcess(), pmem, realpath, MAX_PATH)) {
- UnmapViewOfFile(pmem);
- CloseHandle(hmap);
+ DWORD size = GetFinalPathNameByHandle(hpath, realpath, MAX_PATH,
VOLUME_NAME_NT);
+ if (size > MAX_PATH) {
CloseHandle(hpath);
return path;
}
@@ -678,8 +652,6 @@ string real_path(string const & path)
while (*p++) ;
} while (!found && *p);
}
- UnmapViewOfFile(pmem);
- CloseHandle(hmap);
CloseHandle(hpath);
string const retpath = subst(string(realpath), '\\', '/');
return FileName::fromFilesystemEncoding(retpath).absFileName();
diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index 42016f7..6f92b90 100644
--- a/src/support/os_win32.h
+++ b/src/support/os_win32.h
@@ -36,13 +36,13 @@
*/
#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__CYGWIN32__)
# if defined(WINVER)
-# if WINVER < 0x0500
-# error WINVER must be >= 0x0500
+# if WINVER < 0x0600
+# error WINVER must be >= 0x0600
# endif
# else
-# define WINVER 0x0500
+# define WINVER 0x0600
# endif
-# define _WIN32_IE 0x0500
+# define _WIN32_IE 0x0600
#endif
#include <windows.h>
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
