Răsfoiți Sursa

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

git-svn-id: trunk@14936 -
paul 15 ani în urmă
părinte
comite
ea8bf4f2fd

+ 2 - 2
rtl/inc/objpas.inc

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

+ 1 - 1
rtl/inc/objpash.inc

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

+ 1 - 1
rtl/objpas/classes/classesh.inc

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

+ 2 - 2
rtl/objpas/classes/compon.inc

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