GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WindowsFileSystem::ShowBrowseFolderDialog path length

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-27 00:27:32 +01:00
parent 1679458094
commit cb8ba2d757
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Windows/ContentWindow.ContextMenu.cs
View File

@@ -224,7 +224,7 @@ namespace FlaxEditor.Windows
/// </summary>
private void ExportSelection()
{
if(FileSystem.ShowBrowseFolderDialog(Editor.Windows.MainWindow, null, "Select the output folder", out var outputFolder))
if (FileSystem.ShowBrowseFolderDialog(Editor.Windows.MainWindow, null, "Select the output folder", out var outputFolder))
return;
var selection = _view.Selection;

17
Source/Engine/Platform/Windows/WindowsFileSystem.cpp
View File

@@ -297,11 +297,6 @@ bool WindowsFileSystem::ShowBrowseFolderDialog(Window* parentWindow, const Strin
// Randomly generated GUID used for storing the last location of this dialog
const Guid folderGuid(0x53890ed9, 0xa55e47ba, 0xa970bdae, 0x72acedff);
// Allocate memory for the filenames
int32 maxPathSize = 2 * MAX_PATH;
Array<Char> pathBuffer;
pathBuffer.EnsureCapacity(maxPathSize);
ComPtr<IFileOpenDialog> fd;
if (SUCCEEDED(CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&fd))))
{
@@ -327,15 +322,9 @@ bool WindowsFileSystem::ShowBrowseFolderDialog(Window* parentWindow, const Strin
LPWSTR resultPath;
if (SUCCEEDED(si->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING, &resultPath)))
{
int32 resultPathLength = StringUtils::Length(resultPath);
if (resultPathLength < pathBuffer.Capacity())
{
StringUtils::Copy(pathBuffer.Get(), resultPath, resultPathLength);
CoTaskMemFree(resultPath);
path = pathBuffer.Get();
result = false;
}
path = resultPath;
CoTaskMemFree(resultPath);
result = false;
}
}
}