From b08eccdbf041b5eaced2a24db7c2cbe204f5a9e2 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 24 Dec 2005 01:40:23 +0000 Subject: [PATCH] - reverted ansi2wide and wide2ansi changes, because they affect third party sources too much git-svn-id: trunk@2046 - --- rtl/inc/wstringh.inc | 8 ++++---- rtl/inc/wstrings.inc | 4 ++-- rtl/unix/cwstring.pp | 4 ++-- rtl/win32/system.pp | 4 ++-- rtl/wince/system.pp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rtl/inc/wstringh.inc b/rtl/inc/wstringh.inc index 79e69f6500..6ae7db9af7 100644 --- a/rtl/inc/wstringh.inc +++ b/rtl/inc/wstringh.inc @@ -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); diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc index 24e01308d5..352bf4b84e 100644 --- a/rtl/inc/wstrings.inc +++ b/rtl/inc/wstrings.inc @@ -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 diff --git a/rtl/unix/cwstring.pp b/rtl/unix/cwstring.pp index ae38620f7d..d460bbbdf7 100644 --- a/rtl/unix/cwstring.pp +++ b/rtl/unix/cwstring.pp @@ -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, diff --git a/rtl/win32/system.pp b/rtl/win32/system.pp index 9811da282f..3c54152428 100644 --- a/rtl/win32/system.pp +++ b/rtl/win32/system.pp @@ -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 diff --git a/rtl/wince/system.pp b/rtl/wince/system.pp index 1df7d67952..d97a1a27e6 100644 --- a/rtl/wince/system.pp +++ b/rtl/wince/system.pp @@ -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