make compilable

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8560 8c9fc860-2736-0410-a75d-ab315db34111

source/RelativeFiles64.Mod

@@ -1,6 +1,6 @@
 MODULE RelativeFiles64;	(**  AUTHOR "fof"; PURPOSE "";  **)
 
-IMPORT Files := Files64,UTF8Strings;
+IMPORT Files := Files64,UTF8Strings, Commands;
 TYPE PathName=ARRAY 272 OF CHAR;
 
 	FileSystem = OBJECT(Files.FileSystem)

source/Windows.HostFiles64.Mod

@@ -161,7 +161,7 @@ TYPE
 			Prefix( name, fname );  f :=  fs.Old0( fname ); IF f # NIL THEN  f.fs := SELF; END; RETURN f;
 		END Old0;
 
-		PROCEDURE Delete0*( name: ARRAY OF CHAR;  VAR key, res: LONGINT );
+		PROCEDURE Delete0*( name: ARRAY OF CHAR;  VAR key: LONGINT; VAR res: WORD );
 		VAR fname: FileName;
 		BEGIN
 			Prefix( name, fname );  fs.Delete0( fname, key, res );
@@ -191,7 +191,7 @@ TYPE
 			Prefix( name, fname );  fs.CreateDirectory0( fname, res );
 		END CreateDirectory0;
 
-		PROCEDURE RemoveDirectory0*( name: ARRAY OF CHAR;  force: BOOLEAN;  VAR key, res: LONGINT );
+		PROCEDURE RemoveDirectory0*( name: ARRAY OF CHAR;  force: BOOLEAN;  VAR key: LONGINT; VAR res: WORD );
 		VAR fname: FileName;
 		BEGIN
 			Prefix( name, fname );  fs.RemoveDirectory0( fname, force, key, res );
@@ -243,7 +243,7 @@ TYPE
 			RETURN NIL
 		END Old0;
 
-		PROCEDURE Delete0( name: ARRAY OF CHAR;  VAR key, res: LONGINT );
+		PROCEDURE Delete0( name: ARRAY OF CHAR;  VAR key: LONGINT; VAR res: WORD );
 		VAR fname: FileName;  F: File;  ret: Kernel32.BOOL;
 		BEGIN {EXCLUSIVE}
 			ConvertChar( name, Files.PathDelimiter, PathDelimiter );  key := 0;  res := 1;
@@ -400,7 +400,7 @@ TYPE
 			END
 		END CreateDirectory0;
 
-		PROCEDURE RemoveDirectory0( name: ARRAY OF CHAR;  force: BOOLEAN;  VAR key, res: LONGINT );
+		PROCEDURE RemoveDirectory0( name: ARRAY OF CHAR;  force: BOOLEAN;  VAR key: LONGINT; VAR res: WORD );
 		VAR ret: Kernel32.BOOL;
 		BEGIN {EXCLUSIVE}
 			ConvertChar( name, Files.PathDelimiter, PathDelimiter );  key := 0;  res := 1;
@@ -840,7 +840,7 @@ VAR
 		IF (Files.This(context.prefix ) = NIL) THEN
 			NEW( fs );  fs.vol := context.vol;  Files.Add( fs, context.prefix );
 		ELSE
-			context.error.String( "HostFiles64: " );  context.error.String( context.prefix );  context.error.String( " already in use" );
+			context.error.String( "HostFiles: " );  context.error.String( context.prefix );  context.error.String( " already in use" );
 			context.error.Ln;
 		 END;
 	END NewFS;

source/Windows.IO64.HostFiles.Mod

@@ -301,7 +301,8 @@ TYPE
 					t := 0;  d := 0;
 					REPEAT
 						IF Files.EnumTime IN flags THEN
