Ver código fonte

* let GetDirIO() return its result in DefaultFileSystemCodePage, as its only
used internally and in combination with other strings in that code page

git-svn-id: trunk@28571 -

Jonas Maebe 11 anos atrás
pai
commit
74e56c2674
1 arquivos alterados com 4 adições e 0 exclusões
  1. 4 0
      rtl/inc/fexpand.inc

+ 4 - 0
rtl/inc/fexpand.inc

@@ -79,6 +79,10 @@ begin
   OldInOutRes := InOutRes;
   OldInOutRes := InOutRes;
   InOutRes := 0;
   InOutRes := 0;
   GetDir (DriveNr, Dir);
   GetDir (DriveNr, Dir);
+{$IF defined(FPC_FEXPAND_SYSUTILS) and not defined(SYSUTILSUNICODE)}
+  { set the same codepage as used for the strings in fexpand itself }
+  SetCodePage(Dir,DefaultFileSystemCodePage);
+{$ENDIF FPC_FEXPAND_SYSUTILS and not SYSUTILSUNICODE}
   InOutRes := OldInOutRes;
   InOutRes := OldInOutRes;
 end;
 end;