feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Make FilePath::canonicalPath() work for directories

Browse Source 
... in the Windows implementation.
Amends 1073f89886.

Change-Id: Id264e9844634fc8d2afae5b2a7a2355882136315
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-09-06 11:21:01 +02:00
parent a6176e293b
commit 8e9e457daa
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/utils/filepath.cpp
View File

@@ -24,8 +24,6 @@
#ifdef QTCREATOR_PCH_H
#define CALLBACK WINAPI
#endif
#include <QFile>
#include <io.h>
#include <qt_windows.h>
#include <shlobj.h>
#endif
@@ -1549,14 +1547,25 @@ FilePath FilePath::canonicalPath() const
}
#ifdef Q_OS_WINDOWS
QFile f(toString());
if (f.open(QIODevice::ReadOnly)) {
DWORD flagsAndAttrs = FILE_ATTRIBUTE_NORMAL;
if (isDir())
flagsAndAttrs |= FILE_FLAG_BACKUP_SEMANTICS;
const HANDLE fileHandle = CreateFile(
toUserOutput().toStdWString().c_str(),
GENERIC_READ,
FILE_SHARE_READ,
nullptr,
OPEN_EXISTING,
flagsAndAttrs,
nullptr);
if (fileHandle != INVALID_HANDLE_VALUE) {
TCHAR normalizedPath[MAX_PATH];
const auto length = GetFinalPathNameByHandleW(
reinterpret_cast<HANDLE>(_get_osfhandle(f.handle())),
fileHandle,
normalizedPath,
MAX_PATH,
FILE_NAME_NORMALIZED);
CloseHandle(fileHandle);
if (length > 0)
return fromUserInput(QString::fromStdWString(std::wstring(normalizedPath, length)));
}