- atavism with the alternative MS_DB_EVENT_GETTEXT implementation removed;

- warning fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@6433 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 1 insertions, 36 deletions

diff --git a/plugins/HistoryPlusPlus/Checksum.pas b/plugins/HistoryPlusPlus/Checksum.pas
index 777d15af4a..5612b396fc 100644
--- a/plugins/HistoryPlusPlus/Checksum.pas
+++ b/plugins/HistoryPlusPlus/Checksum.pas
@@ -82,7 +82,6 @@ end;
 

 function BaseToDig(const Str: AnsiString): TDig64;

 var

-  DigStr: AnsiString;

   BufLen: int;

   Buf: PByte;

 begin

diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index 0201e7b6b0..e178ee01ce 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -112,7 +112,6 @@ function GetEventRecord(const Hi: THistoryItem): PEventRecord;
 function GetMessageType(EventInfo: TDBEventInfo; var EventIndex: Integer): TMessageTypes;

 // global routines

 function GetEventCoreText(EventInfo: TDBEventInfo; var Hi: THistoryItem): Boolean;

-function GetEventModuleText(EventInfo: TDBEventInfo; var Hi: THistoryItem): Boolean;

 // specific routines

 procedure GetEventTextForMessage(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForFile(EventInfo: TDBEventInfo; var Hi: THistoryItem);

@@ -489,9 +488,7 @@ begin
       Result.RTLMode := hppRTLEnable;

     Result.MessageType := GetMessageType(EventInfo, EventIndex);

     Result.CodePage := UseCP;

-    // Handled := true;

-    // if Handled then Handled := GetEventCoreText(EventInfo,Result);

-    { if Handled then } Handled := GetEventModuleText(EventInfo, Result);

+    Handled := GetEventCoreText(EventInfo,Result);

     if not Handled then

       EventTable[EventIndex].TextFunction(EventInfo, Result);

     Result.Text := AdjustLineBreaks(Result.Text);

@@ -550,37 +547,6 @@ begin
   end;

 end;

 

-function GetEventModuleText(EventInfo: TDBEventInfo; var Hi: THistoryItem): Boolean;

-const

-  maxServiceLength = 99;

-var

-  dbegt: TDBEVENTGETTEXT;

-  msg: Pointer;

-  szServiceName: array[0..maxServiceLength] of AnsiChar;

-begin

-  Result := False;

-  dbegt.dbei := @EventInfo;

-  dbegt.datatype := DBVT_WCHAR;

-  dbegt.codepage := hi.Codepage;

-  try

-    StrLFmt(szServiceName,maxServiceLength,'%s/GetEventText%u',[EventInfo.szModule,EventInfo.eventType]);

-    Result := Boolean(ServiceExists(szServiceName));

-  except

-  end;

-  if not Result then exit;

-  msg := nil;

-  try

-    msg := Pointer(CallService(szServiceName,0,LPARAM(@dbegt)));

-    Result := Assigned(msg);

-  except

-    if Assigned(msg) then mir_free(msg);

-  end;

-  if Result then begin

-    SetString(hi.Text,PChar(msg),StrLen(PChar(msg)));

-    mir_free(msg);

-  end;

-end;

-

 procedure GetEventTextForMessage(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 var

   msgA: PAnsiChar;