Ver código fonte

fix result type

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8463 8c9fc860-2736-0410-a75d-ab315db34111
eth.metacore 6 anos atrás
pai
commit
65226aafd8

+ 2 - 2
source/WMApplications.Mod

@@ -312,7 +312,7 @@ VAR
 PROCEDURE Open*(context : Commands.Context);
 VAR
 	fullName, repositoryName, applicationName : ARRAY 128 OF CHAR;
-	refNum, res : LONGINT;
+	refNum: LONGINT; res: WORD;
 	info : ApplicationInfo;
 	window : Window;
 	gadgetWindow : GadgetWindow;
@@ -393,7 +393,7 @@ BEGIN
 	out.Update;
 END ShowRes;
 
-PROCEDURE GetApplicationInfo(CONST repositoryName, applicationName : ARRAY OF CHAR; VAR info : ApplicationInfo) : LONGINT;
+PROCEDURE GetApplicationInfo(CONST repositoryName, applicationName : ARRAY OF CHAR; VAR info : ApplicationInfo) : WORD;
 VAR repository : Repositories.Repository; application : XML.Element; res : WORD;
 BEGIN
 	repository := Repositories.ThisRepository(repositoryName);

+ 1 - 1
source/WMArchives.Mod

@@ -984,7 +984,7 @@ TYPE
 		VAR di : WM.DragInfo;
 			dt : WMDropTarget.DropTarget;
 			itf : WMDropTarget.DropInterface;
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			sel : NodeList;
 			url, caption : ARRAY 1024 OF CHAR;
 			text : Texts.Text;

+ 1 - 1
source/WMBackdropLoader.Mod

@@ -65,7 +65,7 @@ TYPE
 		PROCEDURE LoadSkin(sender, data : ANY);
 		VAR look : Looks.Look;
 			cmd, s, msg : ARRAY 128 OF CHAR;
-			index, res : LONGINT;
+			index : LONGINT; res : WORD;
 		BEGIN
 			IF sender IS WMStandardComponents.Button THEN
 				FindSender(sender(WMStandardComponents.Button), index);

+ 1 - 1
source/WMCharCodes.Mod

@@ -34,7 +34,7 @@ PROCEDURE LoadGBTable;
 VAR f : Files.File;
 	r : Files.Reader;
 	codeS, unicodeS : ARRAY 8 OF CHAR;
-	code, unicode, res : LONGINT;
+	code, unicode: LONGINT; res : WORD;
 BEGIN
 	f := Files.Old("gb2312.txt");
 	Files.OpenReader(r, f, 0);

+ 1 - 1
source/WMCharMap.Mod

@@ -144,7 +144,7 @@ TYPE
 
 		PROCEDURE FindChar(sender, data : ANY);
 		VAR tempString : ARRAY 16 OF CHAR;
-			pos, res : LONGINT;
+			pos: LONGINT; res: WORD;
 		BEGIN
 			IF sender IS WMEditors.Editor THEN
 				IF sender(WMEditors.Editor) = hexEd THEN

+ 3 - 3
source/WMDialogs.Mod

@@ -700,7 +700,7 @@ TYPE
 
 		(**	Create an instance of the CustomDialog window. 'dialog' is a string reference to a component stored in a repository.
 			'width' and 'height' are taken from the component that is loaded. Only use this instance when res = ResOk *)
-		PROCEDURE &New*(CONST dialog : ARRAY OF CHAR; VAR width, height, res : LONGINT);
+		PROCEDURE &New*(CONST dialog : ARRAY OF CHAR; VAR width, height: LONGINT; VAR res : WORD);
 		VAR
 			content : WMComponents.VisualComponent;
 			c : Repositories.Component; rect : WMRectangles.Rectangle;
@@ -1031,7 +1031,7 @@ BEGIN
 END QueryUserInfo;
 
 PROCEDURE CustomDialogXY*(x, y : LONGINT; flags : SET; CONST dialog : ARRAY OF CHAR; VAR answer : ARRAY OF CHAR);
