From 08099c85588304286bb5ad245afbc2abaa67f670 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 15 Jul 2013 09:21:03 +0000 Subject: [PATCH] * explicitly call *A routines from ansistring environment variable routines git-svn-id: branches/cpstrrtl@25102 - --- rtl/win/sysutils.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp index a2e79eb23f..9baf5c6ed0 100644 --- a/rtl/win/sysutils.pp +++ b/rtl/win/sysutils.pp @@ -978,7 +978,7 @@ begin oemenvvar:=uppercase(envvar); SetCodePage(oemenvvar,CP_OEMCP); Result:=''; - p:=GetEnvironmentStrings; + p:=GetEnvironmentStringsA; hp:=p; while hp^<>#0 do begin @@ -996,7 +996,7 @@ begin { next string entry} hp:=hp+hplen+1; end; - FreeEnvironmentStrings(p); + FreeEnvironmentStringsA(p); end; Function GetEnvironmentVariableCount : Integer; @@ -1005,7 +1005,7 @@ var hp,p : pchar; begin Result:=0; - p:=GetEnvironmentStrings; + p:=GetEnvironmentStringsA; hp:=p; If (Hp<>Nil) then while hp^<>#0 do @@ -1013,7 +1013,7 @@ begin Inc(Result); hp:=hp+strlen(hp)+1; end; - FreeEnvironmentStrings(p); + FreeEnvironmentStringsA(p); end; Function GetEnvironmentString(Index : Integer) : String; @@ -1022,7 +1022,7 @@ var hp,p : pchar; begin Result:=''; - p:=GetEnvironmentStrings; + p:=GetEnvironmentStringsA; hp:=p; If (Hp<>Nil) then begin @@ -1034,7 +1034,7 @@ begin If (hp^<>#0) then Result:=StrPas(HP); end; - FreeEnvironmentStrings(p); + FreeEnvironmentStringsA(p); end; {$pop}