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

Win32: fix crash if CoCreateInstance fails (Vista IFileDialog). OpenDialog.Execute will return False, no dialog is shown, as this is Delphi compatible. Part of issue #40298.

Browse Source 
(cherry picked from commit 1c7ecdbb56)
This commit is contained in:
Bart 2025-01-04 15:41:02 +01:00 committed by Martin
parent 70f4f50636
commit 0b0cc5d47e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ unit Win32WSDialogs;
{$I win32defines.inc}
{.$DEFINE VerboseTaskDialog}
{.$define simulate_vistaf_filedialog_failure}
interface
@ -74,6 +75,13 @@ type
end;
{ TWin32WSOpenDialog }
{$ifdef simulate_vistaf_filedialog_failure}
const
CLSID_FileOpenDialog : TGUID = '{DC1C5A9C-E88A-4dde-A5A1-60F82A200000}';
CLSID_FileSaveDialog : TGUID = '{C0B4E2F3-BA21-4773-8DBA-335EC9000000}';
{$endif simulate_vistaf_filedialog_failure}
type
TWin32WSOpenDialog = class(TWSOpenDialog)
public
@ -1006,7 +1014,7 @@ class procedure TWin32WSOpenDialog.DestroyHandle(const ACommonDialog: TCommonDia
var
Dialog: IFileDialog;
begin
if ACommonDialog.Handle <> 0 then
if (ACommonDialog.Handle <> 0) and (ACommonDialog.Handle <> INVALID_HANDLE_VALUE) then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
begin
Dialog := IFileDialog(ACommonDialog.Handle);
@ -1086,7 +1094,7 @@ class procedure TWin32WSSaveDialog.DestroyHandle(const ACommonDialog: TCommonDia
var
Dialog: IFileDialog;
begin
if ACommonDialog.Handle <> 0 then
if (ACommonDialog.Handle <> 0) and (ACommonDialog.Handle <> INVALID_HANDLE_VALUE) then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
begin
Dialog := IFileDialog(ACommonDialog.Handle);
@ -1103,7 +1111,7 @@ var
lOldWorkingDir, lInitialDir: string;
Dialog: IFileSaveDialog;
begin
if ACommonDialog.Handle <> 0 then
if (ACommonDialog.Handle <> 0) and (ACommonDialog.Handle <> INVALID_HANDLE_VALUE) then
begin
State := SaveApplicationState;
lOldWorkingDir := GetCurrentDirUTF8;