-							Kernel32.FileTimeToLocalFileTime( FD.ftLastWriteTime, ft );  Kernel32.FileTimeToSystemTime( ft, st );
+							IGNORE Kernel32.FileTimeToLocalFileTime( FD.ftLastWriteTime, ft );
+							IGNORE Kernel32.FileTimeToSystemTime( ft, st );
 							d := LONG( st.wYear - 1900 ) * 200H + LONG( st.wMonth ) * 20H + LONG( st.wDay );  t := LONG( st.wHour ) * 1000H + LONG( st.wMinute ) * 40H + LONG( st.wSecond );
 						END;
 						Join( curPath, "/", FD.cFileName, longname );
@@ -311,7 +312,7 @@ TYPE
 							enum.PutEntry( longname, {Files.Directory}, t, d, HUGEINT(UNSIGNED64( FD.nFileSizeHigh ) * UNSIGNED64( 0x100000000 ) + UNSIGNED64( FD.nFileSizeLow )))
 						END;
 					UNTIL Kernel32.FindNextFile( h, FD ) = Kernel32.False;
-					Kernel32.FindClose( h )
+					IGNORE Kernel32.FindClose( h )
 				END;
 			END EnumeratePath;
 
@@ -535,7 +536,7 @@ TYPE
 			END
 		END Read;
 
-		PROCEDURE ReadBytes*( VAR r: Files.Rider;  VAR x: ARRAY OF CHAR;  ofs, len: LONGWORD );
+		PROCEDURE ReadBytes*( VAR r: Files.Rider;  VAR x: ARRAY OF CHAR;  ofs, len: SIZE );
 		VAR pos: HUGEINT; n: LONGWORD;
 		BEGIN {EXCLUSIVE}
 			ASSERT( (ofs + len) <= LEN( x ) );
@@ -567,7 +568,7 @@ TYPE
 			buffer.dirty := TRUE;
 		END Write;
 
-		PROCEDURE WriteBytes*( VAR r: Files.Rider;  CONST x: ARRAY OF CHAR;  ofs, len: LONGWORD );
+		PROCEDURE WriteBytes*( VAR r: Files.Rider;  CONST x: ARRAY OF CHAR;  ofs, len: SIZE );
 		VAR pos: HUGEINT; n: LONGINT;
 		BEGIN {EXCLUSIVE}
 			IF len = 0 THEN RETURN END;
@@ -980,11 +981,11 @@ VAR
 		VAR ch: CHAR; i: LONGINT;
 		BEGIN
 			IF (dir[0] = "~") & (dir[1] = PathDelimiter) THEN
-				Kernel32.SetCurrentDirectory( sysPath );
+				IGNORE Kernel32.SetCurrentDirectory( sysPath );
 				i := 2;
 				REPEAT ch := dir[i]; dir[i-2] := ch; INC(i) UNTIL ch = 0X;
 			ELSE
-				Kernel32.SetCurrentDirectory(workPath)
+				IGNORE Kernel32.SetCurrentDirectory(workPath)
 			END;
 		END SetSysPath;
 
@@ -997,7 +998,8 @@ VAR
 				ConvertChar( dir, Files.PathDelimiter, PathDelimiter );
 				SetSysPath(dir);
 				IF Kernel32.SetCurrentDirectory( dir ) # Kernel32.False THEN
-					Kernel32.GetCurrentDirectory( LEN( dir ), dir );  searchPath[i] := ";";  INC( i );  k := 0;
+					IGNORE Kernel32.GetCurrentDirectory( LEN( dir ), dir );
+					searchPath[i] := ";";  INC( i );  k := 0;
 					WHILE dir[k] # 0X DO searchPath[i] := dir[k];  INC( i );  INC( k ) END
 				END;
 				k := 0
@@ -1008,14 +1010,14 @@ VAR
 		Machine.GetConfig( "Paths.Files", files ); Machine.GetConfig( "Paths.Search", directories );
 		Machine.GetConfig( "Paths.Temp", temp ); Machine.GetConfig( "Paths.Work", work );
 
