mORMot and Open Source friends
Check-in [263e2e02fb]
Check-in [263e2e02fb]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | {4940} fixed SortDynArrayString on Delphi 2009+ (circumvent RTL's SysUtils.StrComp bug) |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
263e2e02fb22f0bb87fea0077e5ddf76 |
| User & Date: | ab 2019-01-04 11:57:08 |
|
2019-01-07
| ||
| 09:04 | {4941} proper detection of Windows Server 2019 edition check-in: 7809d533cc user: ab tags: trunk | |
|
2019-01-04
| ||
| 11:57 | {4940} fixed SortDynArrayString on Delphi 2009+ (circumvent RTL's SysUtils.StrComp bug) check-in: 263e2e02fb user: ab tags: trunk | |
|
2019-01-03
| ||
| 13:29 | {4939} ensure SynFPCLinux uses the regular Synopse.inc conditionals check-in: a9e2a5f401 user: ab tags: trunk | |
Changes to SynCommons.pas.
27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 ..... 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 ..... 47353 47354 47355 47356 47357 47358 47359 47360 47361 47362 47363 47364 47365 47366 47367 |
end;
if next<>nil then
next^ := FindNextUTF8WordBegin(U);
end;
{$ifdef USENORMTOUPPER}
function AnsiICompW(u1, u2: PWideChar): PtrInt;
begin
if u1<>u2 then
if u1<>nil then
if u2<>nil then
repeat
result := PtrInt(u1^)-PtrInt(u2^);
if result<>0 then begin
................................................................................
end;
{$else} // no NormToUpper[]
function AnsiIComp(Str1, Str2: PWinAnsiChar): integer;
{$ifdef PUREPASCAL}
begin
result := StrIComp(Str1,Str2); // fast enough
end;
{$else}
asm
jmp StrIComp // LVCL without NormToUpper[]: use default SysUtils implementation
end;
{$endif}
{$endif}
................................................................................
begin
result := StrIComp(PUTF8Char(A),PUTF8Char(B));
end;
function SortDynArrayString(const A,B): integer;
begin
{$ifdef UNICODE}
result := SysUtils.StrComp(PChar(A),PChar(B));
{$else}
result := StrComp(PUTF8Char(A),PUTF8Char(B));
{$endif}
end;
function SortDynArrayStringI(const A,B): integer;
begin
|
| | | |
27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 ..... 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 ..... 47353 47354 47355 47356 47357 47358 47359 47360 47361 47362 47363 47364 47365 47366 47367 |
end;
if next<>nil then
next^ := FindNextUTF8WordBegin(U);
end;
{$ifdef USENORMTOUPPER}
function AnsiICompW(u1, u2: PWideChar): PtrInt; {$ifdef HASINLINE}inline;{$endif}
begin
if u1<>u2 then
if u1<>nil then
if u2<>nil then
repeat
result := PtrInt(u1^)-PtrInt(u2^);
if result<>0 then begin
................................................................................
end;
{$else} // no NormToUpper[]
function AnsiIComp(Str1, Str2: PWinAnsiChar): integer;
{$ifdef PUREPASCAL}
begin
result := StrIComp(Str1,Str2); // fast enough, especially since inlined
end;
{$else}
asm
jmp StrIComp // LVCL without NormToUpper[]: use default SysUtils implementation
end;
{$endif}
{$endif}
................................................................................
begin
result := StrIComp(PUTF8Char(A),PUTF8Char(B));
end;
function SortDynArrayString(const A,B): integer;
begin
{$ifdef UNICODE}
result := StrCompW(PWideChar(A),PWideChar(B));
{$else}
result := StrComp(PUTF8Char(A),PUTF8Char(B));
{$endif}
end;
function SortDynArrayStringI(const A,B): integer;
begin
|
Changes to SynopseCommit.inc.
1 |
'1.18.4939'
|
| |
1 |
'1.18.4940'
|