* use thandle in do_*

rtl/bsd/osmain.inc

@@ -155,7 +155,7 @@ begin
   InoutRes:=Errno2InoutRes;
 end;
 
-Procedure Do_Close(Handle:Longint);
+Procedure Do_Close(Handle:thandle);
 Begin
   Fpclose(cint(Handle));
 End;
@@ -184,7 +184,7 @@ Begin
 End;
 
 { truncate at a given position }
-procedure do_truncate (handle,fpos:longint);
+procedure do_truncate (handle:thandle;fpos:longint);
 begin
   { should be simulated in cases where it is not }
   { available.                                   }
@@ -205,7 +205,7 @@ Begin
 End;
 
 
-Function Do_Write(Handle:Longint;Addr:Pointer;Len:Longint):longint;
+Function Do_Write(Handle:thandle;Addr:Pointer;Len:Longint):longint;
 
 var j : cint;
 Begin
@@ -223,7 +223,7 @@ Begin
 End;
 
 
-Function Do_Read(Handle:Longint;Addr:Pointer;Len:Longint):Longint;
+Function Do_Read(Handle:thandle;Addr:Pointer;Len:Longint):Longint;
 
 var j:cint;
 
@@ -241,7 +241,7 @@ Begin
    InOutRes:=0;
 End;
 
-function Do_FilePos(Handle: Longint):longint;
+function Do_FilePos(Handle: thandle):longint;
 Begin
   do_FilePos:=Fplseek(Handle, 0, SEEK_CUR);
   If Do_FilePos<0 Then
@@ -250,7 +250,7 @@ Begin
    InOutRes:=0;
 End;
 
-Procedure Do_Seek(Handle,Pos:Longint);
+Procedure Do_Seek(Handle:thandle;Pos:Longint);
 Begin
   If Fplseek(Handle, pos, SEEK_SET)<0 Then
    Errno2Inoutres
@@ -258,7 +258,7 @@ Begin
    InOutRes:=0;
 End;
 
-Function Do_SeekEnd(Handle:Longint): Longint;
+Function Do_SeekEnd(Handle:thandle): Longint;
 begin
   Do_SeekEnd:=Fplseek(Handle,0,SEEK_END);
   If Do_SeekEnd<0 Then
@@ -267,7 +267,7 @@ begin
    InOutRes:=0;
 end;
 
-Function Do_FileSize(Handle:Longint): Longint;
+Function Do_FileSize(Handle:thandle): Longint;
 var
   Info : Stat;
   Ret  : Longint;
