paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 05:49:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set the UnicodeCompare functions in the WideString manager also for WinCE and implement the Wide- and UnicodeCompare functions similar to Win32/64 by calling a common DoCompareString function.

Browse Source 
git-svn-id: trunk@23574 -
This commit is contained in:
svenbarth 2013-02-05 16:33:42 +00:00
parent a4e0a4c0f5
commit c6c67dc182
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rtl/wince/sysutils.pp
View File

@ -780,23 +780,36 @@ end;
****************************************************************************} ****************************************************************************}
function WinCECompareWideString(const s1, s2 : WideString) : PtrInt; function DoCompareString(P1, P2: PWideChar; L1, L2: PtrUInt; Flags: DWORD): PtrInt;
begin begin
SetLastError(0); SetLastError(0);
Result:=CompareString(LOCALE_USER_DEFAULT,0,pwidechar(s1), Result:=CompareString(LOCALE_USER_DEFAULT,Flags,P1,L1,P2,L2)-2;
length(s1),pwidechar(s2),length(s2))-2;
if GetLastError<>0 then if GetLastError<>0 then
RaiseLastOSError; RaiseLastOSError;
end; end;
function WinCECompareWideString(const s1, s2 : WideString) : PtrInt;
begin
Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0);
end;
function WinCECompareTextWideString(const s1, s2 : WideString) : PtrInt; function WinCECompareTextWideString(const s1, s2 : WideString) : PtrInt;
begin begin
SetLastError(0); Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), NORM_IGNORECASE);
Result:=CompareString(LOCALE_USER_DEFAULT,NORM_IGNORECASE,pwidechar(s1), end;
length(s1),pwidechar(s2),length(s2))-2;
if GetLastError<>0 then
RaiseLastOSError; function WinCECompareUnicodeString(const s1, s2 : UnicodeString) : PtrInt;
begin
Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0);
end;
function WinCECompareTextUnicodeString(const s1, s2 : UnicodeString) : PtrInt;
begin
Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), NORM_IGNORECASE);
end; end;
@ -939,6 +952,8 @@ procedure InitWinCEWidestrings;
begin begin
widestringmanager.CompareWideStringProc:=@WinCECompareWideString; widestringmanager.CompareWideStringProc:=@WinCECompareWideString;
widestringmanager.CompareTextWideStringProc:=@WinCECompareTextWideString; widestringmanager.CompareTextWideStringProc:=@WinCECompareTextWideString;
widestringmanager.CompareUnicodeStringProc:=@WinCECompareUnicodeString;
widestringmanager.CompareTextUnicodeStringProc:=@WinCECompareTextUnicodeString;
widestringmanager.UpperAnsiStringProc:=@WinCEAnsiUpperCase; widestringmanager.UpperAnsiStringProc:=@WinCEAnsiUpperCase;
widestringmanager.LowerAnsiStringProc:=@WinCEAnsiLowerCase; widestringmanager.LowerAnsiStringProc:=@WinCEAnsiLowerCase;