Support UNC path capacity on Windows #22202
Open
+28
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
QT seems doesn't have full support of UNC paths in general, a workaround is to mount it as a drive, mentioned at PCSX2/pcsx2#6258 and https://forum.qt.io/topic/96418/how-to-create-a-folder-and-write-a-file-in-it-using-the-unc-path/2 |
glassez
changed the title
glassez
reviewed
Jan 25, 2025
| @@ -99,6 +104,27 @@ namespace | |||
| Path current = path; | |||
| qint64 freeSpace = Utils::Fs::freeDiskSpaceOnPath(current); | |||
|
|
|||
| // UNC path support on windows | |||
There was a problem hiding this comment.
It should be done inside Utils::Fs::freeDiskSpaceOnPath().
glassez
requested changes
Jan 25, 2025
| @@ -99,6 +104,27 @@ namespace | |||
| Path current = path; | |||
| qint64 freeSpace = Utils::Fs::freeDiskSpaceOnPath(current); | |||
|
|
|||
| // UNC path support on windows | |||
| #ifdef Q_OS_WIN | |||
| if (freeSpace < 0 && PathIsUNC(current.data().toStdWString().c_str())) | |||
There was a problem hiding this comment.
Suggested change
| if (freeSpace < 0 && PathIsUNC(current.data().toStdWString().c_str())) | |
| if ((freeSpace < 0) && PathIsUNCW(current.data().toStdWString().c_str())) |
Comment on lines
+111
to
+113
| ULARGE_INTEGER FreeBytesAvailable = { 0 }; | ||
| ULARGE_INTEGER TotalNumberOfBytes = { 0 }; | ||
| ULARGE_INTEGER TotalNumberOfFreeBytes = { 0 }; |
There was a problem hiding this comment.
Suggested change
| ULARGE_INTEGER FreeBytesAvailable = { 0 }; | |
| ULARGE_INTEGER TotalNumberOfBytes = { 0 }; | |
| ULARGE_INTEGER TotalNumberOfFreeBytes = { 0 }; | |
| ULARGE_INTEGER freeBytesAvailable = {0}; | |
| ULARGE_INTEGER totalNumberOfBytes = {0}; | |
| ULARGE_INTEGER totalNumberOfFreeBytes = {0}; |
There was a problem hiding this comment.
IIRC, both totalNumberOfBytes and totalNumberOfFreeBytes are redundant (unused) and can be omitted.
Comment on lines
+114
to
+119
| BOOL ok = GetDiskFreeSpaceEx( | ||
| current.data().toStdWString().c_str(), | ||
| &FreeBytesAvailable, | ||
| &TotalNumberOfBytes, | ||
| &TotalNumberOfFreeBytes | ||
| ); |
There was a problem hiding this comment.
Such indentation is too overkill.
Suggested change
| BOOL ok = GetDiskFreeSpaceEx( | |
| current.data().toStdWString().c_str(), | |
| &FreeBytesAvailable, | |
| &TotalNumberOfBytes, | |
| &TotalNumberOfFreeBytes | |
| ); | |
| const BOOL ok = GetDiskFreeSpaceExW(current.data().toStdWString().c_str() | |
| , &freeBytesAvailable, &totalNumberOfBytes, &totalNumberOfFreeBytes); |
Comment on lines
+121
to
+124
| if (ok) | ||
| { | ||
| freeSpace = FreeBytesAvailable.QuadPart; | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (ok) | |
| { | |
| freeSpace = FreeBytesAvailable.QuadPart; | |
| } | |
| if (ok) | |
| freeSpace = freeBytesAvailable.QuadPart; |
| freeSpace = FreeBytesAvailable.QuadPart; | ||
| } | ||
| } | ||
| #endif |
| @@ -99,6 +104,27 @@ namespace | |||
| Path current = path; | |||
| qint64 freeSpace = Utils::Fs::freeDiskSpaceOnPath(current); | |||
|
|
|||
| // UNC path support on windows | |||
| #ifdef Q_OS_WIN | |||
There was a problem hiding this comment.
Suggested change
| #ifdef Q_OS_WIN | |
| #ifdef Q_OS_WIN |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add UNC path capacity calculation capability by invoking Windows API directly.
For #21954,
Can we get a confirmation on linux as well?