paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 00:29:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

- RTL: merged functionality of InitWideStringManager into InitUnicodeStringManager and removed the former.

Browse Source 
git-svn-id: trunk@29130 -
This commit is contained in:
sergei 2014-11-23 21:09:00 +00:00
parent 2288df9fcf
commit ae68a4962f
4 changed files with 21 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rtl/inc/ustrings.inc
View File

@ -2286,19 +2286,22 @@ function StringCodePage(const S: UnicodeString): TSystemCodePage; overload;
{$warnings off}
function GenericUnicodeCase(const s : UnicodeString) : UnicodeString;
function StubUnicodeCase(const s : UnicodeString) : UnicodeString;
begin
unimplementedunicodestring;
end;
function CompareUnicodeString(const s1, s2 : UnicodeString) : PtrInt;
function StubCompareUnicodeString(const s1, s2 : UnicodeString) : PtrInt;
begin
unimplementedunicodestring;
end;
function StubWideCase(const s: WideString): WideString;
begin
unimplementedunicodestring;
end;
function CompareTextUnicodeString(const s1, s2 : UnicodeString): PtrInt;
function StubCompareWideString(const s1, s2 : WideString) : PtrInt;
begin
unimplementedunicodestring;
end;
@ -2307,24 +2310,23 @@ function CompareTextUnicodeString(const s1, s2 : UnicodeString): PtrInt;
procedure initunicodestringmanager;
begin
{$ifndef HAS_WIDESTRINGMANAGER}
{$ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.Ansi2WideMoveProc:=@defaultAnsi2UnicodeMove;
{$else FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.Ansi2WideMoveProc:=@DefaultAnsi2WideMove;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.Wide2AnsiMoveProc:=@DefaultUnicode2AnsiMove;
widestringmanager.UpperWideStringProc:=@StubWideCase;
widestringmanager.LowerWideStringProc:=@StubWideCase;
widestringmanager.Unicode2AnsiMoveProc:=@DefaultUnicode2AnsiMove;
widestringmanager.Ansi2UnicodeMoveProc:=@DefaultAnsi2UnicodeMove;
widestringmanager.UpperUnicodeStringProc:=@GenericUnicodeCase;
widestringmanager.LowerUnicodeStringProc:=@GenericUnicodeCase;
widestringmanager.UpperUnicodeStringProc:=@StubUnicodeCase;
widestringmanager.LowerUnicodeStringProc:=@StubUnicodeCase;
{$endif HAS_WIDESTRINGMANAGER}
widestringmanager.CompareUnicodeStringProc:=@CompareUnicodeString;
widestringmanager.CompareTextUnicodeStringProc:=@CompareTextUnicodeString;
{$ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING}
{$ifndef HAS_WIDESTRINGMANAGER}
widestringmanager.Wide2AnsiMoveProc:=@defaultUnicode2AnsiMove;
widestringmanager.Ansi2WideMoveProc:=@defaultAnsi2UnicodeMove;
widestringmanager.UpperWideStringProc:=@GenericUnicodeCase;
widestringmanager.LowerWideStringProc:=@GenericUnicodeCase;
{$endif HAS_WIDESTRINGMANAGER}
widestringmanager.CompareWideStringProc:=@CompareUnicodeString;
widestringmanager.CompareTextWideStringProc:=@CompareTextUnicodeString;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.CompareWideStringProc:=@StubCompareWideString;
widestringmanager.CompareTextWideStringProc:=@StubCompareWideString;
widestringmanager.CompareUnicodeStringProc:=@StubCompareUnicodeString;
widestringmanager.CompareTextUnicodeStringProc:=@StubCompareUnicodeString;
widestringmanager.CharLengthPCharProc:=@DefaultCharLengthPChar;
widestringmanager.CodePointLengthProc:=@DefaultCodePointLength;
widestringmanager.GetStandardCodePageProc:=@DefaultGetStandardCodePage;

34
rtl/inc/wstrings.inc
View File

@ -942,38 +942,4 @@ function UTF8Encode(const s : WideString) : RawByteString;
end;
end;
procedure unimplementedunicodestring; forward;
{$warnings off}
function GenericWideCase(const s : WideString) : WideString;
begin
unimplementedunicodestring;
end;
function CompareWideString(const s1, s2 : WideString) : PtrInt;
begin
unimplementedunicodestring;
end;
function CompareTextWideString(const s1, s2 : WideString): PtrInt;
begin
unimplementedunicodestring;
end;
{$warnings on}
procedure initwidestringmanager;
begin
fillchar(widestringmanager,sizeof(widestringmanager),0);
{$ifndef HAS_WIDESTRINGMANAGER}
widestringmanager.Wide2AnsiMoveProc:=@DefaultUnicode2AnsiMove;
widestringmanager.Ansi2WideMoveProc:=@DefaultAnsi2WideMove;
widestringmanager.UpperWideStringProc:=@GenericWideCase;
widestringmanager.LowerWideStringProc:=@GenericWideCase;
{$endif HAS_WIDESTRINGMANAGER}
widestringmanager.CompareWideStringProc:=@CompareWideString;
widestringmanager.CompareTextWideStringProc:=@CompareTextWideString;
end;

1
rtl/win32/system.pp
View File

@ -671,7 +671,6 @@ begin
SysInitExceptions;
{ setup fastmove stuff }
fpc_cpucodeinit;
initwidestringmanager;
initunicodestringmanager;
InitWin32Widestrings;
SysInitStdIO;

1
rtl/win64/system.pp
View File

@ -605,7 +605,6 @@ begin
InitSystemThreads;
end;
SysInitExceptions;
initwidestringmanager;
initunicodestringmanager;
InitWin32Widestrings;
SysInitStdIO;