JEDI Code Library

Revision: 3111
          http://jcl.svn.sourceforge.net/jcl/?rev=3111&view=rev
Author:   outchy
Date:     2010-01-05 19:16:24 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
The RootDir registry value is not available when the packages are manually installed. Thus the exception dialog template cannot be loaded. This template is now embedded as a resource to make the expert working in such a configuration.

Modified Paths:
--------------
    trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas

Added Paths:
-----------
    trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.RES
    trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.rc

Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas	2010-01-04 22:59:52 UTC (rev 3110)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas	2010-01-05 19:16:24 UTC (rev 3111)
@@ -98,20 +98,23 @@
   JclOtaResources, JclOtaConsts,
   JclOtaTemplates, JclOtaRepositoryReg, JclOtaExcDlgWizard;
 
+{$R JclOtaExcDlgTemplates.res}
+
 //=== { TJclExcDlgExpert } ===================================================
 
 procedure TJclExcDlgExpert.CreateExceptionDialog(
   const Params: TJclOtaExcDlgParams);
-  function LoadTemplate(const FileName: string): string;
+  function LoadTemplate(const TemplatePath, FileName: string): string;
   var
     AFileStream: TFileStream;
+    AResourceStream: TResourceStream;
     StreamLength: Int64;
     AnsiResult: AnsiString;
   begin
     AnsiResult := '';
-    if FileName <> '' then
+    if (TemplatePath <> '') and (FileName <> '') then
     begin
-      AFileStream := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
+      AFileStream := TFileStream.Create(TemplatePath + FileName, fmOpenRead or fmShareDenyWrite);
       try
         StreamLength := AFileStream.Size;
         SetLength(AnsiResult, StreamLength);
@@ -119,6 +122,18 @@
       finally
         AFileStream.Free;
       end;
+    end
+    else
+    if (FileName <> '') then
+    begin
+      AResourceStream := TResourceStream.Create(HInstance, StringReplace(FileName, '.', '', [rfReplaceAll]), 'EXCDLG');
+      try
+        StreamLength := AResourceStream.Size;
+        SetLength(AnsiResult, StreamLength);
+        AResourceStream.ReadBuffer(AnsiResult[1], StreamLength);
+      finally
+        AResourceStream.Free;
+      end;
     end;
     Result := string(AnsiResult);
   end;
