diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-01-28 11:03:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-28 11:03:23 +0100 |
commit | 9686d680b754337a4f399449a7e95fa2d2eb2324 (patch) | |
tree | 3f0d404b1764d5ca63219d8636c6b6a95d9c2ee5 /drivers/windows/dir_access_windows.cpp | |
parent | 26672df72e8aa09a9a7ec85cb442c50ebf87e251 (diff) | |
parent | cba82805156ada29993d18b4ceb0721636a3db80 (diff) |
Merge pull request #57116 from bruvzg/win_net_share
Diffstat (limited to 'drivers/windows/dir_access_windows.cpp')
-rw-r--r-- | drivers/windows/dir_access_windows.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 6cd21b5615..6f3bad12c1 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -165,8 +165,11 @@ Error DirAccessWindows::make_dir(String p_dir) { bool success; int err; - p_dir = "\\\\?\\" + p_dir; //done according to - // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363855(v=vs.85).aspx + if (!p_dir.is_network_share_path()) { + p_dir = "\\\\?\\" + p_dir; + // Add "\\?\" to the path to extend max. path length past 248, if it's not a network share UNC path. + // See https://msdn.microsoft.com/en-us/library/windows/desktop/aa363855(v=vs.85).aspx + } success = CreateDirectoryW((LPCWSTR)(p_dir.utf16().get_data()), nullptr); err = GetLastError(); @@ -349,6 +352,10 @@ String DirAccessWindows::get_filesystem_type() const { ERR_FAIL_COND_V(unit_end == -1, String()); String unit = path.substr(0, unit_end + 1) + "\\"; + if (path.is_network_share_path()) { + return "Network Share"; + } + WCHAR szVolumeName[100]; WCHAR szFileSystemName[10]; DWORD dwSerialNumber = 0; |