-		Kernel32.GetCurrentDirectory( LEN( workPath ), workPath );  i := 0;  ret := 0;
+		IGNORE Kernel32.GetCurrentDirectory( LEN( workPath ), workPath );  i := 0;  ret := 0;
 
 		IF files # "" THEN
 			COPY( files, sysPath );
 			IF Kernel32.SetCurrentDirectory( sysPath ) # Kernel32.False THEN ret := Kernel32.GetCurrentDirectory( LEN( sysPath ), sysPath ) END
 		END;
 		IF ret = 0 THEN
-			Kernel32.GetModuleFileName( Kernel32.hInstance, sysPath, LEN( sysPath ) );  j := -1;
+			IGNORE Kernel32.GetModuleFileName( Kernel32.hInstance, sysPath, LEN( sysPath ) );  j := -1;
 			WHILE sysPath[i] # 0X DO
 				IF sysPath[i] = PathDelimiter THEN j := i END;
 				INC( i )
@@ -1042,15 +1044,15 @@ VAR
 			SetSysPath(tempPath);
 			IF Kernel32.SetCurrentDirectory( tempPath ) # Kernel32.False THEN ret := Kernel32.GetCurrentDirectory( LEN( tempPath ), tempPath ) END
 		END;
-		IF ret = 0 THEN Kernel32.GetTempPath( LEN( tempPath ), tempPath ) END;
+		IF ret = 0 THEN IGNORE Kernel32.GetTempPath( LEN( tempPath ), tempPath ) END;
 
 		COPY( work, dir );
 		IF dir # "" THEN
 			ConvertChar( dir, Files.PathDelimiter, PathDelimiter );
 			SetSysPath(dir);
-			IF Kernel32.SetCurrentDirectory( dir ) # Kernel32.False THEN Kernel32.GetCurrentDirectory( LEN( workPath ), workPath ) END
+			IF Kernel32.SetCurrentDirectory( dir ) # Kernel32.False THEN IGNORE Kernel32.GetCurrentDirectory( LEN( workPath ), workPath ) END
 		END;
-		Kernel32.SetCurrentDirectory( workPath );
+		IGNORE Kernel32.SetCurrentDirectory( workPath );
 	END SetPaths;
 
 	PROCEDURE SameName*( VAR a, b: ARRAY OF CHAR ): BOOLEAN;   (** non-portable *)
@@ -1072,7 +1074,7 @@ VAR
 		IF j > 0 THEN fullName[j] := 0X END;
 		BEGIN {EXCLUSIVE}
 			done := Kernel32.SetCurrentDirectory( fullName ) # Kernel32.False;
-			Kernel32.SetCurrentDirectory( workPath );  RETURN done
+			IGNORE Kernel32.SetCurrentDirectory( workPath );  RETURN done
 		END;
 	END CheckPath;
 
@@ -1105,25 +1107,27 @@ VAR
 
 	PROCEDURE SetAttributes*( file: ARRAY OF CHAR;  attrs: WORDSET );   (** non-portable *)
 	BEGIN
-		ConvertChar( file, Files.PathDelimiter, PathDelimiter );  Kernel32.SetFileAttributes( file, attrs )
+		ConvertChar( file, Files.PathDelimiter, PathDelimiter );
+		IGNORE Kernel32.SetFileAttributes( file, attrs )
 	END SetAttributes;
 
 	PROCEDURE SetFileAttributes*( file: ARRAY OF CHAR;  attrs: WORDSET );   (** non-portable *)
 	BEGIN
-		ConvertChar( file, Files.PathDelimiter, PathDelimiter );  Kernel32.SetFileAttributes( file, attrs )
+		ConvertChar( file, Files.PathDelimiter, PathDelimiter );
+		IGNORE Kernel32.SetFileAttributes( file, attrs )
 	END SetFileAttributes;
 
 
 (** Get the current directory. *)
 	PROCEDURE GetWorkingDirectory*( VAR path: ARRAY OF CHAR );
 	BEGIN {EXCLUSIVE}
