Sfoglia il codice sorgente

* Make dos unit compilable.

git-svn-id: branches/unicodertl@12179 -
yury 17 anni fa
parent
commit
1e2bdf367b
3 ha cambiato i file con 12 aggiunte e 12 eliminazioni
  1. 1 1
      rtl/inc/dos.inc
  2. 6 6
      rtl/inc/dosh.inc
  3. 5 5
      rtl/win/dos.pp

+ 1 - 1
rtl/inc/dos.inc

@@ -16,7 +16,7 @@
 
  **********************************************************************}
 
-procedure DoDirSeparators(var p:shortstring);
+procedure DoDirSeparators(var p:RtlString);
 var
   i : longint;
 begin

+ 6 - 6
rtl/inc/dosh.inc

@@ -57,11 +57,11 @@ Const
 
 Type
 { Needed for LFN Support }
-  ComStr  = String[FileNameLen];
-  PathStr = String[FileNameLen];
-  DirStr  = String[FileNameLen];
-  NameStr = String[FileNameLen];
-  ExtStr  = String[FileNameLen];
+  ComStr  = RtlString;
+  PathStr = RtlString;
+  DirStr  = RtlString;
+  NameStr = RtlString;
+  ExtStr  = RtlString;
 
 {
   filerec.inc contains the definition of the filerec.
@@ -113,7 +113,7 @@ Procedure FindClose(Var f: SearchRec);
 {File}
 Procedure GetFAttr(var f; var attr: word);
 Procedure GetFTime(var f; var time: longint);
-Function  FSearch(path: pathstr; dirlist: string): pathstr;
+Function  FSearch(path: pathstr; dirlist: RtlString): pathstr;
 Function  FExpand(const path: pathstr): pathstr;
 Procedure FSplit(path: pathstr; var dir: dirstr; var name: namestr; var ext: extstr);
 function  GetShortName(var p : String) : boolean;

+ 5 - 5
rtl/win/dos.pp

@@ -520,10 +520,10 @@ function GetWinFileTime(h : longint;creation,lastaccess,lastwrite : PWinFileTime
   stdcall; external 'kernel32' name 'GetFileTime';
 function SetWinFileTime(h : longint;creation,lastaccess,lastwrite : PWinFileTime) : longbool;
   stdcall; external 'kernel32' name 'SetFileTime';
-function SetFileAttributes(lpFileName : pchar;dwFileAttributes : longint) : longbool;
-  stdcall; external 'kernel32' name 'SetFileAttributesA';
-function GetFileAttributes(lpFileName : pchar) : longint;
-  stdcall; external 'kernel32' name 'GetFileAttributesA';
+function SetFileAttributes(lpFileName : pwidechar;dwFileAttributes : longint) : longbool;
+  stdcall; external 'kernel32' name 'SetFileAttributesW';
+function GetFileAttributes(lpFileName : pwidechar) : longint;
+  stdcall; external 'kernel32' name 'GetFileAttributesW';
 
 
 { <immobilizer> }
@@ -534,7 +534,7 @@ function GetShortPathName(lpszLongPath:pchar; lpszShortPath:pchar; cchBuffer:DWO
     stdcall; external 'kernel32' name 'GetShortPathNameA';
 
 
-Function FSearch(path: pathstr; dirlist: string): pathstr;
+Function FSearch(path: pathstr; dirlist: RtlString): pathstr;
 var
   p1     : longint;
   s      : searchrec;