@@ -135,26 +150,29 @@
 begin
   OTAServices := GetOTAServices;
   JclSettingsKeyName := StrEnsureSuffix('\', OTAServices.GetBaseRegistryKey) + RegJclKey;
-  TemplatePath := PathAddSeparator(RegReadString(HKCU, JclSettingsKeyName, 'RootDir')) + TemplateSubDir;
 
+  TemplatePath := RegReadStringDef(HKCU, JclSettingsKeyName, JclRootDirValueName, '');
+  if TemplatePath <> '' then
+    TemplatePath := PathAddSeparator(TemplatePath) + TemplateSubDir;
+
   case Params.Language of
     bpDelphi32:
       begin
         FormExtension := JclBorDesignerFormExtension[Params.Designer];
-        FormTemplate := TemplatePath + DelphiTemplate + FormExtension;
+        FormTemplate := DelphiTemplate + FormExtension;
         HeaderExtension := '';
         HeaderTemplate := '';
         SourceExtension := SourceExtensionPAS;
-        SourceTemplate := TemplatePath + DelphiTemplate + SourceExtension;
+        SourceTemplate := DelphiTemplate + SourceExtension;
       end;
     bpBCBuilder32:
       begin
         FormExtension := JclBorDesignerFormExtension[Params.Designer];
-        FormTemplate := TemplatePath + BCBTemplate + FormExtension;
+        FormTemplate := BCBTemplate + FormExtension;
         HeaderExtension := SourceExtensionH;
-        HeaderTemplate := TemplatePath + BCBTemplate + HeaderExtension;
+        HeaderTemplate := BCBTemplate + HeaderExtension;
         SourceExtension := SourceExtensionCPP;
-        SourceTemplate := TemplatePath + BCBTemplate + SourceExtension;
+        SourceTemplate := BCBTemplate + SourceExtension;
       end;
   else
       begin
@@ -167,9 +185,9 @@
       end;
   end;
 
-  FormTemplate := LoadTemplate(FormTemplate);
-  HeaderTemplate := LoadTemplate(HeaderTemplate);
-  SourceTemplate := LoadTemplate(SourceTemplate);
+  FormTemplate := LoadTemplate(TemplatePath, FormTemplate);
+  HeaderTemplate := LoadTemplate(TemplatePath, HeaderTemplate);
+  SourceTemplate := LoadTemplate(TemplatePath, SourceTemplate);
 
   FormContent := ApplyTemplate(FormTemplate, Params);
   HeaderContent := ApplyTemplate(HeaderTemplate, Params);

Added: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.RES
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.RES
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.rc
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.rc	                        (rev 0)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.rc	2010-01-05 19:16:24 UTC (rev 3111)
@@ -0,0 +1,5 @@
+ExceptDlgDelphi32pas EXCDLG LOADONCALL MOVEABLE DISCARDABLE "Templates\ExceptDlg.Delphi32.pas"
+ExceptDlgDelphi32dfm EXCDLG LOADONCALL MOVEABLE DISCARDABLE "Templates\ExceptDlg.Delphi32.dfm"
+ExceptDlgCBuilder32h EXCDLG LOADONCALL MOVEABLE DISCARDABLE "Templates\ExceptDlg.CBuilder32.h"
+ExceptDlgCBuilder32cpp EXCDLG LOADONCALL MOVEABLE DISCARDABLE "Templates\ExceptDlg.CBuilder32.cpp"
+ExceptDlgCBuilder32dfm EXCDLG LOADONCALL MOVEABLE DISCARDABLE "Templates\ExceptDlg.CBuilder32.dfm"
\ No newline at end of file


Property changes on: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTemplates.rc
___________________________________________________________________
Added: svn:eol-style
   + native


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

Revision: 3389
          http://jcl.svn.sourceforge.net/jcl/?rev=3389&view=rev
Author:   outchy
Date:     2010-10-25 08:28:53 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
make the standard exception dialog happy with JCL rev 3385.

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

Modified Paths:
--------------
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.dfm
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
    trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2010-10-25 07:39:47 UTC (rev 3388)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2010-10-25 08:28:53 UTC (rev 3389)
@@ -384,12 +384,14 @@
       ProcessorDetails := ProcessorDetails + ' SSE3';
     if ssse3 in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSSE3';
+    if sse41 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE41';
+    if sse42 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE42';
     if sse4A in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSE4A';
-    if sse4B in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE4B';
     if sse5 in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE';
+      ProcessorDetails := ProcessorDetails + ' SSE5';
     if CpuInfo.Ex3DNow then
       ProcessorDetails := ProcessorDetails + ' 3DNow!ex';
     if CpuInfo._3DNow then

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.dfm
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.dfm	2010-10-25 07:39:47 UTC (rev 3388)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.dfm	2010-10-25 08:28:53 UTC (rev 3389)
@@ -3,6 +3,7 @@
   Top = 255
   AutoScroll = False
   BorderIcons = [biSystemMenu]
+
   Caption = 'ExceptionDialogMail'
   ClientHeight = 283
   ClientWidth = 483
@@ -33,6 +34,7 @@
     Anchors = [akLeft, akTop, akRight]
     Shape = bsTopLine
   end
+
   object SendBtn: TButton
     Left = 403
     Top = 32
@@ -44,6 +46,7 @@
     TabOrder = 0
     OnClick = SendBtnClick
   end
+
   object SaveBtn: TButton
     Left = 403
     Top = 60

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2010-10-25 07:39:47 UTC (rev 3388)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2010-10-25 08:28:53 UTC (rev 3389)
@@ -408,12 +408,14 @@
       ProcessorDetails := ProcessorDetails + ' SSE3';
     if ssse3 in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSSE3';
+    if sse41 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE41';
+    if sse42 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE42';
     if sse4A in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSE4A';
-    if sse4B in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE4B';
     if sse5 in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE';
+      ProcessorDetails := ProcessorDetails + ' SSE5';
     if CpuInfo.Ex3DNow then
       ProcessorDetails := ProcessorDetails + ' 3DNow!ex';
     if CpuInfo._3DNow then

Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2010-10-25 07:39:47 UTC (rev 3388)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2010-10-25 08:28:53 UTC (rev 3389)
@@ -429,12 +429,14 @@
       ProcessorDetails := ProcessorDetails + ' SSE3';
     if ssse3 in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSSE3';
+    if sse41 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE41';
+    if sse42 in CpuInfo.SSE then
+      ProcessorDetails := ProcessorDetails + ' SSE42';
     if sse4A in CpuInfo.SSE then
       ProcessorDetails := ProcessorDetails + ' SSE4A';
-    if sse4B in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE4B';
     if sse5 in CpuInfo.SSE then
-      ProcessorDetails := ProcessorDetails + ' SSE';
+      ProcessorDetails := ProcessorDetails + ' SSE5';
     if CpuInfo.Ex3DNow then
       ProcessorDetails := ProcessorDetails + ' 3DNow!ex';
     if CpuInfo._3DNow then


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

Revision: 3615
          http://jcl.svn.sourceforge.net/jcl/?rev=3615&view=rev
Author:   outchy
Date:     2011-10-23 18:26:07 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Mantis 5684: Exception dialog should be set with Typed Pointer Off.

Modified Paths:
--------------
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
    trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-10-17 08:54:26 UTC (rev 3614)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-10-23 18:26:07 UTC (rev 3615)
@@ -317,8 +317,8 @@
   UnitVersion: TUnitVersion;
   ModuleIndex, UnitIndex: Integer;
 begin
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsMainThreadID), [MainThreadID]));
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsExceptionThreadID), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsMainThreadID)), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsExceptionThreadID)), [MainThreadID]));
   NextDetailBlock;
 
   SL := TStringList.Create;