-VAR cd : CustomDialog; ignore, res : LONGINT;
+VAR cd : CustomDialog; ignore: LONGINT; res: WORD;
 BEGIN
 	answer := "";
 	NEW(cd, dialog, ignore, ignore, res);
@@ -1090,7 +1090,7 @@ BEGIN
 END TestUserInfo;
 
 PROCEDURE TestCustomDialog*(context : Commands.Context); (** dialog x y ~ *)
-VAR cd : CustomDialog; dialog, answer : ARRAY 256 OF CHAR; x, y, width, height, res : LONGINT;
+VAR cd : CustomDialog; dialog, answer : ARRAY 256 OF CHAR; x, y, width, height: LONGINT; res: WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(dialog);
 	context.arg.SkipWhitespace; context.arg.Int(x, FALSE);

+ 2 - 2
source/WMEditors.Mod

@@ -831,7 +831,7 @@ TYPE
 		END SelectAll;
 
 		PROCEDURE Paste;
-		VAR text : ARRAY MaxStringSize OF CHAR; valid : BOOLEAN; ignore : LONGINT;
+		VAR text : ARRAY MaxStringSize OF CHAR; valid : BOOLEAN; ignore : WORDT;
 		BEGIN
 			Texts.clipboard.AcquireRead;
 			IF (0 < Texts.clipboard.GetLength()) & (Texts.clipboard.GetLength() < MaxStringSize) THEN
@@ -1029,7 +1029,7 @@ TYPE
 			ds : DropString;
 			itf : WMDropTarget.DropInterface;
 			targetText, temp : Texts.Text;
-			pos, value, res : LONGINT;
+			pos, value : LONGINT; res : WORD;
 		BEGIN
 			IF (dragString = NIL) THEN RETURN; END;
 

+ 1 - 1
source/WMErrors.Mod

@@ -10,7 +10,7 @@ CONST
 	ShowErrorCode = TRUE;
 	MaxErrorTextLength = 512;
 
-PROCEDURE Show*(errorCode : LONGINT);
+PROCEDURE Show*(errorCode : WORD);
 VAR
 	errorMessage : Errors.ErrorMessage;
 	text : ARRAY MaxErrorTextLength OF CHAR;

+ 3 - 3
source/WMFTPClient.Mod

@@ -199,7 +199,7 @@ TYPE
 
 		PROCEDURE Connect;
 		VAR user, pass, host, temp : ARRAY 64 OF CHAR;
-			port, res : LONGINT;
+			port: LONGINT; res: WORD;
 		BEGIN
 			IF ftp # NIL THEN
 				KernelLog.String("Already open"); KernelLog.Ln; RETURN
@@ -448,7 +448,7 @@ TYPE
 
 		PROCEDURE DeleteEntries(sender, data : ANY);
 		VAR  d : FTPClient.FTPEntry;
-			dr, res, i  : LONGINT;
+			dr, i  : LONGINT; res : WORD;
 			dp : ARRAY 128 OF CHAR;
 			delete, always, never : BOOLEAN;
 		BEGIN
@@ -661,7 +661,7 @@ TYPE
 		VAR di : WMWindowManager.DragInfo;
 			dt : WMDropTarget.DropTarget;
 			itf : WMDropTarget.DropInterface;
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			sel : FTPClient.FTPListing;
 			url : ARRAY 1024 OF CHAR;
 			text : Texts.Text;

+ 7 - 5
source/WMInspectionComponents.Mod

@@ -2136,7 +2136,7 @@ TYPE
 		END CountNofElements;
 
 		PROCEDURE SetProperties(component : WMComponents.Component);
