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

* StringToOleStr(UnicodeString), reduced to single SetString call, this way it does not depend on private functions and does not require $ifdef's.

Browse Source 
git-svn-id: trunk@20263 -
This commit is contained in:
sergei 2012-02-05 18:43:20 +00:00
parent f07d02b427
commit c3b106fde3
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rtl/win/sysos.inc
View File

@ -362,24 +362,10 @@ threadvar
end; end;
{$ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING}
Function NewUnicodeString(Len : SizeInt) : Pointer;forward;
{$else}
Function NewWideString(Len : SizeInt) : Pointer;forward;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
function StringToOleStr(const source : UnicodeString) : PWideChar;inline; function StringToOleStr(const source : UnicodeString) : PWideChar;inline;
begin begin
if source<>'' then result:=nil;
begin { will call UnicodeString overload if FPC_WIDESTRING_EQUAL_UNICODESTRING is set }
{$ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING} SetString(widestring(pointer(result)),PWideChar(source),length(source));
result:=NewUnicodeString(Length(source));
{$else}
result:=NewWideString(Length(source));
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
move(source[1],result^,Length(source));
end
else
result:=nil;
end; end;