@@ -328,7 +328,7 @@
     if Assigned(StackList) then
     begin
       DetailsMemo.Lines.Add(RsExceptionStack);
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
       NextDetailBlock;
     end;
@@ -337,8 +337,8 @@
     StackList := JclCreateThreadStackTraceFromID(True, MainThreadID);
     if Assigned(StackList) then
     begin
-      DetailsMemo.Lines.Add(LoadResString(@RsMainThreadCallStack));
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(LoadResString(PResStringRec(@RsMainThreadCallStack)));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
       NextDetailBlock;
     end;
@@ -356,7 +356,7 @@
           if Assigned(StackList) then
           begin
             DetailsMemo.Lines.Add(Format(RsThreadCallStack, [AThreadID, ThreadList.ThreadInfos[AThreadID], ThreadList.ThreadNames[AThreadID]]));
-            DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+            DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
             StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
             NextDetailBlock;
           end;
@@ -452,7 +452,7 @@
           if UnitVersioningModule.Instance = ModuleBase then
           begin
             if UnitVersioningModule.Count > 0 then
-              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(@RsUnitVersioningIntro));
+              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(PResStringRec(@RsUnitVersioningIntro)));
             for UnitIndex := 0 to UnitVersioningModule.Count - 1 do
             begin
               UnitVersion := UnitVersioningModule.Items[UnitIndex];

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-10-17 08:54:26 UTC (rev 3614)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-10-23 18:26:07 UTC (rev 3615)
@@ -340,8 +340,8 @@
   UnitVersion: TUnitVersion;
   ModuleIndex, UnitIndex: Integer;
 begin
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsMainThreadID), [MainThreadID]));
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsExceptionThreadID), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsMainThreadID)), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsExceptionThreadID)), [MainThreadID]));
   NextDetailBlock;
 
   SL := TStringList.Create;
@@ -351,7 +351,7 @@
     if Assigned(StackList) then
     begin
       DetailsMemo.Lines.Add(RsExceptionStack);
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
       NextDetailBlock;
     end;
@@ -360,8 +360,8 @@
     StackList := JclCreateThreadStackTraceFromID(True, MainThreadID);
     if Assigned(StackList) then
     begin
-      DetailsMemo.Lines.Add(LoadResString(@RsMainThreadCallStack));
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(LoadResString(PResStringRec(@RsMainThreadCallStack)));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
       NextDetailBlock;
     end;
@@ -379,7 +379,7 @@
           if Assigned(StackList) then
           begin
             DetailsMemo.Lines.Add(Format(RsThreadCallStack, [AThreadID, ThreadList.ThreadInfos[AThreadID], ThreadList.ThreadNames[AThreadID]]));