@@ -593,7 +593,10 @@ end;
 
 {
    $Log$
-   Revision 1.13  2004-04-22 21:10:56  peter
+   Revision 1.14  2004-05-16 18:51:20  peter
+     * use thandle in do_*
+
+   Revision 1.13  2004/04/22 21:10:56  peter
      * do_read/do_write addr argument changed to pointer
 
    Revision 1.12  2004/01/06 15:42:05  marco

rtl/go32v2/system.pp

@@ -949,7 +949,7 @@ begin
    if p[i]='/' then p[i]:='\';
 end;
 
-procedure do_close(handle : longint);
+procedure do_close(handle : thandle);
 var
   regs : trealregs;
 begin
@@ -1019,7 +1019,7 @@ begin
 end;
 
 
-function do_write(h:longint;addr:pointer;len : longint) : longint;
+function do_write(h:thandle;addr:pointer;len : longint) : longint;
 var
   regs      : trealregs;
   size,
@@ -1054,7 +1054,7 @@ begin
 end;
 
 
-function do_read(h:longint;addr:pointer;len : longint) : longint;
+function do_read(h:thandle;addr:pointer;len : longint) : longint;
 var
   regs     : trealregs;
   size,
@@ -1090,7 +1090,7 @@ begin
 end;
 
 
-function do_filepos(handle : longint) : longint;
+function do_filepos(handle : thandle) : longint;
 var
   regs : trealregs;
 begin
@@ -1109,7 +1109,7 @@ begin
 end;
 
 
-procedure do_seek(handle,pos : longint);
+procedure do_seek(handle:thandle;pos : longint);
 var
   regs : trealregs;
 begin
@@ -1124,7 +1124,7 @@ end;
 
 
 
-function do_seekend(handle:longint):longint;
+function do_seekend(handle:thandle):longint;
 var
   regs : trealregs;
 begin
@@ -1143,7 +1143,7 @@ begin
 end;
 
 
-function do_filesize(handle : longint) : longint;
+function do_filesize(handle : thandle) : longint;
 var
   aktfilepos : longint;
 begin
@@ -1154,7 +1154,7 @@ end;
 
 
 { truncate at a given position }
-procedure do_truncate (handle,pos:longint);
+procedure do_truncate (handle:thandle;pos:longint);
 var
   regs : trealregs;
 begin
@@ -1607,7 +1607,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.34  2004-04-22 21:10:56  peter
+  Revision 1.35  2004-05-16 18:51:20  peter
+    * use thandle in do_*
+
+  Revision 1.34  2004/04/22 21:10:56  peter
     * do_read/do_write addr argument changed to pointer
 
   Revision 1.33  2004/01/25 13:05:08  jonas

rtl/inc/system.inc

@@ -761,7 +761,7 @@ Begin
 End;
 
 
-function do_isdevice(handle:longint):boolean;forward;
+function do_isdevice(handle:thandle):boolean;forward;
 
 Procedure dump_stack(var f : text;bp : Pointer);
 var
@@ -882,7 +882,10 @@ end;
 
 {
   $Log$
-  Revision 1.57  2004-05-01 15:26:33  jonas
+  Revision 1.58  2004-05-16 18:51:20  peter
+    * use thandle in do_*
+
+  Revision 1.57  2004/05/01 15:26:33  jonas
     * use some more string routines from libc if FPC_USE_LIBC is used
 
   Revision 1.56  2004/04/22 19:43:43  peter

rtl/linux/osmain.inc

@@ -153,21 +153,23 @@ begin
  PosixToRunError:=InOutRes;
 end;
 
-Function Errno2InoutRes : longint;
 
+Function Errno2InoutRes : longint;
 begin
   Errno2InoutRes:=PosixToRunError(getErrno);
   InoutRes:=Errno2InoutRes;
 end;
 
-Procedure Do_Close(Handle:Longint);
+
+Procedure Do_Close(Handle:thandle);
 Begin
   Fpclose(cint(Handle));
 End;
 
+
 Procedure Do_Erase(p:pchar);
 var
- fileinfo : stat;
+  fileinfo : stat;
 Begin
   { verify if the filename is actually a directory }
   { if so return error and do nothing, as defined  }
@@ -189,7 +191,7 @@ Begin
 End;
 
 { truncate at a given position }
-procedure do_truncate (handle,fpos:longint);
+procedure do_truncate (handle:thandle;fpos:longint);
 begin
   { should be simulated in cases where it is not }
   { available.                                   }
@@ -200,7 +202,6 @@ begin
 end;
 
 
-
 Procedure Do_Rename(p1,p2:pchar);
 Begin
   If Fprename(p1,p2)<0 Then
@@ -210,7 +211,7 @@ Begin
 End;
 
 
-Function Do_Write(Handle:SizeInt;Addr:Pointer;Len:SizeInt):SizeInt;
+Function Do_Write(Handle:thandle;Addr:Pointer;Len:SizeInt):SizeInt;
 Begin
   repeat
     Do_Write:=Fpwrite(Handle,addr,len);
@@ -225,7 +226,7 @@ Begin
 End;
 
 
-Function Do_Read(Handle:SizeInt;Addr:Pointer;Len:SizeInt):SizeInt;
+Function Do_Read(Handle:thandle;Addr:Pointer;Len:SizeInt):SizeInt;
 Begin
   repeat
     Do_Read:=Fpread(Handle,addr,len);
@@ -239,7 +240,8 @@ Begin
    InOutRes:=0;
 End;
 
-function Do_FilePos(Handle: Longint):longint;
+
+function Do_FilePos(Handle: thandle):longint;
 Begin
   do_FilePos:=Fplseek(Handle, 0, SEEK_CUR);
   If Do_FilePos<0 Then
@@ -248,7 +250,8 @@ Begin
    InOutRes:=0;
 End;
 
-Procedure Do_Seek(Handle,Pos:Longint);
+
+Procedure Do_Seek(Handle:thandle;Pos:Longint);
 Begin
   If Fplseek(Handle, pos, SEEK_SET)<0 Then
    Errno2Inoutres
@@ -256,7 +259,8 @@ Begin
    InOutRes:=0;
 End;
 
-Function Do_SeekEnd(Handle:Longint): Longint;
+
+Function Do_SeekEnd(Handle:thandle): Longint;
 begin
   Do_SeekEnd:=Fplseek(Handle,0,SEEK_END);
   If Do_SeekEnd<0 Then
@@ -265,7 +269,8 @@ begin
    InOutRes:=0;
 end;
 
-Function Do_FileSize(Handle:Longint): Longint;
+
+Function Do_FileSize(Handle:thandle): Longint;
 var
   Info : Stat;
   Ret  : Longint;
@@ -281,6 +286,7 @@ Begin
    InOutRes:=0;
 End;
 
+
 Procedure Do_Open(var f;p:pchar;flags:longint);
 {
   FileRec and textrec have both Handle and mode as the first items so
@@ -586,7 +592,10 @@ end;
 
 {
  $Log$
- Revision 1.17  2004-05-01 15:59:17  florian
+ Revision 1.18  2004-05-16 18:51:20  peter
+   * use thandle in do_*
+
+ Revision 1.17  2004/05/01 15:59:17  florian
    * x86_64 exception handling fixed
 
  Revision 1.16  2004/04/27 20:47:00  florian

rtl/linux/ossysc.inc

@@ -511,7 +511,7 @@ begin
     seterrno(0);
 end;
 
-Function Do_IsDevice(Handle:cint):boolean;
+Function Do_IsDevice(Handle:THandle):boolean;
 {
   Interface to Unix ioctl call.
   Performs various operations on the filedescriptor Handle.
@@ -529,7 +529,10 @@ end;
 
 {
  $Log$
- Revision 1.24  2004-05-01 15:59:17  florian
+ Revision 1.25  2004-05-16 18:51:20  peter
+   * use thandle in do_*
+
+ Revision 1.24  2004/05/01 15:59:17  florian
    * x86_64 exception handling fixed
 
  Revision 1.23  2004/04/27 20:47:00  florian

rtl/os2/system.pas

@@ -593,7 +593,7 @@ begin
         if p[i]='/' then p[i]:='\';
 end;
 
-procedure do_close(h:longint);
+procedure do_close(h:thandle);
 begin
 { Only three standard handles under real OS/2 }
   if h>2 then
@@ -618,7 +618,7 @@ begin
   inoutres:=DosMove(p1, p2);
 end;
 
-function do_read(h:longint;addr:pointer;len:longint):longint;
+function do_read(h:thandle;addr:pointer;len:longint):longint;
 Var
   T: cardinal;
 begin
@@ -632,7 +632,7 @@ begin
 {$endif}
 end;
 
-function do_write(h:longint;addr:pointer;len:longint) : longint;
+function do_write(h:thandle;addr:pointer;len:longint) : longint;
 Var
   T: cardinal;
 begin
@@ -646,7 +646,7 @@ begin
 {$endif}
 end;
 
-function do_filepos(handle:longint): longint;
+function do_filepos(handle:thandle): longint;
 var
   PosActual: cardinal;
 begin
@@ -657,7 +657,7 @@ begin
 {$endif}
 end;
 
-procedure do_seek(handle,pos:longint);
+procedure do_seek(handle:thandle;pos:longint);
 var
   PosActual: cardinal;
 begin
@@ -667,7 +667,7 @@ begin
 {$endif}
 end;
 
-function do_seekend(handle:longint):longint;
+function do_seekend(handle:thandle):longint;
 var
   PosActual: cardinal;
 begin
@@ -678,7 +678,7 @@ begin
 {$endif}
 end;
 
-function do_filesize(handle:longint):longint;
+function do_filesize(handle:thandle):longint;
 var aktfilepos: cardinal;
 begin
   aktfilepos:=do_filepos(handle);
@@ -686,7 +686,7 @@ begin
   do_seek(handle,aktfilepos);
 end;
 
-procedure do_truncate(handle,pos:longint);
+procedure do_truncate(handle:thandle;pos:longint);
 begin
   InOutRes:=DosSetFileSize(Handle, Pos);
   do_seekend(handle);
@@ -1501,7 +1501,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.70  2004-04-22 21:10:56  peter
+  Revision 1.71  2004-05-16 18:51:20  peter
+    * use thandle in do_*
+
+  Revision 1.70  2004/04/22 21:10:56  peter
     * do_read/do_write addr argument changed to pointer
 
   Revision 1.69  2004/03/24 19:23:09  hajny

rtl/win32/system.pp

@@ -299,29 +299,29 @@ end;
                           Low Level File Routines
 *****************************************************************************}
 
-   function WriteFile(fh:longint;buf:pointer;len:longint;var loaded:longint;
+   function WriteFile(fh:thandle;buf:pointer;len:longint;var loaded:longint;
      overlap:pointer):longint;
      stdcall;external 'kernel32' name 'WriteFile';
-   function ReadFile(fh:longint;buf:pointer;len:longint;var loaded:longint;
+   function ReadFile(fh:thandle;buf:pointer;len:longint;var loaded:longint;
      overlap:pointer):longint;
      stdcall;external 'kernel32' name 'ReadFile';
-   function CloseHandle(h : longint) : longint;
+   function CloseHandle(h : thandle) : longint;
      stdcall;external 'kernel32' name 'CloseHandle';
    function DeleteFile(p : pchar) : longint;
      stdcall;external 'kernel32' name 'DeleteFileA';
    function MoveFile(old,_new : pchar) : longint;
      stdcall;external 'kernel32' name 'MoveFileA';
-   function SetFilePointer(l1,l2 : longint;l3 : pointer;l4 : longint) : longint;
+   function SetFilePointer(l1,l2 : thandle;l3 : pointer;l4 : longint) : longint;
      stdcall;external 'kernel32' name 'SetFilePointer';
-   function GetFileSize(h:longint;p:pointer) : longint;
+   function GetFileSize(h:thandle;p:pointer) : longint;
      stdcall;external 'kernel32' name 'GetFileSize';
    function CreateFile(lpFileName:pchar; dwDesiredAccess:DWORD; dwShareMode:DWORD;
                        lpSecurityAttributes:PSECURITYATTRIBUTES; dwCreationDisposition:DWORD;
                        dwFlagsAndAttributes:DWORD; hTemplateFile:DWORD):longint;
      stdcall;external 'kernel32' name 'CreateFileA';
-   function SetEndOfFile(h : longint) : longbool;
+   function SetEndOfFile(h : thandle) : longbool;
      stdcall;external 'kernel32' name 'SetEndOfFile';
-   function GetFileType(Handle:DWORD):DWord;
+   function GetFileType(Handle:thandle):DWord;
      stdcall;external 'kernel32' name 'GetFileType';
    function GetFileAttributes(p : pchar) : dword;
      stdcall;external 'kernel32' name 'GetFileAttributesA';
@@ -335,13 +335,13 @@ begin
      if p[i]='/' then p[i]:='\';
 end;
 
-function do_isdevice(handle:longint):boolean;
+function do_isdevice(handle:thandle):boolean;
 begin
   do_isdevice:=(getfiletype(handle)=2);
 end;
 
 
-procedure do_close(h : longint);
+procedure do_close(h : thandle);
 begin
   if do_isdevice(h) then
    exit;
@@ -377,7 +377,7 @@ begin
 end;
 
 
-function do_write(h:longint;addr:pointer;len : longint) : longint;
+function do_write(h:thandle;addr:pointer;len : longint) : longint;
 var
    size:longint;
 begin
@@ -390,7 +390,7 @@ begin
 end;
 
 
-function do_read(h:longint;addr:pointer;len : longint) : longint;
+function do_read(h:thandle;addr:pointer;len : longint) : longint;
 var
   _result:longint;
 begin
@@ -406,7 +406,7 @@ begin
 end;
 
 
-function do_filepos(handle : longint) : longint;
+function do_filepos(handle : thandle) : longint;
 var
   l:longint;
 begin
@@ -421,7 +421,7 @@ begin
 end;
 
 
-procedure do_seek(handle,pos : longint);
+procedure do_seek(handle:thandle;pos : longint);
 begin
   if SetFilePointer(handle,pos,nil,FILE_BEGIN)=-1 then
    Begin
@@ -431,7 +431,7 @@ begin
 end;
 
 
-function do_seekend(handle:longint):longint;
+function do_seekend(handle:thandle):longint;
 begin
   do_seekend:=SetFilePointer(handle,0,nil,FILE_END);
   if do_seekend=-1 then
@@ -442,7 +442,7 @@ begin
 end;
 
 
-function do_filesize(handle : longint) : longint;
+function do_filesize(handle : thandle) : longint;
 var
   aktfilepos : longint;
 begin
@@ -452,7 +452,7 @@ begin
 end;
 
 
-procedure do_truncate (handle,pos:longint);
+procedure do_truncate (handle:thandle;pos:longint);
 begin
    do_seek(handle,pos);
    if not(SetEndOfFile(handle)) then
@@ -1406,7 +1406,7 @@ begin
                     end
                   else
                     res := SysHandleErrorFrame(216, frame, true);
-                        
+
                 STATUS_CONTROL_C_EXIT:
                         res := SysHandleErrorFrame(217, frame, true);
                 STATUS_PRIVILEGED_INSTRUCTION:
@@ -1608,7 +1608,10 @@ end.
 
 {
   $Log$
-  Revision 1.55  2004-04-22 21:10:56  peter
+  Revision 1.56  2004-05-16 18:51:20  peter
+    * use thandle in do_*
+
+  Revision 1.55  2004/04/22 21:10:56  peter
     * do_read/do_write addr argument changed to pointer
 
   Revision 1.54  2004/02/15 21:37:18  hajny