paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 09:29:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

TTaskDialog: Win32 WS: prevent possible crash when accessing CustomMainIcon/CustomFooterIcon.

Browse Source
This commit is contained in:
Bart 2023-08-20 14:33:19 +02:00
parent e975ddddf5
commit 86c3d72d4d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1909,6 +1909,7 @@ var
Exclude(Flags,tfVerificationFlagChecked);
if (Config.cButtons=0) and (CommonButtons=[tcbOk]) then
Include(Flags,tfAllowDialogCancellation); // just OK -> Esc/Alt+F4 close
//while the MS docs say that this flag is ignored if Config.cButtons = 0,
//in practice it will make TaskDialogIndirect fail with E_INVALIDARG
if (ADlg.Buttons.Count = 0) then
@ -1918,12 +1919,22 @@ var
if not (tfUseHIconMain in Flags) then
Config.pszMainIcon := TD_ICONS[ADlg.MainIcon]
else
Config.hMainIcon := ADlg.CustomMainIcon.Handle;
begin
if Assigned(ADlg.CustomMainIcon) then
Config.hMainIcon := ADlg.CustomMainIcon.Handle
else
Config.hMainIcon := 0;
end;
if not (tfUseHIconFooter in Flags) then
Config.pszFooterIcon := TD_ICONS[ADlg.FooterIcon]
else
Config.hFooterIcon := ADlg.CustomFooterIcon.Handle;
begin
if Assigned(ADlg.CustomFooterIcon) then
Config.hFooterIcon := ADlg.CustomFooterIcon.Handle
else
Config.hFooterIcon := 0;
end;
{
Although the offcial MS docs (https://learn.microsoft.com/en-us/windows/win32/api/commctrl/ns-commctrl-taskdialogconfig)