Update SynEdit component code to tag 2.1.0-beta. Potentially helps fixing #57.

This commit is contained in:
Ansgar Becker
2017-12-31 11:28:13 +01:00
parent 9b167c2015
commit 6da2bd6d43
117 changed files with 26480 additions and 19297 deletions

View File

@ -49,7 +49,7 @@ Last Changes:
unit SynUnicode;
{$ENDIF}
{$I SynEdit.inc}
{$I SynEdit.Inc}
interface
@ -1652,7 +1652,7 @@ asm
JZ @@1
REPNE SCASW
JNE @@1
INC ECX
Inc ECX
@@1: SUB EBX,ECX
MOV EDI,ESI
MOV ESI,EDX
@ -1747,7 +1747,7 @@ begin
else if c > $7FF then
begin
if count + 3 > MaxDestBytes then
break;
Break;
Dest[count] := Char($E0 or (c shr 12));
Dest[count+1] := Char($80 or ((c shr 6) and $3F));
Dest[count+2] := Char($80 or (c and $3F));
@ -1756,7 +1756,7 @@ begin
else // $7F < Source[i] <= $7FF
begin
if count + 2 > MaxDestBytes then
break;
Break;
Dest[count] := Char($C0 or (c shr 6));
Dest[count+1] := Char($80 or (c and $3F));
Inc(count,2);
@ -1983,7 +1983,7 @@ end;
function WCharUpperBuff(lpsz: PWideChar; cchLength: DWORD): DWORD;
var
i: integer;
i: Integer;
begin
if Win32PlatformIsUnicode then
Result := Windows.CharUpperBuffW(lpsz, cchLength)
@ -2043,7 +2043,7 @@ end;
function WCharLowerBuff(lpsz: PWideChar; cchLength: DWORD): DWORD;
var
i: integer;
i: Integer;
begin
if Win32PlatformIsUnicode then
Result := Windows.CharLowerBuffW(lpsz, cchLength)
@ -2854,14 +2854,14 @@ var
function CountOfTrailingBytes: Integer;
begin
Result := 0;
inc(i);
Inc(i);
while (i < BufferSize) and (Result < 4) do
begin
if Buffer[i] in [$80..$BF] then
inc(Result)
Inc(Result)
else
Break;
inc(i);
Inc(i);
end;
end;
@ -2909,48 +2909,48 @@ begin
;
$C2..$DF:
if CountOfTrailingBytes = 1 then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
$E0:
begin
inc(i);
Inc(i);
if (i < BufferSize) and (Buffer[i] in [$A0..$BF]) and (CountOfTrailingBytes = 1) then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
end;
$E1..$EC, $EE..$EF:
if CountOfTrailingBytes = 2 then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
$ED:
begin
inc(i);
Inc(i);
if (i < BufferSize) and (Buffer[i] in [$80..$9F]) and (CountOfTrailingBytes = 1) then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
end;
$F0:
begin
inc(i);
Inc(i);
if (i < BufferSize) and (Buffer[i] in [$90..$BF]) and (CountOfTrailingBytes = 2) then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
end;
$F1..$F3:
if CountOfTrailingBytes = 3 then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
$F4:
begin
inc(i);
Inc(i);
if (i < BufferSize) and (Buffer[i] in [$80..$8F]) and (CountOfTrailingBytes = 2) then
inc(FoundUTF8Strings)
Inc(FoundUTF8Strings)
else
Break;
end;
@ -2967,7 +2967,7 @@ begin
Break;
end;
inc(i);
Inc(i);
end;
end;
end;
@ -3727,7 +3727,7 @@ begin
begin
PropInfo := PropList^[I];
if (PropInfo = nil) then
break;
Break;
if (PropInfo.PropType^.Kind = tkWString) then
UnicodeStringFiler.DefineProperties(Filer, Instance, PropInfo.Name)
else if (PropInfo.PropType^.Kind = tkWChar) then