paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 10:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Establishes an adequate storage location of dialogs caption under unicode win32.

Browse Source 
git-svn-id: trunk@12903 -
This commit is contained in:
sekelsenmat 2007-11-17 10:50:54 +00:00
parent 4fb8f0860e
commit 3c35462132
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,6 +332,7 @@ var
FileNameWideBuffer: PWideChar;
FileNameBufferSize: Integer;
FilterBuffer: WideString;
TitleBuffer: WideString;
begin
{$ifdef WindowsUnicodeSupport}
if UnicodeEnabledOS then
@ -397,7 +398,9 @@ begin
lpStrFilter := GetMem(Length(FilterBuffer) * 2 + 2);
Move(FilterBuffer[1], lpStrFilter^, Length(FilterBuffer) * 2 + 2);
lpStrTitle := PChar(PWideChar(Utf8Decode(AOpenDialog.Title)));
TitleBuffer := Utf8Decode(AOpenDialog.Title);
lpStrTitle := GetMem(Length(TitleBuffer) * 2 + 2);
Move(TitleBuffer[1], lpStrTitle^, Length(TitleBuffer) * 2 + 2);
end
else
begin
@ -406,7 +409,8 @@ begin
lpStrFilter := StrAlloc(Length(Filter)+1);
StrPCopy(lpStrFilter, Utf8ToAnsi(Filter));
lpStrTitle := PChar(Utf8ToAnsi(AOpenDialog.Title));
lpStrTitle := StrAlloc(Length(AOpenDialog.Title)+1);
StrPCopy(lpStrTitle, Utf8ToAnsi(AOpenDialog.Title));
end;
{$else}
lpStrFile := FileNameBuffer;
@ -584,8 +588,12 @@ begin
Dispose(POpenFileDialogRec(OPENFILE^.lCustData));
{$ifdef WindowsUnicodeSupport}
if UnicodeEnabledOS then FreeMem(OpenFile^.lpStrFilter)
else StrDispose(OpenFile^.lpStrFilter);
if UnicodeEnabledOS then
FreeMem(OpenFile^.lpStrFilter)
else
StrDispose(OpenFile^.lpStrFilter);
FreeMem(OpenFile^.lpStrTitle);
{$else}
StrDispose(OpenFile^.lpStrFilter);
{$endif}