From 6a3724ef7ccf4b91ca070ff81b33ad2b1c670f56 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 31 May 2016 21:13:28 +0000 Subject: --- Merging r32277 into '.': U rtl/wince/sysutils.pp --- Recording mergeinfo for merge of r32277 into '.': U . # revisions: 32277 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33864 3ad0048d-3df7-0310-abae-a5850022a9f2 --- rtl/wince/sysutils.pp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/rtl/wince/sysutils.pp b/rtl/wince/sysutils.pp index 6990aa6255..e6a5faa2e0 100644 --- a/rtl/wince/sysutils.pp +++ b/rtl/wince/sysutils.pp @@ -763,9 +763,12 @@ begin end; -function WinCECompareWideString(const s1, s2 : WideString) : PtrInt; +function WinCECompareWideString(const s1, s2 : WideString; Options : TCompareOptions) : PtrInt; begin - Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0); + if coIgnoreCase in Options then + Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), NORM_IGNORECASE) + else + Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0); end; @@ -775,9 +778,12 @@ begin end; -function WinCECompareUnicodeString(const s1, s2 : UnicodeString) : PtrInt; +function WinCECompareUnicodeString(const s1, s2 : UnicodeString; Options : TCompareOptions) : PtrInt; begin - Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0); + if coIgnoreCase in Options then + Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), NORM_IGNORECASE) + else + Result:=DoCompareString(PWideChar(s1), PWideChar(s2), Length(s1), Length(s2), 0); end; @@ -925,9 +931,7 @@ end; procedure InitWinCEWidestrings; begin widestringmanager.CompareWideStringProc:=@WinCECompareWideString; - widestringmanager.CompareTextWideStringProc:=@WinCECompareTextWideString; widestringmanager.CompareUnicodeStringProc:=@WinCECompareUnicodeString; - widestringmanager.CompareTextUnicodeStringProc:=@WinCECompareTextUnicodeString; widestringmanager.UpperAnsiStringProc:=@WinCEAnsiUpperCase; widestringmanager.LowerAnsiStringProc:=@WinCEAnsiLowerCase; -- cgit v1.2.1