[Jcl-checkins-diff] SF.net SVN: jcl: [2003] trunk/jcl/experts/debug/dialog

[<sch...@us...>]

Revision: 2003
          http://svn.sourceforge.net/jcl/?rev=2003&view=rev
Author:   schuettecarsten
Date:     2007-04-26 09:23:00 -0700 (Thu, 26 Apr 2007)

Log Message:
-----------
Added lost "AutoScroll=False" in dfm files (lost in Rev 1947)
Fixed compiler warning, added changes from Rev 2001 also to ExceptDlgMail.pas

Revision Links:
--------------
    http://svn.sourceforge.net/jcl/?rev=1947&view=rev
    http://svn.sourceforge.net/jcl/?rev=2001&view=rev

Modified Paths:
--------------
    trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlg.pas
    trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object %FORMNAME%: T%FORMNAME%
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 %ifnot SizeableDialog  BorderStyle = bsDialog%endif
   Caption = '%FORMNAME%'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object ExceptionDialog: TExceptionDialog
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 
   Caption = 'ExceptionDialog'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-26 16:23:00 UTC (rev 2003)
@@ -202,7 +202,9 @@
       CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
       Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
     end;
-  end;
+  end
+  else
+    Result := False;
 end;
 
 //============================================================================

Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object ExceptionDialogMail: TExceptionDialogMail
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 
   Caption = 'ExceptionDialogMail'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas	2007-04-26 16:23:00 UTC (rev 2003)
@@ -194,12 +194,17 @@
 begin
   TApplicationHandleExceptionAddr := PeMapImgResolvePackageThunk(@TApplication.HandleException);
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
-  Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
-  if Result then
+  if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
-    Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
-  end;
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    if Result then
+    begin
+      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
+    end;
+  end
+  else
+    Result := False;
 end;
 
 //============================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.