-            DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+            DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
             StackList.AddToStrings(DetailsMemo.Lines, True, True, True, True);
             NextDetailBlock;
           end;
@@ -475,7 +475,7 @@
           if UnitVersioningModule.Instance = ModuleBase then
           begin
             if UnitVersioningModule.Count > 0 then
-              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(@RsUnitVersioningIntro));
+              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(PResStringRec(@RsUnitVersioningIntro)));
             for UnitIndex := 0 to UnitVersioningModule.Count - 1 do
             begin
               UnitVersion := UnitVersioningModule.Items[UnitIndex];

Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-10-17 08:54:26 UTC (rev 3614)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-10-23 18:26:07 UTC (rev 3615)
@@ -348,8 +348,8 @@
   UnitVersion: TUnitVersion;
   ModuleIndex, UnitIndex: Integer;{$ENDIF}
 begin
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsMainThreadID), [MainThreadID]));
-  DetailsMemo.Lines.Add(Format(LoadResString(@RsExceptionThreadID), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsMainThreadID)), [MainThreadID]));
+  DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsExceptionThreadID)), [MainThreadID]));
   NextDetailBlock;
 
   SL := TStringList.Create;
@@ -359,7 +359,7 @@
     if Assigned(StackList) then
     begin
       DetailsMemo.Lines.Add(RsExceptionStack);
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, {$JPPBOOLVALUE ModuleName}, {$JPPBOOLVALUE ModuleOffset}, {$JPPBOOLVALUE CodeDetails}, {$JPPBOOLVALUE VirtualAddress});
       NextDetailBlock;
     end;
@@ -368,8 +368,8 @@
     StackList := JclCreateThreadStackTraceFromID({$JPPBOOLVALUE RawData}, MainThreadID);
     if Assigned(StackList) then
     begin
-      DetailsMemo.Lines.Add(LoadResString(@RsMainThreadCallStack));
-      DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+      DetailsMemo.Lines.Add(LoadResString(PResStringRec(@RsMainThreadCallStack)));
+      DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
       StackList.AddToStrings(DetailsMemo.Lines, {$JPPBOOLVALUE ModuleName}, {$JPPBOOLVALUE ModuleOffset}, {$JPPBOOLVALUE CodeDetails}, {$JPPBOOLVALUE VirtualAddress});
       NextDetailBlock;
     end;{$ENDIF}
@@ -379,8 +379,8 @@
       StackList := JclCreateThreadStackTraceFromID({$JPPBOOLVALUE RawData}, FThreadID);
       if Assigned(StackList) then
       begin
-        DetailsMemo.Lines.Add(Format(LoadResString(@RsExceptionThreadCallStack), [FThreadID]));
-        DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+        DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsExceptionThreadCallStack)), [FThreadID]));
+        DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
         StackList.AddToStrings(DetailsMemo.Lines, {$JPPBOOLVALUE ModuleName}, {$JPPBOOLVALUE ModuleOffset}, {$JPPBOOLVALUE CodeDetails}, {$JPPBOOLVALUE VirtualAddress});
         NextDetailBlock;
       end;
@@ -398,7 +398,7 @@
           if Assigned(StackList) then
           begin
             DetailsMemo.Lines.Add(Format(RsThreadCallStack, [AThreadID, ThreadList.ThreadInfos[AThreadID], ThreadList.ThreadNames[AThreadID]]));
-            DetailsMemo.Lines.Add(Format(LoadResString(@RsStackList), [DateTimeToStr(StackList.TimeStamp)]));
+            DetailsMemo.Lines.Add(Format(LoadResString(PResStringRec(@RsStackList)), [DateTimeToStr(StackList.TimeStamp)]));
             StackList.AddToStrings(DetailsMemo.Lines, {$JPPBOOLVALUE ModuleName}, {$JPPBOOLVALUE ModuleOffset}, {$JPPBOOLVALUE CodeDetails}, {$JPPBOOLVALUE VirtualAddress});
             NextDetailBlock;
           end;
@@ -496,7 +496,7 @@
           if UnitVersioningModule.Instance = ModuleBase then
           begin
             if UnitVersioningModule.Count > 0 then
