WORD and INTEGER in RECORDs converted

This commit is contained in:
Rick Parrish 2013-02-07 14:28:00 -05:00
parent 19e2dcdab0
commit 60e58f0b7e
12 changed files with 92 additions and 92 deletions

View File

@ -13,8 +13,6 @@ Ported to Win32 by Rick Parrish<br />
TODO list:<br />
<ul>
<li>WORD in RECORD to SMALLWORD</li>
<li>INTEGER in RECORD to SMALLINT</li>
<li>Implement any REETODOs that appear in compiled executables</li>
<li>Anything passing 0 for the Attr parameter to FindFirst should pass AnyFile instead (VP returns no files when 0 is passed for Attr)</li>
<li>Investigate FILEMODE usage to see if FILEMODEREADWRITE, TEXTMODEREAD or TEXTMODEREADWRITE should be used</li>
@ -28,4 +26,6 @@ Completed list<br />
<li>IFDEF out any ASM code blocks and handle the same as above</li>
<li>TYPEs of OF WORD to OF SMALLWORD (just in case they're used in a RECORD)</li>
<li>TYPEs of OF INTEGER to OF SMALLINT (just in case they're used in a RECORD)</li>
<li>WORD in RECORD to SMALLWORD</li>
<li>INTEGER in RECORD to SMALLINT</li>
</ul>

View File

@ -190,7 +190,7 @@ END;
PROCEDURE ExtractToTemp;
TYPE
TotalsRecordType = RECORD
TotalFiles: Integer;
TotalFiles: SmallInt;
TotalSize: LongInt;
END;
VAR

View File

@ -161,7 +161,7 @@ END;
PROCEDURE ReZipStuff;
TYPE
TotalsRecordType = RECORD
TotalFiles: Integer;
TotalFiles: SmallInt;
TotalOldSize,
TotalNewSize: LongInt
END;

View File

@ -52,23 +52,23 @@ TYPE
ArcRecordType = RECORD {* structure of ARC archive file header *}
FileName: ARRAY [0..12] OF Char; {* FileName *}
C_Size: LongInt; {* compressed size *}
Mod_Date: Integer; {* last mod file Date *}
Mod_Time: Integer; {* last mod file Time *}
CRC: Integer; {* CRC *}
Mod_Date: SmallInt; {* last mod file Date *}
Mod_Time: SmallInt; {* last mod file Time *}
CRC: SmallInt; {* CRC *}
U_Size: LongInt; {* uncompressed size *}
END;
ZipRecordType = RECORD {* structure of ZIP archive file header *}
Version: Integer; {* Version needed to extract *}
Bit_Flag: Integer; {* General purpose bit flag *}
Method: Integer; {* compression Method *}
Mod_Time: Integer; {* last mod file Time *}
Mod_Date: Integer; {* last mod file Date *}
Version: SmallInt; {* Version needed to extract *}
Bit_Flag: SmallInt; {* General purpose bit flag *}
Method: SmallInt; {* compression Method *}
Mod_Time: SmallInt; {* last mod file Time *}
Mod_Date: SmallInt; {* last mod file Date *}
CRC: LongInt; {* CRC-32 *}
C_Size: LongInt; {* compressed size *}
U_Size: LongInt; {* uncompressed size *}
F_Length: Integer; {* FileName Length *}
E_Length: Integer; {* extra field Length *}
F_Length: SmallInt; {* FileName Length *}
E_Length: SmallInt; {* extra field Length *}
END;
ZooRecordType = RECORD {* structure of ZOO archive file header *}
@ -77,9 +77,9 @@ TYPE
Method: Byte; {* 0 = Stored, 1 = Crunched *}
Next: LongInt; {* position of Next directory entry *}
Offset: LongInt; {* position of this file *}
Mod_Date: Word; {* modification Date (DOS format) *}
Mod_Time: Word; {* modification Time (DOS format) *}
CRC: Word; {* CRC *}
Mod_Date: SmallWord; {* modification Date (DOS format) *}
Mod_Time: SmallWord; {* modification Time (DOS format) *}
CRC: SmallWord; {* CRC *}
U_Size: LongInt; {* uncompressed size *}
C_Size: LongInt; {* compressed size *}
Major_V: Char; {* major Version number *}
@ -87,11 +87,11 @@ TYPE
Deleted: Byte; {* 0 = active, 1 = Deleted *}
Struc: Char; {* file structure if any *}
Comment: LongInt; {* location of file Comment (0 = none) *}
Cmt_Size: Word; {* Length of Comment (0 = none) *}
Cmt_Size: SmallWord; {* Length of Comment (0 = none) *}
FName: ARRAY [0..12] OF Char; {* FileName *}
Var_DirLen: Integer; {* Length of variable part of dir entry *}
Var_DirLen: SmallInt; {* Length of variable part of dir entry *}
TZ: Char; {* timezone where file was archived *}
Dir_Crc: Word; {* CRC of directory entry *}
Dir_Crc: SmallWord; {* CRC of directory entry *}
END;
LZHRecordType = RECORD {* structure of LZH archive file header *}
@ -100,11 +100,11 @@ TYPE
Method: ARRAY [1..5] OF Char; {* compression TYPE "-lh#-" *}
C_Size: LongInt; {* compressed size *}
U_Size: LongInt; {* uncompressed size *}
Mod_Time: Integer;{* last mod file Time *}
Mod_Date: Integer;{* last mod file Date *}
Attrib: Integer; {* file attributes *}
Mod_Time: SmallInt;{* last mod file Time *}
Mod_Date: SmallInt;{* last mod file Date *}
Attrib: SmallInt; {* file attributes *}
F_Length: Byte; {* Length of FileName *}
CRC: Integer; {* CRC *}
CRC: SmallInt; {* CRC *}
END;
ARJRecordType = RECORD
@ -117,20 +117,20 @@ TYPE
FileType: Byte;
GarbleMod: Byte;
Time,
Date: Integer;
Date: SmallInt;
CompSize: LongInt;
OrigSize: LongInt;
OrigCRC: ARRAY[1..4] OF Byte;
EntryName: Word;
AccessMode: Word;
HostData: Word;
EntryName: SmallWord;
AccessMode: SmallWord;
HostData: SmallWord;
END;
OutRec = RECORD {* output information structure *}
FileName: AStr; {* output file name *}
Date, {* output Date *}
Time, {* output Time *}
Method: Integer; {* output storage type *}
Method: SmallInt; {* output storage type *}
CSize, {* output compressed size *}
USize: LongInt; {* output uncompressed size *}
END;
@ -316,8 +316,8 @@ PROCEDURE ARJ_Proc(VAR ArjFile: FILE;
VAR Aborted: Boolean);
TYPE
ARJSignature = RECORD
MagicNumber: Word;
BasicHdrSiz: Word;
MagicNumber: SmallWord;
BasicHdrSiz: SmallWord;
END;
VAR
Hdr: ARJRecordType;

View File

@ -52,7 +52,7 @@ TYPE
LightBarRecordType = RECORD
XPos,
YPos: Byte;
CmdToExec: Integer;
CmdToExec: SmallInt;
CmdToShow: STRING[40];
END;
@ -99,7 +99,7 @@ TYPE
BDLUserNum,
BDLSection,
BDLPoints,
BDLUploader: Integer;
BDLUploader: SmallInt;
BDLFSize,
BDLTime: LongInt;
BDLFlags: TransferFlagSet;
@ -108,10 +108,10 @@ TYPE
BatchULRecordType = RECORD
BULFileName: Str12;
BULUserNum,
BULSection: Integer;
BULSection: SmallInt;
BULDescription: Str50;
BULVPointer: LongInt;
BULVTextSize: Integer;
BULVTextSize: SmallInt;
END;
ExtendedDescriptionArray = ARRAY [1..99] OF Str50;

View File

@ -14,7 +14,7 @@ USES
TYPE
FileRecType = RECORD
FArrayFileArea,
FArrayDirFileRecNum: Integer;
FArrayDirFileRecNum: SmallInt;
END;
FileArrayType = ARRAY [0..99] OF FileRecType;

View File

@ -30,10 +30,10 @@ TYPE
Zone, { Zone of board }
Net, { Net Address of board }
Node, { Node Address of board }
Point: Integer; { Either Point number OR 0 }
Point: SmallInt; { Either Point number OR 0 }
CallCost, { Cost to sysop to send }
MsgFee, { Cost to user to send }
NodeFlags: Word; { Node flags }
NodeFlags: SmallWord; { Node flags }
ModemType, { Modem TYPE }
PassWord: STRING[9];
Phone,
@ -46,34 +46,34 @@ TYPE
IndxRefBlk = RECORD
IndxOfs, { Offset of STRING into block }
IndxLen: Word; { Length of STRING }
IndxLen: SmallWord; { Length of STRING }
IndxData, { RECORD number of STRING }
IndxPtr: LongInt; { Block number of lower index }
END; { IndxRef }
LeafRefBlk = RECORD
KeyOfs, { Offset of STRING into block }
KeyLen: Word; { Length of STRING }
KeyLen: SmallWord; { Length of STRING }
KeyVal: LongInt; { Pointer to Data block }
END; { LeafRef }
CtlBlk = RECORD
CtlBlkSize: Word; { blocksize of Index blocks }
CtlBlkSize: SmallWord; { blocksize of Index blocks }
CtlRoot, { Block number of Root }
CtlHiBlk, { Block number of last block }
CtlLoLeaf, { Block number of first leaf }
CtlHiLeaf, { Block number of last leaf }
CtlFree: LongInt; { Head of freelist }
CtlLvls, { Number of index levels }
CtlParity: Word; { XOR of above fields }
CtlParity: SmallWord; { XOR of above fields }
END;
INodeBlk = RECORD
IndxFirst, { Pointer to next lower level }
IndxBLink, { Pointer to previous link }
IndxFLink: LongInt; { Pointer to next link }
IndxCnt: Integer; { Count of Items IN block }
IndxStr: Word; { Offset IN block of 1st str }
IndxCnt: SmallInt; { Count of Items IN block }
IndxStr: SmallWord; { Offset IN block of 1st str }
{ IF IndxFirst is NOT -1, this is INode: }
IndxRef: ARRAY [0..49] OF IndxRefBlk;
END;
@ -82,8 +82,8 @@ TYPE
IndxFirst, { Pointer to next lower level }
IndxBLink, { Pointer to previous link }
IndxFLink: LongInt; { Pointer to next link }
IndxCnt: Integer; { Count of Items IN block }
IndxStr: Word; { Offset IN block of 1st str }
IndxCnt: SmallInt; { Count of Items IN block }
IndxStr: SmallWord; { Offset IN block of 1st str }
LeafRef: ARRAY [0..49] OF LeafRefBlk;
END;
@ -184,7 +184,7 @@ TYPE
Zone,
Net,
Node,
Point: Word;
Point: SmallWord;
END;
VAR
Key: NodeType ABSOLUTE ALine;
@ -253,7 +253,7 @@ VAR
Zone,
Net,
Node,
Point: Word;
Point: SmallWord;
END;
VAR
Address: NodeType;
@ -329,10 +329,10 @@ VAR
Zone, { Zone of board }
Net, { Net Address of board }
Node, { Node Address of board }
Point: Integer; { Either Point number OR 0 }
Point: SmallInt; { Either Point number OR 0 }
CallCost, { Cost to sysop to send }
MsgFee, { Cost to user to send }
NodeFlags: Word; { Node flags }
NodeFlags: SmallWord; { Node flags }
ModemType, { Modem TYPE }
PhoneLen, { Length of Phone Number }
PassWordLen, { Length of Password }

View File

@ -52,7 +52,7 @@ TYPE
RNum: STRING[7];
NumBlocks: ARRAY [1..6] OF Char;
Status: Byte;
MBase: Word;
MBase: SmallWord;
Crap: STRING[3];
END;

View File

@ -169,7 +169,7 @@ TYPE
Name: STRING[36]; { the user's name }
Number, { user number }
Left, { Left node }
Right: Integer; { Right node }
Right: SmallInt; { Right node }
RealName, { User's real name? }
Deleted: Boolean; { deleted or not }
END;
@ -233,11 +233,11 @@ TYPE
LastMsgArea, { # last msg area }
LastFileArea, { # last file area }
UnUsedInteger1,
UnUsedInteger2: Integer;
UnUsedInteger2: SmallInt;
PasswordChanged, { Numeric date pw changed - was UnixTime }
UnUsedWord1,
UnUsedWord2: Word;
UnUsedWord2: SmallWord;
lCredit, { Amount OF credit }
Debit, { Amount OF debit }
@ -287,14 +287,14 @@ TYPE
FromToInfo = { from/to information for mheaderrec }
{$IFDEF WIN32} PACKED {$ENDIF} RECORD
Anon: Byte;
UserNum: Word; { user number }
UserNum: SmallWord; { user number }
A1S: STRING[36]; { posted as }
Real: STRING[36]; { real name }
Name: STRING[36]; { system name }
Zone,
Net,
Node,
Point: Word;
Point: SmallWord;
END;
MHeaderRec =
@ -302,12 +302,12 @@ TYPE
From,
MTO: FromToInfo; { message from/to info }
Pointer: LongInt; { starting record OF text }
TextSize: Word; { size OF text }
ReplyTo: Word; { ORIGINAL + REPLYTO = CURRENT }
TextSize: SmallWord; { size OF text }
ReplyTo: SmallWord; { ORIGINAL + REPLYTO = CURRENT }
Date: UnixTime; { date/time PACKED STRING }
DayOfWeek: Byte; { message day OF week }
Status: SET OF MsgStatusR; { message status flags }
Replies: Word; { times replied to }
Replies: SmallWord; { times replied to }
Subject: STRING[40]; { subject OF message }
OriginDate: STRING[19]; { date OF echo/group msgs }
FileAttached: Byte; { 0=No, 1=Yes&Del, 2=Yes&Save }
@ -341,7 +341,7 @@ TYPE
UnArcLine, { de-compression cmdline }
TestLine, { integrity test cmdline }
CmtLine: STRING[25]; { comment cmdline }
SuccLevel: Integer; { success errorlevel, -1=ignore results }
SuccLevel: SmallInt; { success errorlevel, -1=ignore results }
END;
ModemFlagType = { MODEM.DAT status flags }
@ -395,7 +395,7 @@ TYPE
NewSL, { new SL }
NewDSL, { new DSL }
NewMenu: Byte; { User start out menu }
Expiration: Word; { days until expiration }
Expiration: SmallWord; { days until expiration }
NewFP, { nothing }
NewCredit: LongInt; { new credit }
SoftAR, { TRUE=AR added to current, else replaces }
@ -530,13 +530,13 @@ TYPE
CreditInternetMail, { cost for Internet mail }
BirthDateCheck, { check user's birthdate every xx logons }
UnUsedInteger1,
UnUsedInteger2: Integer;
UnUsedInteger2: SmallInt;
MaxQWKTotal, { max msgs in a packet, period }
MaxQWKBase, { max msgs in a area }
DaysOnline, { days online }
UnUsedWord1,
UnUsedWord2: Word;
UnUsedWord2: SmallWord;
MinimumBaud, { minimum baud rate to logon }
MinimumDLBaud, { minimum baud rate to download }
@ -618,7 +618,7 @@ TYPE
Zone, { 21st is for UUCP address }
Net,
Node,
Point: Word;
Point: SmallWord;
END;
NewUserToggles: ARRAY [1..20] OF Byte;
@ -639,7 +639,7 @@ TYPE
ShortMessageRecordType = { SHORTMSG.DAT : One-line messages }
{$IFDEF WIN32} PACKED {$ENDIF} RECORD
Msg: AStr;
Destin: Integer;
Destin: SmallInt;
END;
VotingRecordType = { VOTING.DAT : Voting records }
@ -648,14 +648,14 @@ TYPE
Question2: STRING[60]; { Voting Question 2 }
ACS: ACString; { ACS required to vote on this }
ChoiceNumber: Byte; { number OF choices }
NumVotedQuestion: Integer; { number OF votes on it }
NumVotedQuestion: SmallInt; { number OF votes on it }
CreatedBy: STRING[36]; { who created it }
AddAnswersACS: ACString; { ACS required to add choices }
Answers: ARRAY [1..25] OF
{$IFDEF WIN32} PACKED {$ENDIF} RECORD
Answer1, { answer description }
Answer2: STRING[65]; { answer description #2 }
NumVotedAnswer: Integer; { # user's who picked this answer }
NumVotedAnswer: SmallInt; { # user's who picked this answer }
END;
END;
@ -684,11 +684,11 @@ TYPE
PostACS, { post access requirement }
MCIACS, { MCI usage requirement }
SysOpACS: ACString; { Message area sysop requirement }
MaxMsgs: Word; { max message count }
MaxMsgs: SmallWord; { max message count }
Anonymous: AnonTyp; { anonymous type }
Password: STRING[20]; { area password }
MAFlags: MAFlagSet; { message area status vars }
MAType: Integer; { Area type (0=Local,1=Echo, 3=Qwk) }
MAType: SmallInt; { Area type (0=Local,1=Echo, 3=Qwk) }
Origin: STRING[50]; { origin line }
Text_Color, { color OF standard text }
Quote_Color, { color OF quoted text }
@ -699,7 +699,7 @@ TYPE
QuoteEnd: STRING[70];
PrePostFile: STRING[8];
AKA: Byte; { alternate address }
QWKIndex: Word; { QWK indexing number }
QWKIndex: SmallWord; { QWK indexing number }
END;
FileAreaFlagType =
@ -720,7 +720,7 @@ TYPE
FileName: STRING[8]; { filename + ".DIR" }
DLPath, { download path }
ULPath: STRING[40]; { upload path }
MaxFiles: Integer; { max files allowed - VerbRec Limit would allow up to LongInt Value or Maximum 433835}
MaxFiles: SmallInt; { max files allowed - VerbRec Limit would allow up to LongInt Value or Maximum 433835}
Password: STRING[20]; { password required }
ArcType, { wanted archive type (1..max,0=inactive) }
CmtType: Byte; { wanted comment type (1..3,0=inactive) }
@ -746,14 +746,14 @@ TYPE
{$IFDEF WIN32} PACKED {$ENDIF} RECORD
FileName: STRING[12]; { Filename }
Description: STRING[50]; { File description }
FilePoints: Integer; { File points }
FilePoints: SmallInt; { File points }
Downloaded: LongInt; { Number DLs }
FileSize: LongInt; { File size in Bytes }
OwnerNum: Integer; { ULer OF file }
OwnerNum: SmallInt; { ULer OF file }
OwnerName: STRING[36]; { ULer's name }
FileDate: UnixTime; { Date ULed }
VPointer: LongInt; { Pointer to verbose descr, -1 if none }
VTextSize: Integer; { Verbose descr textsize - 50 Bytes x 99 Lines = 4950 max }
VTextSize: SmallInt; { Verbose descr textsize - 50 Bytes x 99 Lines = 4950 max }
FIFlags: FIFlagSet; { File status }
END;
@ -774,7 +774,7 @@ TYPE
MsgRead, { Messages Read }
MsgPost, { Messages Posted }
EmailSent, { Email sent }
FeedbackSent: Word; { Feedback sent }
FeedbackSent: SmallWord; { Feedback sent }
UK, { Upload/Download kbytes during call }
DK: LongInt;
Reserved: ARRAY [1..17] OF Byte; { Reserved }
@ -813,7 +813,7 @@ TYPE
EventDayOfMonth: BYTE; {If monthly, the Day of Month}
EventDays: EventDaysType; {If Daily, the Days Active}
EventStartTime, {Start Time in Min from Mid.}
EventFinishTime: WORD; {Finish Time}
EventFinishTime: SmallWord; {Finish Time}
EventQualMsg, {Msg/Path if he qualifies}
EventNotQualMsg: STRING[64]; {Msg/Path if he doesn't}
EventPreTime: BYTE; {Min. B4 event to rest. Call}
@ -824,7 +824,7 @@ TYPE
LoBaud, {Low baud rate limit}
HiBaud: LongInt; {High baud rate limit}
EventACS: ACString; {Event ACS}
MaxTimeAllowed: WORD; {Max Time per user this event}
MaxTimeAllowed: SmallWord; {Max Time per user this event}
SetARflag, {AR Flag to Set}
ClearARflag: CHAR; {AR Flag to Clear}
EFlags: EFlagSet; {Kinds of Events Supported} { Changed }
@ -881,7 +881,7 @@ TYPE
NodeRecordType = { MULTNODE.DAT }
{$IFDEF WIN32} PACKED {$ENDIF} RECORD
User: Word; { What user number }
User: SmallWord; { What user number }
UserName: STRING[36]; { User's name }
CityState: STRING[30]; { User's location }
Sex: Char; { User's sex }
@ -891,7 +891,7 @@ TYPE
ActivityDesc: STRING[50]; { Activity STRING }
Status: NodeFlagSet;
Room: Byte; { What room are they in? }
Channel: Word; { What channel are they in? }
Channel: SmallWord; { What channel are they in? }
Invited, { Have they been invited ? }
Booted, { Have they been kicked off ? }
Forget: ARRAY [0..31] OF SET OF 0..7; { Who are they forgetting? }
@ -903,7 +903,7 @@ TYPE
Anonymous: Boolean; { Is Room anonymous ? }
Private: Boolean; { Is Room private ? }
Occupied: Boolean; { Is anyone in here? }
Moderator: Word; { Who's the moderator? }
Moderator: SmallWord; { Who's the moderator? }
END;
ScanRec = { *.SCN files / MESSAGES }

View File

@ -35,16 +35,16 @@ TYPE
ToUserName: STRING[35];
Subject: STRING[71];
DateTime: STRING[19];
TimesRead: Word;
DestNode: Word;
OrigNode: Word;
Cost: Word;
OrigNet: Word;
DestNet: Word;
TimesRead: SmallWord;
DestNode: SmallWord;
OrigNode: SmallWord;
Cost: SmallWord;
OrigNet: SmallWord;
DestNet: SmallWord;
Filler: ARRAY[1..8] OF Char;
ReplyTo: Word;
Attribute: Word;
NextReply: Word;
ReplyTo: SmallWord;
Attribute: SmallWord;
NextReply: SmallWord;
END;
BufferArrayType = ARRAY[1..32767] OF Char;

View File

@ -12,13 +12,13 @@ USES
TYPE
Top10UserRecordArray = RECORD
UNum: Integer;
UNum: SmallInt;
Info: Real;
END;
Top20FileRecordArray = RECORD
DirNum,
DirRecNum: Integer;
DirRecNum: SmallInt;
Downloaded: LongInt;
END;

View File

@ -25,7 +25,7 @@ TYPE
Drive: Char;
FirstRecNum,
LastRecNum,
RecNumToEdit: Integer;
RecNumToEdit: SmallInt;
END;
CONST