From c370aa5db5bbf862b8dcbeafa987efb236dae5f6 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 15 Mar 2012 22:59:28 +0000 Subject: [PATCH] synedit: fixed uninitialized variables git-svn-id: trunk@36049 - --- components/synedit/lazsyntextarea.pp | 2 +- components/synedit/syneditfoldedview.pp | 4 ++-- components/synedit/synedithighlighterfoldbase.pas | 6 +++--- components/synedit/syneditkeycmds.pp | 1 + components/synedit/syneditmousecmds.pp | 2 ++ components/synedit/synpluginsyncronizededitbase.pp | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/synedit/lazsyntextarea.pp b/components/synedit/lazsyntextarea.pp index 4537ffdcc5..fbe7499c55 100644 --- a/components/synedit/lazsyntextarea.pp +++ b/components/synedit/lazsyntextarea.pp @@ -525,7 +525,7 @@ begin if (AClip.Top < FTextBounds.Top) then begin PadRect2 := Bounds; PadRect2.Bottom := FTextBounds.Top; - IntersectRect(PadRect, AClip, PadRect2); + IntersectRect(PadRect{%H-}, AClip, PadRect2); InternalFillRect(dc, PadRect); end; if (AClip.Bottom > FTextBounds.Bottom) then begin diff --git a/components/synedit/syneditfoldedview.pp b/components/synedit/syneditfoldedview.pp index 60a3a93c90..eba53faf09 100644 --- a/components/synedit/syneditfoldedview.pp +++ b/components/synedit/syneditfoldedview.pp @@ -952,9 +952,9 @@ procedure TSynEditFoldExportStream.Compress; [NNXX[ (more then 21 bytes, from up to 64*64 back) ]X (3 bytes from max 64 back) ]nx ( reocurring space,x times, ever n pos) -*) const max_single_len = 22 - 1; + *) var CurPos, EndPos, SearchPos: Integer; FndLen, FndPos, FndPos2: Integer; @@ -4574,7 +4574,7 @@ end; function dbgs(AClassification: TFoldNodeClassification): String; begin - WriteStr(Result, AClassification); + WriteStr(Result{%H-}, AClassification); end; {$IFDEF SynDebug} diff --git a/components/synedit/synedithighlighterfoldbase.pas b/components/synedit/synedithighlighterfoldbase.pas index ecf49e5f87..6783fec86e 100644 --- a/components/synedit/synedithighlighterfoldbase.pas +++ b/components/synedit/synedithighlighterfoldbase.pas @@ -150,7 +150,7 @@ type protected function DefaultGroup: Integer; virtual; function MinCapacity: Integer; virtual; - procedure InvalidateNode(var AnInfo: TSynFoldNodeInfo); + procedure InvalidateNode(out AnInfo: TSynFoldNodeInfo); function Match(const AnInfo: TSynFoldNodeInfo; AnActionFilter: TSynFoldActions; AGroupFilter: Integer = 0): Boolean; virtual; public @@ -437,7 +437,7 @@ begin Result:=''; for i := low(TSynFoldAction) to high(TSynFoldAction) do if i in AFoldActions then begin - WriteStr(s, i); + WriteStr(s{%H-}, i); Result := Result + s + ','; end; if Result <> '' then Result := '[' + copy(Result, 1, Length(Result)-1) + ']'; @@ -549,7 +549,7 @@ begin Result := 8; end; -procedure TLazSynFoldNodeInfoList.InvalidateNode(var AnInfo: TSynFoldNodeInfo); +procedure TLazSynFoldNodeInfoList.InvalidateNode(out AnInfo: TSynFoldNodeInfo); begin AnInfo.FoldAction := [sfaInvalid]; AnInfo.LineIndex := Line; diff --git a/components/synedit/syneditkeycmds.pp b/components/synedit/syneditkeycmds.pp index 4bc914475b..9c642751d3 100644 --- a/components/synedit/syneditkeycmds.pp +++ b/components/synedit/syneditkeycmds.pp @@ -1101,6 +1101,7 @@ procedure TSynEditKeyStrokes.LoadFromStream(AStream: TStream); var Num: integer; begin + Num := 0; AStream.Read(Num, SizeOf(Num)); while Num > 0 do begin with Add do diff --git a/components/synedit/syneditmousecmds.pp b/components/synedit/syneditmousecmds.pp index 5963c73410..d6c4818682 100644 --- a/components/synedit/syneditmousecmds.pp +++ b/components/synedit/syneditmousecmds.pp @@ -415,11 +415,13 @@ end; function SynMouseCmdToIdent(SynMouseCmd: Longint; out Ident: String): Boolean; begin + Ident := ''; Result := IntToIdent(SynMouseCmd, Ident, SynMouseCommandNames); end; function IdentToSynMouseCmd(const Ident: string; out SynMouseCmd: Longint): Boolean; begin + SynMouseCmd := 0; Result := IdentToInt(Ident, SynMouseCmd, SynMouseCommandNames); end; diff --git a/components/synedit/synpluginsyncronizededitbase.pp b/components/synedit/synpluginsyncronizededitbase.pp index 613ad00724..c2121d6fd7 100644 --- a/components/synedit/synpluginsyncronizededitbase.pp +++ b/components/synedit/synpluginsyncronizededitbase.pp @@ -26,7 +26,7 @@ unit SynPluginSyncronizedEditBase; interface uses - Classes, SysUtils, Graphics, LCLProc, SynEditTextBase, + Classes, SysUtils, Graphics, LCLProc, SynEditMiscClasses, SynEdit, SynEditMarkup, SynEditMiscProcs, LazSynEditText, SynEditTextTrimmer, SynEditKeyCmds;