-              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(@RsUnitVersioningIntro));
+              DetailsMemo.Lines.Add(StrRepeat(' ', 11) + LoadResString(PResStringRec(@RsUnitVersioningIntro)));
             for UnitIndex := 0 to UnitVersioningModule.Count - 1 do
             begin
               UnitVersion := UnitVersioningModule.Items[UnitIndex];

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

Revision: 3649
          http://jcl.svn.sourceforge.net/jcl/?rev=3649&view=rev
Author:   outchy
Date:     2011-12-27 19:11:45 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5747: 64-bit incompatibility in ExceptDlgMail.pas.

Modified Paths:
--------------
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
    trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-12-27 19:11:45 UTC (rev 3649)
@@ -136,10 +136,10 @@
 function SortModulesListByAddressCompare(List: TStringList;
   Index1, Index2: Integer): Integer;
 var
-  Addr1, Addr2: Cardinal;
+  Addr1, Addr2: TJclAddr;
 begin
-  Addr1 := Cardinal(List.Objects[Index1]);
-  Addr2 := Cardinal(List.Objects[Index2]);
+  Addr1 := TJclAddr(List.Objects[Index1]);
+  Addr2 := TJclAddr(List.Objects[Index2]);
   if Addr1 > Addr2 then
     Result := 1
   else if Addr1 < Addr2 then
@@ -188,15 +188,15 @@
   function CheckAddressForOffset(Offset: Cardinal): Boolean;
   begin
     try
-      CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+      CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
       CALLInstruction.Call := $E8;
       Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
       if Result then
       begin
         if IsCompiledWithPackages then
-          Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+          Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
         else
-          Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+          Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       end;
     except
       Result := False;
@@ -211,7 +211,7 @@
     Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
     if Result then
     begin
-      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
     end;
   end
@@ -418,7 +418,7 @@
       for I := 0 to SL.Count - 1 do
       begin
         ModuleName := SL[I];
-        ModuleBase := Cardinal(SL.Objects[I]);
+        ModuleBase := TJclAddr(SL.Objects[I]);
         DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
         PETarget := PeMapImgTarget(Pointer(ModuleBase));
         NtHeaders32 := nil;

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-12-27 19:11:45 UTC (rev 3649)
@@ -138,10 +138,10 @@
 function SortModulesListByAddressCompare(List: TStringList;
   Index1, Index2: Integer): Integer;
 var
-  Addr1, Addr2: Cardinal;
+  Addr1, Addr2: TJclAddr;
 begin
-  Addr1 := Cardinal(List.Objects[Index1]);
-  Addr2 := Cardinal(List.Objects[Index2]);
+  Addr1 := TJclAddr(List.Objects[Index1]);
+  Addr2 := TJclAddr(List.Objects[Index2]);
   if Addr1 > Addr2 then
     Result := 1
   else if Addr1 < Addr2 then
@@ -190,15 +190,15 @@
   function CheckAddressForOffset(Offset: Cardinal): Boolean;
   begin
     try
-      CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+      CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
       CALLInstruction.Call := $E8;
       Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
       if Result then
       begin
         if IsCompiledWithPackages then
-          Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+          Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
         else
-          Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+          Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       end;
     except
       Result := False;
@@ -213,7 +213,7 @@
     Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
     if Result then
     begin
-      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
     end;
   end
@@ -441,7 +441,7 @@
       for I := 0 to SL.Count - 1 do
       begin
         ModuleName := SL[I];
-        ModuleBase := Cardinal(SL.Objects[I]);
+        ModuleBase := TJclAddr(SL.Objects[I]);
         DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
         PETarget := PeMapImgTarget(Pointer(ModuleBase));
         NtHeaders32 := nil;

Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-12-27 19:11:45 UTC (rev 3649)
@@ -139,10 +139,10 @@
 function SortModulesListByAddressCompare(List: TStringList;
   Index1, Index2: Integer): Integer;
 var
-  Addr1, Addr2: Cardinal;
+  Addr1, Addr2: TJclAddr;
 begin
-  Addr1 := Cardinal(List.Objects[Index1]);
-  Addr2 := Cardinal(List.Objects[Index2]);
+  Addr1 := TJclAddr(List.Objects[Index1]);
+  Addr2 := TJclAddr(List.Objects[Index2]);
   if Addr1 > Addr2 then
     Result := 1
   else if Addr1 < Addr2 then
@@ -191,15 +191,15 @@
   function CheckAddressForOffset(Offset: Cardinal): Boolean;
   begin
     try