-		VAR propertyArray : WMProperties.PropertyArray; res, i : LONGINT;
+		VAR propertyArray : WMProperties.PropertyArray; res: WORD; i : LONGINT;
 			init:WMProperties.BooleanProperty;
 		BEGIN
 			ASSERT(component # NIL);
@@ -3403,7 +3403,7 @@ TYPE
 		PROCEDURE HandleStoreButton(sender, data : ANY);
 		VAR
 			component : Repositories.Component; repository : Repositories.Repository;
-			name, repositoryName, componentName : ARRAY 256 OF CHAR; id, res : LONGINT;
+			name, repositoryName, componentName : ARRAY 256 OF CHAR; id: LONGINT; res: WORD;
 			filename : Files.FileName;
 		BEGIN
 			component := SELF.component;
@@ -3439,7 +3439,8 @@ TYPE
 		END HandleStoreButton;
 
 		PROCEDURE HandleRemoveButton(sender, data : ANY);
-		VAR component : Repositories.Component; ignore : Repositories.Name; repository : Repositories.Repository; refNum, res : LONGINT;
+		VAR component : Repositories.Component; ignore : Repositories.Name; repository : Repositories.Repository; refNum: LONGINT;
+			res: WORD;
 		BEGIN
 			component := SELF.component;
 			IF (component # NIL) THEN
@@ -3456,7 +3457,8 @@ TYPE
 		END HandleRemoveButton;
 
 		PROCEDURE HandleUpdateButton(sender, data : ANY);
-		VAR component : Repositories.Component; ignore : Repositories.Name;  repository : Repositories.Repository; refNum, res : LONGINT;
+		VAR component : Repositories.Component; ignore : Repositories.Name;  repository : Repositories.Repository; refNum: LONGINT;
+			res: WORD;
 		BEGIN
 			component := SELF.component;
 			IF (component # NIL) THEN
@@ -3647,7 +3649,7 @@ TYPE
 		END EditorKeyEvent;
 
 		PROCEDURE HandleShiftReturn;
-		VAR model : Models.Model; string : Types.DynamicString; length, res : LONGINT;
+		VAR model : Models.Model; string : Types.DynamicString; length : LONGINT; res: WORD;
 		BEGIN
 			model := SELF.model;
 			IF (model # NIL) THEN

+ 1 - 1
source/WMMacros.Mod

@@ -239,7 +239,7 @@ END Handle;
 PROCEDURE GetMacroKeySym() : LONGINT;
 VAR
 	enum : XMLObjects.Enumerator; elem : XML.Element; s : XML.String; p : ANY;
-	keysym, res : LONGINT;
+	keysym : LONGINT; res: WORD;
 BEGIN
 	IF macros # NIL THEN
 		enum := macros.GetContents();

+ 1 - 1
source/WMMenus.Mod

@@ -593,7 +593,7 @@ TYPE
 		END MyStartDrag;
 
 		PROCEDURE DragWasAccepted(sender, data : ANY);
-		VAR di : WMWindowManager.DragInfo; itf : WMDropTarget.DropInterface; ignoreRes : LONGINT;
+		VAR di : WMWindowManager.DragInfo; itf : WMDropTarget.DropInterface; ignoreRes : WORD;
 		BEGIN
 			IF (data # NIL) & (data IS WMWindowManager.DragInfo) THEN
 				di := data(WMWindowManager.DragInfo);

+ 1 - 1
source/WMNavigate.Mod

@@ -1425,7 +1425,7 @@ BEGIN
 END GenerateName;
 
 PROCEDURE WindowShot(window: WMWindowManager.Window; scale:REAL);
-VAR str,fn: Files.FileName;  w,h, res: LONGINT; startTime: Dates.DateTime;
+VAR str,fn: Files.FileName;  w,h: LONGINT; res: WORD; startTime: Dates.DateTime;
 	img:WMGraphics.Image;
 BEGIN
 	GenerateName(window.GetTitle(),fn);

+ 3 - 3
source/WMPerfMonAlerts.Mod

@@ -725,7 +725,7 @@ VAR
 	alert : AlertObject; string : XML.String;
 	fullname : ARRAY 256 OF CHAR; type, trigger : LONGINT;  value1, value2 : LONGREAL;
 	plugin : WMPerfMonPlugins.Plugin;
-	index, res : LONGINT;
+	index : LONGINT; res: WORD;
 BEGIN
 	ASSERT(elem # NIL);
 	string := GetAttributeValue(elem, XmlAttributeFullname);
@@ -765,7 +765,7 @@ BEGIN
 	RETURN alert;
 END ParseXmlAlert;
 
-PROCEDURE ParseXmlDocument(document : XML.Document; VAR msg : ARRAY OF CHAR; VAR nbrOfRules, res : LONGINT) : AlertObject;
+PROCEDURE ParseXmlDocument(document : XML.Document; VAR msg : ARRAY OF CHAR; VAR nbrOfRules: LONGINT; VAR res: WORD) : AlertObject;
 VAR elem : XML.Element; enum : XMLObjects.Enumerator; listHead, alert : AlertObject; ptr : ANY; string : XML.String;
 BEGIN
 	ASSERT(document # NIL);
@@ -936,7 +936,7 @@ BEGIN {EXCLUSIVE}
 END StoreRules;
 
 PROCEDURE Load*(context : Commands.Context); (** [filename] ~ *)
-VAR filename, msg : ARRAY 256 OF CHAR; nbrOfRules, res : LONGINT; alerts : AlertObject;
+VAR filename, msg : ARRAY 256 OF CHAR; nbrOfRules: LONGINT; res: WORD; alerts : AlertObject;
 BEGIN {EXCLUSIVE}
 	IF ~context.arg.GetString(filename) THEN filename := DefaultAlertFile; END;
 	LoadRuleFileX(filename, alerts, nbrOfRules, msg, res);

+ 4 - 4
source/WMPerfMonPluginDisks.Mod

@@ -90,10 +90,10 @@ BEGIN
 END EventHandler;
 
 PROCEDURE InitPlugins;
-VAR table : Plugins.Table; i : LONGINT;
+VAR table : Plugins.Table; i : LONGINT; res: WORD;
 BEGIN
 	IF Disks.Stats THEN
-		Disks.registry.AddEventHandler(EventHandler, i); (* ignore res *)
+		Disks.registry.AddEventHandler(EventHandler, res); (* ignore res *)
 		Disks.registry.GetAll(table);
 		IF table # NIL THEN FOR i := 0 TO LEN(table)-1 DO AddPlugin(table[i] (Disks.Device)); END; END;
 	ELSE KernelLog.String("WMPerfMonPluginDisks: Disks.PerformanceMonitoring is FALSE."); KernelLog.Ln;
@@ -104,10 +104,10 @@ PROCEDURE Install*;
 END Install;
 
 PROCEDURE Cleanup;
-VAR ignore : LONGINT;
+VAR res : WORD;
 BEGIN
 	IF Disks.Stats THEN
-		Disks.registry.RemoveEventHandler(EventHandler, ignore);
+		Disks.registry.RemoveEventHandler(EventHandler, res);
 		WMPerfMonPlugins.updater.RemoveByModuleName(ModuleName);
 	END;
 END Cleanup;

+ 4 - 4
source/WMPerfMonPluginNetwork.Mod

@@ -69,9 +69,9 @@ BEGIN
 END EventHandler;
 
 PROCEDURE InitPlugins;
-VAR table : Plugins.Table; i : LONGINT;
+VAR table : Plugins.Table; i : LONGINT; res: WORD;
 BEGIN
-	Network.registry.AddEventHandler(EventHandler, i);
+	Network.registry.AddEventHandler(EventHandler, res);
 	Network.registry.GetAll(table);
 	IF table # NIL THEN FOR i := 0 TO LEN(table)-1 DO AddPlugin(table[i] (Network.LinkDevice)); END; END;
 END InitPlugins;
@@ -80,9 +80,9 @@ PROCEDURE Install*;
 END Install;
 
 PROCEDURE Cleanup;
-VAR ignore : LONGINT;
+VAR res : WORD;
 BEGIN
-	Network.registry.RemoveEventHandler(EventHandler, ignore);
+	Network.registry.RemoveEventHandler(EventHandler, res);
 	WMPerfMonPlugins.updater.RemoveByModuleName(ModuleName);
 END Cleanup;
 

+ 2 - 2
source/WMPerfMonTabAlerts.Mod

@@ -50,7 +50,7 @@ TYPE
 		dead, alive : BOOLEAN;
 
 		PROCEDURE HandleButtons(sender, data : ANY);
-		VAR string, msg : ARRAY 256 OF CHAR; nofRemoved, res : LONGINT;
+		VAR string, msg : ARRAY 256 OF CHAR; nofRemoved, res : WORD;
 		BEGIN
 			IF sender = onOffBtn THEN
 				IF status.enabled THEN
@@ -87,7 +87,7 @@ TYPE
 		END HandleButtons;
 
 		PROCEDURE ResetSelectedAlerts;
-		VAR scol, srow, ecol, erow, row, res : LONGINT; ptr : ANY; cellData : CellData; msg : ARRAY 128 OF CHAR;
+		VAR scol, srow, ecol, erow, row: LONGINT; res: WORD; ptr : ANY; cellData : CellData; msg : ARRAY 128 OF CHAR;
 		BEGIN
 			rulesGrid.Acquire;
 			rulesGrid.model.Acquire;

+ 1 - 1
source/WMPicView.Mod

@@ -8,7 +8,7 @@ PROCEDURE Open*(context : Commands.Context); (** filename ~ *)
 VAR
 	fn, name : Files.FileName;
 	pw : WM.BufferWindow;
-	res, w, h, x : LONGINT;
+	res: WOTD; w, h, x : LONGINT;
 	dec : Codecs.ImageDecoder;
 	rdr : Streams.Reader;
 	ext : ARRAY 16 OF CHAR;

+ 1 - 1
source/WMProfiler.Mod

@@ -184,7 +184,7 @@ TYPE
 			tempProfile : HierarchicalProfiler.Profile;
 			mask : ARRAY 128 OF CHAR; timeStr : ARRAY 16 OF CHAR;
 			minPercent : LONGINT;
-			time, type, info, res : LONGINT;
+			time, type, info: LONGINT; res: WORD;
 			root : WMTrees.TreeNode;
 		BEGIN
 			IF (sender = startBtn) THEN

+ 2 - 2
source/WMScreenShot.Mod

@@ -129,7 +129,7 @@ VAR manager : WM.WindowManager;
 	viewport : WM.ViewPort;
 	sv : View;
 	p : Plugins.Plugin;
-	w, h, res : LONGINT;
+	w, h: LONGINT; res: WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(fn);
 	IF ~((context.arg.Peek() >= '0') & (context.arg.Peek() <= '9')) THEN
@@ -166,7 +166,7 @@ PROCEDURE SnapShotRange*(context : Commands.Context);
 VAR manager : WM.WindowManager;
 	fn : ARRAY 100 OF CHAR;
 	sv : View;
-	w, h, rl, rt, rw, rh, res : LONGINT;
+	w, h, rl, rt, rw, rh: LONGINT; res: WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(fn);
 	context.arg.SkipWhitespace; context.arg.Int(w, FALSE);

+ 1 - 1
source/WMSkinLoader.Mod

@@ -67,7 +67,7 @@ TYPE
 		PROCEDURE LoadSkin(sender, data : ANY);
 		VAR look : Looks.Look;
 			cmd, msg : ARRAY 128 OF CHAR;
-			index, res : LONGINT;
+			index: LONGINT; res: WORD;
 		BEGIN
 			IF sender IS WMStandardComponents.Button THEN
 				FindSender(sender(WMStandardComponents.Button), index);

+ 4 - 4
source/WMSystemComponents.Mod

@@ -443,7 +443,7 @@ TYPE
 			w : SelectionWrapper;
 			filename : Files.FileName;
 			command : ARRAY 1024 OF CHAR;
-			position, res : LONGINT;
+			position: LONGINT; res: WORD;
 			msg : ARRAY 256 OF CHAR;
 		BEGIN
 			IF (data # NIL) & (data IS SelectionWrapper) THEN
@@ -549,7 +549,7 @@ TYPE
 
 		PROCEDURE Rename(sender, data : ANY);
 		VAR  d : DirEntry; rename : WMDialogs.MiniStringInput;
-			wmx, wmy, res : LONGINT;
+			wmx, wmy: LONGINT; res: WORD;
 			name, op, np : ARRAY FileNameLength (* was 128*) OF CHAR;
 		BEGIN
 			IF popup # NIL THEN popup.Close; popup := NIL END;
@@ -580,7 +580,7 @@ TYPE
 
 		PROCEDURE Delete(sender, data : ANY);
 		VAR  d : DirEntry;
-			dr, res, i  : LONGINT;
+			dr, i  : LONGINT; res: WORD;
 			dp : Files.FileName;
 			delete, always, never : BOOLEAN;
 		BEGIN
@@ -843,7 +843,7 @@ END Open;
 		VAR di : WM.DragInfo;
 			dt : WMDropTarget.DropTarget;
 			itf : WMDropTarget.DropInterface;
-			i, res : LONGINT;
+			i : LONGINT; res: WORD;
 			sel : DirEntries;
 			url : ARRAY 1024 OF CHAR;
 			text : Texts.Text;

+ 1 - 1
source/WMTaskScheduler.Mod

@@ -291,7 +291,7 @@ TYPE
 			label : WMStandardComponents.Label;
 			dt : Dates.DateTime;
 			string : ARRAY 32 OF CHAR;
-			ignoreRes : LONGINT;
+			ignoreRes : WORD;
 
 			PROCEDURE CreateLabel(CONST caption : ARRAY OF CHAR; width : LONGINT) : WMStandardComponents.Label;
 			VAR label : WMStandardComponents.Label;

+ 4 - 4
source/WMTextStyleTool.Mod

@@ -524,7 +524,7 @@ TYPE
 			style : SET;
 			fgColor, bgColor : LONGINT;
 			name, tempString: ARRAY 256 OF CHAR;
-			res, size : LONGINT;
+			res: WORD; size : LONGINT;
 		BEGIN
 			IF Texts.GetLastSelection(text, from, to) THEN
 				(* create new AdHoc Style *)
@@ -1082,7 +1082,7 @@ TYPE
 		PROCEDURE UpdateValueHandler(sender, data: ANY);
 		VAR tempString : ARRAY 64 OF CHAR;
 			tempLReal : LONGREAL;
-			tempInt, res : LONGINT;
+			tempInt : LONGINT; res : WORD;
 			tempCharStyle : Texts.CharacterStyle;
 			tempFont : WMGraphics.Font;
 			tempEditor : WMEditors.Editor;
@@ -1520,7 +1520,7 @@ TYPE
 		PROCEDURE ImportCharacterStyles(CONST filename: ARRAY OF CHAR);
 		VAR tempString : ARRAY 256 OF CHAR;
 			tempReal: LONGREAL;
-			tempInt, res: LONGINT;
+			tempInt: LONGINT; res: WORD;
 			reader : Files.Reader;
 			parser : XMLParser.Parser;
 			scanner : XMLScanner.Scanner;
@@ -1599,7 +1599,7 @@ TYPE
 		PROCEDURE ApplyCHandler(sender, data: ANY);
 		VAR tempString : ARRAY 256 OF CHAR;
 			tempLReal: LONGREAL;
-			tempInt, res : LONGINT;
+			tempInt : LONGINT; res: WORD;
 			tempFont : WMGraphics.Font;
 		BEGIN
 			(* retrieve tempvalues first for those who didn't press enter after changing a value... *)

+ 1 - 1
source/WMTextTool.Mod

@@ -415,7 +415,7 @@ TYPE
 		END BGColorPopupHandler;
 
 		PROCEDURE UpdateColors(sender, data : ANY);
-		VAR colorString : ARRAY 16 OF CHAR; caption : ARRAY 2 OF CHAR;  color, res : LONGINT;
+		VAR colorString : ARRAY 16 OF CHAR; caption : ARRAY 2 OF CHAR;  color: LONGINT; res: WORD;
 		BEGIN
 			colorEdit.GetAsString(colorString);
 			Strings.HexStrToInt(colorString, color, res);

+ 3 - 2
source/WMTextView.Mod

@@ -3126,13 +3126,14 @@ TYPE
 			ELSE KernelLog.String("WMTextView : Drag could not be started")
 			END;
 		END AutoStartDrag;
+
 		PROCEDURE DragWasAccepted(sender, data : ANY);
 		VAR di : WMWindowManager.DragInfo;
 			dt : WMDropTarget.DropTarget;
 			itf : WMDropTarget.DropInterface;
 			targetText, temp : Texts.Text;
 			string : Strings.String;
-			pos, a, b, res : LONGINT;
+			pos, a, b: LONGINT; res: WORD;
 		BEGIN
 			IF (dragSelA = NIL) OR (dragSelB = NIL)  THEN RETURN END;
 
@@ -3760,7 +3761,7 @@ TYPE
 			s : Strings.String;
 			msg : ARRAY 128 OF CHAR;
 			ignore : Modules.Name;
-			paramSize, nofLastSelections, i, j, a, b, res : LONGINT;
+			paramSize, nofLastSelections, i, j, a, b: LONGINT; res: WORD;
 			selectionText : Texts.Text;
 			selectionOk : BOOLEAN;
 			from, to: Texts.TextPosition;

+ 3 - 3
source/WMV24Component.Mod

@@ -924,7 +924,7 @@ TYPE
 			progressInfo : ProgressInfo;
 			xysender : XYModem.Sender;
 			msg : ARRAY 32 OF CHAR;
-			x, y, res : LONGINT;
+			x, y : LONGINT; res: WORD;
 		BEGIN
 			f := Files.Old(filename);
 			IF f # NIL THEN
@@ -971,7 +971,7 @@ TYPE
 			caption : ARRAY 128 OF CHAR;
 			xyreceiver : XYModem.Receiver;
 			msg : ARRAY 32 OF CHAR;
-			x, y, res : LONGINT;
+			x, y : LONGINT; res: WORD;
 			awaitF : BOOLEAN;
 		BEGIN
 			IF filename # "" THEN
@@ -1144,7 +1144,7 @@ TYPE
 		END EvaluateError;
 
 		PROCEDURE ReceiveCharacters;
-		VAR ch : CHAR; buffer : ARRAY ReceiveBufferSize OF CHAR; backspaces, i, len, res : LONGINT;
+		VAR ch : CHAR; buffer : ARRAY ReceiveBufferSize OF CHAR; backspaces, i, len : LONGINT; res: WORD;
 		BEGIN
 			len := 0;
 			res := Streams.Ok;

+ 1 - 1
source/Zip.Mod

@@ -78,7 +78,7 @@ TYPE
 
 	Reader* = POINTER TO ReaderDesc;
 	ReaderDesc* = RECORD	(** structure for reading from a zip-file into a buffer **)
-		res-: LONGINT;	(** result of last operation **)
+		res-: WORD;	(** result of last operation **)
 		open: BOOLEAN;
 		ent: Entry
 	END;

+ 1 - 1
source/ZipTool.Mod

@@ -124,7 +124,7 @@ PROCEDURE DoExtract(
 	path, overwrite, show: BOOLEAN; out, error : Streams.Writer; VAR res: WORD);
 VAR
 	f, of: Files.File; r: Files.Rider;
-	bakname, temp: ARRAY 256 OF CHAR; res2: LONGINT;
+	bakname, temp: ARRAY 256 OF CHAR; res2: WORD;
 	suf: ARRAY 32 OF CHAR;
 BEGIN
 	IF action = EXTRACT THEN

+ 1 - 1
source/ZlibInflate.Mod

@@ -59,7 +59,7 @@ MODULE ZlibInflate;	(** eos  **)
 
 		(** result codes **)
 		Result* = RECORD
-			code-: LONGINT;	(** result code including special conditions and errors **)
+			code-: WORD;	(** result code including special conditions and errors **)
 			msg-: POINTER TO ARRAY OF CHAR;	(** detailed error description if available **)
 		END;
 

+ 1 - 1
source/ZlibReaders.Mod

@@ -16,7 +16,7 @@ CONST
 TYPE
 	(** structure for reading from a file with deflated data **)
 	Reader* = RECORD
-		res-: LONGINT;	(** current stream state **)
+		res-: WORD;	(** current stream state **)
 		crc32-: LONGINT;	(* crc32 of uncompressed data *)
 		wrapper-: BOOLEAN;	(** if set, a zlib header and a checksum are present **)
 		eof: BOOLEAN;	(* set if at end of input file and input buffer empty *)