paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-05-31 20:22:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: TObject.SafeCallException and TComponent.SafeCallException has HResult return value. Fix default return value to catastrophic failure error code.

Browse Source 
git-svn-id: trunk@14936 -
This commit is contained in:
paul 2010-02-25 04:13:52 +00:00
parent bfb7d91b74
commit ea8bf4f2fd
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/objpas.inc
View File

@ -378,10 +378,10 @@
end; end;
function TObject.SafeCallException(exceptobject : tobject; function TObject.SafeCallException(exceptobject : tobject;
exceptaddr : pointer) : longint; exceptaddr : pointer) : HResult;
begin begin
safecallexception:=0; safecallexception:=E_UNEXPECTED;
end; end;
class function TObject.ClassInfo : pointer; class function TObject.ClassInfo : pointer;

2
rtl/inc/objpash.inc
View File

@ -195,7 +195,7 @@
class function newinstance : tobject;virtual; class function newinstance : tobject;virtual;
procedure FreeInstance;virtual; procedure FreeInstance;virtual;
function SafeCallException(exceptobject : tobject; function SafeCallException(exceptobject : tobject;
exceptaddr : pointer) : longint;virtual; exceptaddr : pointer) : HResult;virtual;
procedure DefaultHandler(var message);virtual; procedure DefaultHandler(var message);virtual;
procedure Free; procedure Free;

2
rtl/objpas/classes/classesh.inc
View File

@ -1657,7 +1657,7 @@ type
procedure InsertComponent(AComponent: TComponent); procedure InsertComponent(AComponent: TComponent);
procedure RemoveComponent(AComponent: TComponent); procedure RemoveComponent(AComponent: TComponent);
function SafeCallException(ExceptObject: TObject; function SafeCallException(ExceptObject: TObject;
ExceptAddr: Pointer): Integer; override; ExceptAddr: Pointer): HResult; override;
procedure SetSubComponent(ASubComponent: Boolean); procedure SetSubComponent(ASubComponent: Boolean);
function UpdateAction(Action: TBasicAction): Boolean; dynamic; function UpdateAction(Action: TBasicAction): Boolean; dynamic;
// property ComObject: IUnknown read GetComObject; // property ComObject: IUnknown read GetComObject;

4
rtl/objpas/classes/compon.inc
View File

@ -608,10 +608,10 @@ end;
Function TComponent.SafeCallException(ExceptObject: TObject; Function TComponent.SafeCallException(ExceptObject: TObject;
ExceptAddr: Pointer): Integer; ExceptAddr: Pointer): HResult;
begin begin
SafeCallException:=0; SafeCallException:=inherited SafeCallException(ExceptObject, ExceptAddr);
end; end;
procedure TComponent.SetSubComponent(ASubComponent: Boolean); procedure TComponent.SetSubComponent(ASubComponent: Boolean);