-      CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+      CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
       CALLInstruction.Call := $E8;
       Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
       if Result then
       begin
         if IsCompiledWithPackages then
-          Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+          Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
         else
-          Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+          Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       end;
     except
       Result := False;
@@ -214,7 +214,7 @@
     Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
     if Result then
     begin
-      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
       Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
     end;
   end
@@ -462,7 +462,7 @@
       for I := 0 to SL.Count - 1 do
       begin
         ModuleName := SL[I];
-        ModuleBase := Cardinal(SL.Objects[I]);
+        ModuleBase := TJclAddr(SL.Objects[I]);
         DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
         PETarget := PeMapImgTarget(Pointer(ModuleBase));
         NtHeaders32 := nil;

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

Revision: 3655
          http://jcl.svn.sourceforge.net/jcl/?rev=3655&view=rev
Author:   outchy
Date:     2011-12-28 20:59:49 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Mantis 5747: 64-bit incompatibility in ExceptDlgMail.pas.

Modified Paths:
--------------
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
    trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
    trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas	2011-12-28 20:59:49 UTC (rev 3655)
@@ -171,8 +171,10 @@
 
 function HookTApplicationHandleException: Boolean;
 const
-  CallOffset      = $86;
-  CallOffsetDebug = $94;
+  CallOffset      = $86;   // Until D2007
+  CallOffsetDebug = $94;   // Until D2007
+  CallOffsetWin32 = $7A;   // D2009 and newer
+  CallOffsetWin64 = $95;   // DXE2 for Win64
 type
   PCALLInstruction = ^TCALLInstruction;
   TCALLInstruction = packed record
@@ -208,7 +210,8 @@
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
   if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+      CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
     if Result then
     begin
       CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -303,7 +306,7 @@
   ModuleName: TFileName;
   NtHeaders32: PImageNtHeaders32;
   NtHeaders64: PImageNtHeaders64;
-  ModuleBase: Cardinal;
+  ModuleBase: TJclAddr;
   ImageBaseStr: string;
   C: TWinControl;
   CpuInfo: TCpuInfo;

Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas	2011-12-28 20:59:49 UTC (rev 3655)
@@ -173,8 +173,10 @@
 
 function HookTApplicationHandleException: Boolean;
 const
-  CallOffset      = $86;
-  CallOffsetDebug = $94;
+  CallOffset      = $86;   // Until D2007
+  CallOffsetDebug = $94;   // Until D2007
+  CallOffsetWin32 = $7A;   // D2009 and newer
+  CallOffsetWin64 = $95;   // DXE2 for Win64
 type
   PCALLInstruction = ^TCALLInstruction;
   TCALLInstruction = packed record
@@ -210,7 +212,8 @@
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
   if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+      CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
     if Result then
     begin
       CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -326,7 +329,7 @@
   ModuleName: TFileName;
   NtHeaders32: PImageNtHeaders32;
   NtHeaders64: PImageNtHeaders64;
-  ModuleBase: Cardinal;
+  ModuleBase: TJclAddr;
   ImageBaseStr: string;
   C: TWinControl;
   CpuInfo: TCpuInfo;

Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas	2011-12-28 20:59:49 UTC (rev 3655)
@@ -174,8 +174,10 @@
 
 function HookTApplicationHandleException: Boolean;
 const
-  CallOffset      = $86;
-  CallOffsetDebug = $94;
+  CallOffset      = $86;   // Until D2007
+  CallOffsetDebug = $94;   // Until D2007
+  CallOffsetWin32 = $7A;   // D2009 and newer
+  CallOffsetWin64 = $95;   // DXE2 for Win64
 type
   PCALLInstruction = ^TCALLInstruction;
   TCALLInstruction = packed record
@@ -211,7 +213,8 @@
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
   if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+      CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
     if Result then
     begin
       CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -334,7 +337,7 @@
   ModuleName: TFileName;
   NtHeaders32: PImageNtHeaders32;
   NtHeaders64: PImageNtHeaders64;
-  ModuleBase: Cardinal;
+  ModuleBase: TJclAddr;
   ImageBaseStr: string;{$ENDIF}
 {$IFDEF ActiveControls}  C: TWinControl;{$ENDIF}
 {$IFDEF OSInfo}  CpuInfo: TCpuInfo;

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