From 4a54f15b4763f23d5729797ed32fe67530578e25 Mon Sep 17 00:00:00 2001 From: Almindor Date: Thu, 7 Aug 2008 10:22:30 +0000 Subject: [PATCH] * fix GetAppConfigDir and GetTmpDir for Windows(R)(c)(TM) and WinCE, unify with unix and provide pathdelim at end git-svn-id: trunk@11529 - --- rtl/win/sysutils.pp | 4 ++-- rtl/wince/sysutils.pp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp index b1afd5f30b..17f6ab4d76 100644 --- a/rtl/win/sysutils.pp +++ b/rtl/win/sysutils.pp @@ -1050,10 +1050,10 @@ begin begin if VendorName<>'' then Result:=IncludeTrailingPathDelimiter(Result+VendorName); - Result:=Result+ApplicationName; + Result:=IncludeTrailingPathDelimiter(Result+ApplicationName); end else - Result:=DGetAppConfigDir(Global); + Result:=IncludeTrailingPathDelimiter(DGetAppConfigDir(Global)); end; Function GetAppConfigFile(Global : Boolean; SubDir : Boolean) : String; diff --git a/rtl/wince/sysutils.pp b/rtl/wince/sysutils.pp index 17425c9a21..f4c93971d0 100644 --- a/rtl/wince/sysutils.pp +++ b/rtl/wince/sysutils.pp @@ -749,10 +749,10 @@ begin begin if VendorName<>'' then Result:=IncludeTrailingPathDelimiter(Result+VendorName); - Result:=Result+ApplicationName; + Result:=IncludeTrailingPathDelimiter(Result+ApplicationName); end else - Result:=DGetAppConfigDir(Global); + Result:=IncludeTrailingPathDelimiter(DGetAppConfigDir(Global)); end; Function GetAppConfigFile(Global : Boolean; SubDir : Boolean) : String; @@ -768,6 +768,7 @@ begin SetLength(buf, MAX_PATH); SetLength(buf, GetTempPath(Length(buf) + 1, PWideChar(buf))); Result:=buf; + Result := IncludeTrailingPathDelimiter(Result); end; {****************************************************************************