paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-02-19 18:36:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: updated Win7 opensave dialog library dir selection. fix #16797

Browse Source 
git-svn-id: trunk@26471 -
This commit is contained in:
dmitry 2010-07-05 13:50:08 +00:00
parent ef4fa43915
commit 4b6492764d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -186,6 +186,24 @@ var
begin
FolderName := UTF16ToUTF8(DialogRec^.UnicodeFolderName);
FileNames := UTF16ToUTF8(DialogRec^.UnicodeFileNames);
if FolderName='' then
begin
// On Windows 7, the SendMessageW(GetParent(Wnd), CDM_GETFOLDERPATH, 0, LPARAM(nil))
// at UpdateStorage might fail (see #16797)
// However, the valid directory is returned in OpenFile^.lpstrFile
//
// What was the reason not to use OpenFile^.lpstrFile, since it's list
// of the selected files, without need of writting any callbacks!
FolderName:=UTF16ToUTF8(PWidechar(OpenFile^.lpstrFile));
// Check for DirectoryExistsUTF8(FolderName) is required, because Win 7
// sometimes returns a single file name in OpenFile^.lpstrFile, while
// OFN_ALLOWMULTISELECT is set
// to reproduce.
// 1. Allow mulitple files in OpenDialog options. Run the project.
// 2. OpenDialog.Execute -> Library -> Documens. Select a single file!
if (OpenFile^.Flags and OFN_ALLOWMULTISELECT=0) or not DirectoryExistsUTF8(FolderName) then
FolderName:=ExtractFileDir(FolderName);
end;
end
else
begin