* another bunch of type corrections

This commit is contained in:
Tomas Hajny 2002-11-18 19:51:00 +00:00
parent ad35b52837
commit 466b5d9d58
2 changed files with 19 additions and 11 deletions

View File

@ -846,7 +846,7 @@ procedure FindFirst (const Path: PathStr; Attr: word; var F: SearchRec);
var path0: array[0..255] of char; var path0: array[0..255] of char;
Count: longint; Count: cardinal;
begin begin
{No error.} {No error.}
@ -856,7 +856,7 @@ begin
New (F.FStat); New (F.FStat);
F.Handle := $FFFFFFFF; F.Handle := $FFFFFFFF;
Count := 1; Count := 1;
DosError := Integer(DosFindFirst (Path, F.Handle, DosError := integer (DosFindFirst (Path, F.Handle,
Attr and FindResvdMask, F.FStat, SizeOf (F.FStat^), Attr and FindResvdMask, F.FStat, SizeOf (F.FStat^),
Count, ilStandard)); Count, ilStandard));
if (DosError = 0) and (Count = 0) then DosError := 18; if (DosError = 0) and (Count = 0) then DosError := 18;
@ -883,7 +883,7 @@ end;
procedure FindNext (var F: SearchRec); procedure FindNext (var F: SearchRec);
var Count: longint; var Count: cardinal;
begin begin
@ -893,7 +893,8 @@ begin
if os_mode = osOS2 then if os_mode = osOS2 then
begin begin
Count := 1; Count := 1;
DosError := Integer(DosFindNext (F.Handle, F.FStat, SizeOf (F.FStat^), Count)); DosError := integer (DosFindNext (F.Handle, F.FStat, SizeOf (F.FStat^),
Count));
if (DosError = 0) and (Count = 0) then DosError := 18; if (DosError = 0) and (Count = 0) then DosError := 18;
end else _findnext (F); end else _findnext (F);
DosSearchRec2SearchRec (F); DosSearchRec2SearchRec (F);
@ -1217,7 +1218,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.19 2002-09-07 16:01:24 peter Revision 1.20 2002-11-18 19:51:00 hajny
* another bunch of type corrections
Revision 1.19 2002/09/07 16:01:24 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
Revision 1.18 2002/07/11 16:00:05 hajny Revision 1.18 2002/07/11 16:00:05 hajny

View File

@ -192,11 +192,12 @@ function DosScanEnv (Name: PChar; var Value: PChar): longint; cdecl;
external 'DOSCALLS' index 227; external 'DOSCALLS' index 227;
function DosFindFirst (FileMask: PChar; var Handle: longint; Attrib: longint; function DosFindFirst (FileMask: PChar; var Handle: longint; Attrib: longint;
AFileStatus: PFileStatus; FileStatusLen: longint; AFileStatus: PFileStatus; FileStatusLen: cardinal;
var Count: longint; InfoLevel: longint): longint; cdecl; var Count: cardinal; InfoLevel: cardinal): longint; cdecl;
external 'DOSCALLS' index 264; external 'DOSCALLS' index 264;
function DosFindNext (Handle: longint; AFileStatus: PFileStatus; function DosFindNext (Handle: longint; AFileStatus: PFileStatus;
FileStatusLen: longint; var Count: longint): longint; cdecl; FileStatusLen: cardinal; var Count: cardinal): longint; cdecl;
external 'DOSCALLS' index 265; external 'DOSCALLS' index 265;
function DosFindClose (Handle: longint): longint; cdecl; function DosFindClose (Handle: longint): longint; cdecl;
@ -410,7 +411,7 @@ function FindFirst (const Path: string; Attr: longint; var Rslt: TSearchRec): lo
var SR: PSearchRec; var SR: PSearchRec;
FStat: PFileFindBuf3; FStat: PFileFindBuf3;
Count: longint; Count: cardinal;
Err: longint; Err: longint;
begin begin
@ -459,7 +460,7 @@ function FindNext (var Rslt: TSearchRec): longint;
var SR: PSearchRec; var SR: PSearchRec;
FStat: PFileFindBuf3; FStat: PFileFindBuf3;
Count: longint; Count: cardinal;
Err: longint; Err: longint;
begin begin
@ -951,7 +952,10 @@ end.
{ {
$Log$ $Log$
Revision 1.18 2002-09-23 17:42:37 hajny Revision 1.19 2002-11-18 19:51:00 hajny
* another bunch of type corrections
Revision 1.18 2002/09/23 17:42:37 hajny
* AnsiString to PChar typecast * AnsiString to PChar typecast
Revision 1.17 2002/09/07 16:01:25 peter Revision 1.17 2002/09/07 16:01:25 peter