paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-22 10:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: lresources: using SysUtils.CompareText instead of AnsiCompareText - resources must work independent of codepage

Browse Source 
git-svn-id: trunk@42799 -
This commit is contained in:
mattias 2013-09-14 17:08:50 +00:00
parent a4adc98fda
commit cada2a7337
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/lresources.pp
View File

@ -1495,7 +1495,7 @@ begin
for I := P - 1 downto 0 do for I := P - 1 downto 0 do
begin begin
Result := TLResource(FList[I]); Result := TLResource(FList[I]);
if AnsiCompareText(Result.Name,Name)<>0 then if SysUtils.CompareText(Result.Name,Name)<>0 then
break; break;
if Result.ValueType = ValueType then if Result.ValueType = ValueType then
Exit; Exit;
@ -1504,7 +1504,7 @@ begin
for I := P to FList.Count - 1 do for I := P to FList.Count - 1 do
begin begin
Result := TLResource(FList[I]); Result := TLResource(FList[I]);
if AnsiCompareText(Result.Name,Name)<>0 then if SysUtils.CompareText(Result.Name,Name)<>0 then
break; break;
if Result.ValueType = ValueType then if Result.ValueType = ValueType then
Exit; Exit;
@ -1524,7 +1524,7 @@ begin
while (L <= R) do while (L <= R) do
begin begin
Result := (L + R) shr 1; Result := (L + R) shr 1;
C := AnsiCompareText(Name, TLResource(FList[Result]).Name); C := SysUtils.CompareText(Name, TLResource(FList[Result]).Name);
if C < 0 then if C < 0 then
R := Result - 1 R := Result - 1
else else
@ -1563,7 +1563,7 @@ begin
begin begin
r1:=TLResource(FList[i]); r1:=TLResource(FList[i]);
r2:=TLResource(FList[i+1]); r2:=TLResource(FList[i+1]);
if (AnsiCompareText(r1.Name,r2.Name)=0) and (r1.ValueType=r2.ValueType) then if (SysUtils.CompareText(r1.Name,r2.Name)=0) and (r1.ValueType=r2.ValueType) then
begin begin
DebugLn(['TLResourceList.Sort ',i,' DUPLICATE RESOURCE FOUND: ',r1.Name,':',r1.ValueType]); DebugLn(['TLResourceList.Sort ',i,' DUPLICATE RESOURCE FOUND: ',r1.Name,':',r1.ValueType]);
//DumpStack; //DumpStack;
@ -1581,7 +1581,7 @@ begin
end else end else
if Pos1 + 1 = Pos2 then if Pos1 + 1 = Pos2 then
begin begin
cmp := AnsiCompareText(TLResource(List[Pos1]).Name, TLResource(List[Pos2]).Name); cmp := SysUtils.CompareText(TLResource(List[Pos1]).Name, TLResource(List[Pos2]).Name);
if cmp > 0 then if cmp > 0 then
begin begin
MergeList[Pos1] := List[Pos1]; MergeList[Pos1] := List[Pos1];
@ -1613,7 +1613,7 @@ begin
DestPos := Pos3; DestPos := Pos3;
while (Src2Pos >= Pos2) and (Src1Pos >= Pos1) do while (Src2Pos >= Pos2) and (Src1Pos >= Pos1) do
begin begin
cmp:=AnsiCompareText(TLResource(List[Src1Pos]).Name, TLResource(List[Src2Pos]).Name); cmp:=SysUtils.CompareText(TLResource(List[Src1Pos]).Name, TLResource(List[Src2Pos]).Name);
if cmp > 0 then if cmp > 0 then
begin begin
MergeList[DestPos] := List[Src1Pos]; MergeList[DestPos] := List[Src1Pos];