- reverted ansi2wide and wide2ansi changes, because they affect

third party sources too much

git-svn-id: trunk@2046 -
This commit is contained in:
Jonas Maebe 2005-12-24 01:40:23 +00:00
parent 5b9f58ef73
commit b08eccdbf0
5 changed files with 12 additions and 12 deletions

View File

@ -37,13 +37,13 @@ function WideCharLenToString(S : PWideChar;Len : SizeInt) : AnsiString;
procedure WideCharLenToStrVar(Src : PWideChar;Len : SizeInt;out Dest : AnsiString);
procedure WideCharToStrVar(S : PWideChar;out Dest : AnsiString);
procedure DefaultWide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
procedure DefaultAnsi2WideMove(source:pchar;out dest:widestring;len:SizeInt);
procedure DefaultWide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
procedure DefaultAnsi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
Type
TWideStringManager = record
Wide2AnsiMoveProc : procedure(source:pwidechar;out dest:ansistring;len:SizeInt);
Ansi2WideMoveProc : procedure(source:pchar;out dest:widestring;len:SizeInt);
Wide2AnsiMoveProc : procedure(source:pwidechar;var dest:ansistring;len:SizeInt);
Ansi2WideMoveProc : procedure(source:pchar;var dest:widestring;len:SizeInt);
// UpperUTF8 : procedure(p:PUTF8String);

View File

@ -51,7 +51,7 @@ Const
These routines can be overwritten for the Current Locale
}
procedure DefaultWide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
procedure DefaultWide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
var
i : SizeInt;
begin
@ -69,7 +69,7 @@ begin
end;
procedure DefaultAnsi2WideMove(source:pchar;out dest:widestring;len:SizeInt);
procedure DefaultAnsi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
var
i : SizeInt;
begin

View File

@ -107,7 +107,7 @@ var
iconv_ansi2wide,
iconv_wide2ansi : iconv_t;
procedure Wide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
procedure Wide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
var
outlength,
outoffset,
@ -160,7 +160,7 @@ procedure Wide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
end;
procedure Ansi2WideMove(source:pchar;out dest:widestring;len:SizeInt);
procedure Ansi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
var
outlength,
outoffset,

View File

@ -951,7 +951,7 @@ function CharLowerBuff(lpsz:LPWSTR; cchLength:DWORD):DWORD;
stdcall; external 'user32' name 'CharLowerBuffW';
procedure Win32Wide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
procedure Win32Wide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
var
destlen: SizeInt;
begin
@ -961,7 +961,7 @@ procedure Win32Wide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
WideCharToMultiByte(CP_ACP, 0, source, len+1, @dest[1], destlen, nil, nil);
end;
procedure Win32Ansi2WideMove(source:pchar;out dest:widestring;len:SizeInt);
procedure Win32Ansi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
var
destlen: SizeInt;
begin

View File

@ -1448,7 +1448,7 @@ function CharUpperBuff(lpsz:LPWSTR; cchLength:DWORD):DWORD; stdcall; external Ke
function CharLowerBuff(lpsz:LPWSTR; cchLength:DWORD):DWORD; stdcall; external KernelDLL name 'CharLowerBuffW';
procedure WinCEWide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
procedure WinCEWide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
var
i: integer;
begin
@ -1467,7 +1467,7 @@ procedure WinCEWide2AnsiMove(source:pwidechar;out dest:ansistring;len:SizeInt);
end;
end;
procedure WinCEAnsi2WideMove(source:pchar;out dest:widestring;len:SizeInt);
procedure WinCEAnsi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
var
i: integer;
begin