Changeset 393 for trunk/Library

Timestamp:

May 1, 2016, 10:02:47 AM (9 years ago)

Author:

RBRi

Message:

add LogMem aspect (merged from old 2.20)

File:

• trunk/Library/DebugUnit.pas (modified) (10 diffs)

trunk/Library/DebugUnit.pas

@@ -2 +2 @@
 
 // NewView - a new OS/2 Help Viewer
-// Copyright 2006/2007 Ronald Brill (rbri at rbri dot de)
+// Copyright 2006-2009 Ronald Brill (rbri at rbri dot de)
 // This software is released under the GNU Public License - see readme.txt
 
@@ -29 +29 @@
                         LogViewStub,
                         LogObjConstDest,
-                        LogMem,
                         LogDebug
     );
     LogAspects = SET OF LogAspect;
 
-  Function IsLogAspectsEnabled(const aLogAspect: LogAspect) : boolean;
   Procedure LogEvent(const aLogAspect: LogAspect; const anEventDescription: String);
 
@@ -51 +49 @@
 
   Procedure SetLogAspects(const aCommaSeparatedListOfAspectNames : String);
+
+  Procedure writeDebugSetupDetailsTo(aStrings : TStrings);
 
 
@@ -59 +59 @@
   PMPrintfString : Function(aString : PChar) : ULONG; APIENTRY;
   activeLogAspects : LogAspects;
+  infoMessage1 : String;
+  infoMessage2 : String;
 
 
@@ -67 +69 @@
   BseDos,
   StringUtilsUnit;
+
+  Procedure writeDebugSetupDetailsTo(aStrings : TStrings);
+  begin
+    aStrings.Add('---- Debug ----');
+    aStrings.Add('  ' + infoMessage1);
+    aStrings.Add('  ' + infoMessage2);
+  end;
+
 
   FUNCTION LoadPMPrinfFLib : integer;
@@ -81 +91 @@
     tmpDllName:='PMPRINTF';
     tmpRC := DosLoadModule(tmpErrorInfo, 255, tmpDllName, PMPrintfModuleHandle);
+    infoMessage1 := 'DosLoadModule ' + tmpDllName + ' rc: ' + IntToStr(tmpRC);
     if tmpRC <> 0 then
     begin
@@ -90 +101 @@
     tmpProcedureName := 'PmPrintfString';
     tmpRC := DosQueryProcAddr(PMPrintfModuleHandle, 0, tmpProcedureName, tmpProcedureAddress);
+    infoMessage2 := 'DosQueryProcAddr ' + tmpProcedureName + ' rc: ' + IntToStr(tmpRC);
     if tmpRC <> 0 then
     begin
@@ -132 +144 @@
       LogViewStub     : result := 'ViewStub';
       LogObjConstDest : result := 'ObjConstDest';
-      LogMem          : result := 'Mem';
       LogDebug        : result := 'Debug';
       else              result := 'Unknown';
@@ -159 +170 @@
       if tmpAspects[i] = 'LogViewStub'     then activeLogAspects := activeLogAspects + [ LogViewStub ];
       if tmpAspects[i] = 'LogObjConstDest' then activeLogAspects := activeLogAspects + [ LogObjConstDest ];
-      if tmpAspects[i] = 'LogMem'          then activeLogAspects := activeLogAspects + [ LogMem ];
       if tmpAspects[i] = 'LogDebug'        then activeLogAspects := activeLogAspects + [ LogDebug ];
     end;
@@ -167 +177 @@
 
 
-  Function IsLogAspectsEnabled(const aLogAspect: LogAspect) : boolean;
-  Begin
-    result := aLogAspect IN activeLogAspects;
-  End;
-
-
   Procedure LogEvent(const aLogAspect: LogAspect; const anEventDescription: String);
   Var
     tmpMessage : String;
   Begin
-    if IsLogAspectsEnabled(aLogAspect) then
+    if (aLogAspect IN activeLogAspects) then
     begin
       tmpMessage := 'Log[' + GetAspectPrefix(aLogAspect) + ']  ' + anEventDescription;