-		Kernel32.GetCurrentDirectory( Kernel32.MaxPath, workPath );  COPY( workPath, path );  ConvertChar( path, PathDelimiter, Files.PathDelimiter ); FixDriveLetter (path);
+		IGNORE Kernel32.GetCurrentDirectory( Kernel32.MaxPath, workPath );  COPY( workPath, path );  ConvertChar( path, PathDelimiter, Files.PathDelimiter ); FixDriveLetter (path);
 	END GetWorkingDirectory;
 
 (** Change to directory path. *)
 	PROCEDURE ChangeDirectory*( path: ARRAY OF CHAR;  VAR done: BOOLEAN );
 	BEGIN {EXCLUSIVE}
-		ConvertChar( path, Files.PathDelimiter, PathDelimiter );  done := Kernel32.SetCurrentDirectory( path ) # Kernel32.False;  Kernel32.GetCurrentDirectory( Kernel32.MaxPath, workPath );
+		ConvertChar( path, Files.PathDelimiter, PathDelimiter );  done := Kernel32.SetCurrentDirectory( path ) # Kernel32.False;  IGNORE Kernel32.GetCurrentDirectory( Kernel32.MaxPath, workPath );
 	END ChangeDirectory;
 
 (** Get the directory for temporary files. *)
@@ -1137,7 +1141,8 @@ VAR
 	VAR i, j, k, p: LONGINT;  fullName: FileName;  fileNamePart: Kernel32.LPSTR;
 	BEGIN
 		IF ~FindFile( fileName, fullName ) THEN  (* file does not exist -> would be created in the current dir *)
-			ConvertChar( fileName, Files.PathDelimiter, PathDelimiter );  Kernel32.GetFullPathName( fileName, Kernel32.MaxPath, fullName, fileNamePart ); FixDriveLetter (fullName);
+			ConvertChar( fileName, Files.PathDelimiter, PathDelimiter );
+			IGNORE Kernel32.GetFullPathName( fileName, Kernel32.MaxPath, fullName, fileNamePart ); FixDriveLetter (fullName);
 		ELSE ConvertChar( fullName, Files.PathDelimiter, PathDelimiter )
 		END;   (* from here on all with PathDelimiter and drive letter *)
  		IF CAP( workPath[0] ) # CAP( fullName[0] ) THEN  (* different drive letters -> nothing to be done *)
@@ -1214,14 +1219,18 @@ VAR
 		drives := drives - {0,1}; (* do not scan for diskettes *)
 		AutoMountWindowsLogicalDrives( drives );
 
-		Kernel32.GetCurrentDirectory( LEN( workPath ), workPath );  i := 0;  Kernel32.GetModuleFileName( Kernel32.hInstance, sysPath, LEN( sysPath ) );  j := -1;
+		IGNORE Kernel32.GetCurrentDirectory( LEN( workPath ), workPath );
+		i := 0;
+		IGNORE Kernel32.GetModuleFileName( Kernel32.hInstance, sysPath, LEN( sysPath ) );  j := -1;
 		FixDriveLetter (workPath); FixDriveLetter (sysPath);
 		WHILE sysPath[i] # 0X DO
 			IF sysPath[i] = PathDelimiter THEN j := i END;
 			INC( i )
 		END;
 
-		i := j + 1;  sysPath[i] := 0X;  COPY( sysPath, searchPath );  Kernel32.GetTempPath( LEN( tempPath ), tempPath );  Kernel32.SetCurrentDirectory( workPath );
+		i := j + 1;  sysPath[i] := 0X;  COPY( sysPath, searchPath );
+		IGNORE Kernel32.GetTempPath( LEN( tempPath ), tempPath );
+		IGNORE Kernel32.SetCurrentDirectory( workPath );
 
 		notifications := NIL;
 	END Init;