diff --git a/TODO b/TODO index 246c776..adc7127 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,3 @@ - Fix the bad padding we're getting on Mac OS X PPC (put PACKED after - struct) - package up the System Folder and whatnot so that people w/o the old executor-aux can run Executor diff --git a/src/check_structs.c b/src/check_structs.c index 5c64089..c98612b 100644 --- a/src/check_structs.c +++ b/src/check_structs.c @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -94,6 +95,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +107,7 @@ #include #include #include +#include #include #include #include @@ -125,6 +128,7 @@ void check_structs(void) /* AliasMgr.h has no structs or unions */ /* AppleEvents.h */ + check (AEArrayData, 12); check (AEDesc, 8); check (AEKeyDesc, 12); check (AE_hdlr_t, 8); @@ -263,7 +267,7 @@ void check_structs(void) /* OSEvent.h */ check (EvQEl, 22); - check (size_info_t, 20); + check (size_info_t, 18); check (TargetID, 179); check (HighLevelEventMsg, 36); @@ -367,6 +371,7 @@ void check_structs(void) /* SoundMgr.h */ check (SndCommand, 8); check (SndChannel, 1060); + check (soundbuffer_t, 23); check (SoundHeader, 22); check (ExtSoundHeader, 62); check (SndDoubleBuffer, 16); @@ -407,7 +412,7 @@ void check_structs(void) #if defined(USE_VDRIVER_H) /* VDriver.h */ - check (VDParamBlock, 0); /* TODO */ + check (VDParamBlock, 0); /* TODO*/ check (VDEntryRecord, 0); /* TODO */ check (VDGammaRecord, 0); /* TODO */ check (VDPgInfo, 0); /* TODO */ @@ -437,7 +442,6 @@ void check_structs(void) check (inline_key_desc_t, 12); check (list_header_t, 24); check (ae_header_t, 66); - check (subdesc_info_t, 20); /* rsys/cfm.h */ check (cfrg_resource_t, 32); @@ -462,6 +466,11 @@ void check_structs(void) check (contrlrestype, 23); check (struct lsastr, 18); + /* rsys/emustubs.h */ + check (adbop_t, 12); + check (comm_toolbox_dispatch_args_t, 12); + check (initzonehiddenargs_t, 14); + /* rsys/dial.h */ check (icon_item_template_t, 18); @@ -518,8 +527,6 @@ void check_structs(void) check (btblock0, 512); check (cacheentry, 540); check (cachehead, 12); - check (trailentry, 8); - check (btparam, 124); check (wdentry, 16); /* rsys/hfs_plus.h */ @@ -540,7 +547,7 @@ void check_structs(void) check (HFSPlusAttrExtents, 72); /* rsys/icon.h */ - check (cotton_suite_layout_t, 28); + check (cotton_suite_layout_t, 26); /* rsys/itm.h */ check (itmstr, 14); @@ -579,7 +586,18 @@ void check_structs(void) check (block_header_t, 12); check (pblock_t, 14); + /* rsys/nextprint.h */ + check (comRect, 8); + check (comPoint, 4); + check (comBitMap, 14); + check (comPixMap, 50); + check (comFontInfo, 8); + check (struct comPoly, 14); + check (struct comRgn, 10); + check (comGrafPort, 108); + /* rsys/partition.h */ + check (partmapentry_t, 256); check (oldmapentry_t, 12); check (oldblock1_t, 506); @@ -628,10 +646,19 @@ void check_structs(void) check (finderinfo, 268); /* rsys/serial.h */ - check (sersetbuf_t, 8); + check (sersetbuf_t, 6); /* rsys/soundopts.h */ - check (ModifierStub, 52); + check (ModifierStub, 47); /* was 52 before I PACKED the structure */ + + /* rsys/syserr.h */ + check (myalerttab_t, 326); + check (struct adef, 14); + check (struct tdef, 9); + check (struct idef, 140); + check (struct pdef, 8); + check (struct bdef, 18); + check (struct sdef, 5); /* rsys/tesave.h */ check (tesave, 56); diff --git a/src/include/ADB.h b/src/include/ADB.h index 4aa3184..5b55b6c 100644 --- a/src/include/ADB.h +++ b/src/include/ADB.h @@ -8,15 +8,15 @@ * $Id: ADB.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct +typedef struct PACKED { - SignedByte devType LPACKED; - SignedByte origADBAddr LPACKED; + SignedByte devType; + SignedByte origADBAddr; Ptr dbServiceRtPtr PACKED_P; Ptr dbDataAreaAddr PACKED_P; } ADBDataBlock; -typedef struct +typedef struct PACKED { Ptr siServiceRtPtr PACKED_P; Ptr siDataAreaAddr PACKED_P; diff --git a/src/include/AppleEvents.h b/src/include/AppleEvents.h index eda1dde..b06c866 100644 --- a/src/include/AppleEvents.h +++ b/src/include/AppleEvents.h @@ -112,26 +112,26 @@ typedef ProcPtr EventFilterProcPtr; /* #### internal */ -typedef struct AE_hdlr +typedef struct PACKED AE_hdlr { - ProcPtr fn PACKED; - int32 refcon PACKED; + ProcPtr fn PACKED_P; + int32 refcon; } AE_hdlr_t; -typedef struct AE_hdlr_selector +typedef struct PACKED AE_hdlr_selector { - int32 sel0 PACKED; - int32 sel1 PACKED; + int32 sel0; + int32 sel1; } AE_hdlr_selector_t; -typedef struct AE_hdlr_table_elt +typedef struct PACKED AE_hdlr_table_elt { - int32 pad_1 PACKED; + int32 pad_1; - AE_hdlr_selector_t selector LPACKED; - AE_hdlr_t hdlr LPACKED; + AE_hdlr_selector_t selector; + AE_hdlr_t hdlr; - int32 pad_2 PACKED; + int32 pad_2; } AE_hdlr_table_elt_t; #define AE_TABLE_ELTS(table) (HxX (table, elts)) @@ -145,33 +145,33 @@ typedef struct AE_hdlr_table_elt #define AE_TABLE_N_ALLOCATED_BYTES(table) \ (CL (AE_TABLE_N_ALLOCATED_BYTES_X (table))) -typedef struct AE_hdlr_table +typedef struct PACKED AE_hdlr_table { - int32 pad_1 PACKED; + int32 pad_1; - int32 n_allocated_bytes PACKED; - int32 n_elts PACKED; + int32 n_allocated_bytes; + int32 n_elts; - int32 pad_2[10] PACKED; + int32 pad_2[10]; - AE_hdlr_table_elt_t elts[0] LPACKED; + AE_hdlr_table_elt_t elts[0]; } AE_hdlr_table_t; typedef AE_hdlr_table_t *AE_hdlr_table_ptr; typedef struct { AE_hdlr_table_ptr p PACKED_P; } HIDDEN_AE_hdlr_table_ptr; typedef HIDDEN_AE_hdlr_table_ptr *AE_hdlr_table_h; -typedef struct AE_zone_tables +typedef struct PACKED AE_zone_tables { AE_hdlr_table_h event_hdlr_table PACKED_P; AE_hdlr_table_h coercion_hdlr_table PACKED_P; AE_hdlr_table_h special_hdlr_table PACKED_P; - char pad_1[28] LPACKED; + char pad_1[28]; - char unknown_appl_value[4] LPACKED; + char unknown_appl_value[4]; - char pad_2[8] LPACKED; + char pad_2[8]; /* points to a 32byte handle of unknown contents (at least, sometimes) */ @@ -182,19 +182,19 @@ typedef AE_zone_tables_t *AE_zone_tables_ptr; typedef struct { AE_zone_tables_ptr p PACKED_P; } HIDDEN_AE_zone_tables_ptr; typedef HIDDEN_AE_zone_tables_ptr *AE_zone_tables_h; -typedef struct AE_info +typedef struct PACKED AE_info { - char pad_1[340] LPACKED; + char pad_1[340]; /* offset of `appl_zone_tables' is 340; handle to a `struct tables' */ AE_zone_tables_h appl_zone_tables PACKED_P; - char pad_2[36] LPACKED; + char pad_2[36]; /* offset of `system_zone_tables' is 380; handle to a `struct tables' */ AE_zone_tables_h system_zone_tables PACKED_P; - char pad_3[212] LPACKED; + char pad_3[212]; } AE_info_t; typedef AE_info_t *AE_info_ptr; diff --git a/src/include/CQuickDraw.h b/src/include/CQuickDraw.h index a394c44..2a98581 100644 --- a/src/include/CQuickDraw.h +++ b/src/include/CQuickDraw.h @@ -14,14 +14,14 @@ typedef struct #define minSeed 1024 -typedef struct +typedef struct PACKED { - LONGINT iTabSeed PACKED; - INTEGER iTabRes PACKED; + LONGINT iTabSeed; + INTEGER iTabRes; /* can't use [0]; make this an unsigned char even tho the mac has SignedByte; it is treated as unsigned */ - unsigned char iTTable[1] LPACKED; + unsigned char iTTable[1]; } ITab, *ITabPtr; typedef struct { ITabPtr p PACKED_P; } HIDDEN_ITabPtr; @@ -34,7 +34,7 @@ typedef struct { GDHandle p PACKED_P; } HIDDEN_GDHandle; typedef struct { struct SProcRec *p PACKED_P; } HIDDEN_SProcPtr; typedef HIDDEN_SProcPtr *SProcHndl; -typedef struct SProcRec +typedef struct PACKED SProcRec { SProcHndl nxtSrch PACKED_P; ProcPtr srchProc PACKED_P; @@ -42,7 +42,7 @@ typedef struct SProcRec typedef struct { struct CProcRec *p PACKED_P; } HIDDEN_CProcPtr; typedef HIDDEN_CProcPtr *CProcHndl; -typedef struct CProcRec +typedef struct PACKED CProcRec { CProcHndl nxtComp PACKED_P; ProcPtr compProc PACKED_P; @@ -50,26 +50,26 @@ typedef struct CProcRec typedef void *DeviceLoopDrawingProcPtr; -typedef struct GDevice +typedef struct PACKED GDevice { - INTEGER gdRefNum PACKED; - INTEGER gdID PACKED; - INTEGER gdType PACKED; + INTEGER gdRefNum; + INTEGER gdID; + INTEGER gdType; ITabHandle gdITable PACKED_P; - INTEGER gdResPref PACKED; + INTEGER gdResPref; SProcHndl gdSearchProc PACKED_P; CProcHndl gdCompProc PACKED_P; - INTEGER gdFlags PACKED; + INTEGER gdFlags; PixMapHandle gdPMap PACKED_P; - LONGINT gdRefCon PACKED; + LONGINT gdRefCon; GDHandle gdNextGD PACKED_P; - Rect gdRect LPACKED; - LONGINT gdMode PACKED; - INTEGER gdCCBytes PACKED; - INTEGER gdCCDepth PACKED; + Rect gdRect; + LONGINT gdMode; + INTEGER gdCCBytes; + INTEGER gdCCDepth; Handle gdCCXData PACKED_P; Handle gdCCXMask PACKED_P; - LONGINT gdReserved PACKED; + LONGINT gdReserved; } GDevice; typedef uint32 DeviceLoopFlags; @@ -79,23 +79,23 @@ typedef uint32 DeviceLoopFlags; #define dontMatchSeeds (1 << 1) #define allDevices (1 << 2) -typedef struct ColorInfo +typedef struct PACKED ColorInfo { - RGBColor ciRGB LPACKED; - INTEGER ciUsage PACKED; - INTEGER ciTolerance PACKED; - INTEGER ciFlags PACKED; - LONGINT ciPrivate PACKED; + RGBColor ciRGB; + INTEGER ciUsage; + INTEGER ciTolerance; + INTEGER ciFlags; + LONGINT ciPrivate; } ColorInfo; -typedef struct Palette +typedef struct PACKED Palette { - INTEGER pmEntries PACKED; + INTEGER pmEntries; GrafPtr pmWindow PACKED_P; - INTEGER pmPrivate PACKED; - LONGINT /* Handle? */ pmDevices PACKED; - Handle pmSeeds PACKED; - ColorInfo pmInfo[1] LPACKED; + INTEGER pmPrivate; + LONGINT /* Handle? */ pmDevices; + Handle pmSeeds PACKED_P; + ColorInfo pmInfo[1]; } Palette, *PalettePtr; typedef enum @@ -144,79 +144,79 @@ typedef LONGINT GWorldFlags; typedef CGrafPort GWorld, *GWorldPtr; -typedef struct ReqListRec +typedef struct PACKED ReqListRec { - INTEGER reqLSize PACKED; - INTEGER reqLData[1] PACKED; + INTEGER reqLSize; + INTEGER reqLData[1]; } ReqListRec; /* extended version 2 picture datastructures */ -typedef struct OpenCPicParams +typedef struct PACKED OpenCPicParams { - Rect srcRect LPACKED; - Fixed hRes PACKED; - Fixed vRes PACKED; - int16 version PACKED; - int16 reserved1 PACKED; - int32 reserved2 PACKED; + Rect srcRect; + Fixed hRes; + Fixed vRes; + int16 version; + int16 reserved1; + int32 reserved2; } OpenCPicParams; -typedef struct CommonSpec +typedef struct PACKED CommonSpec { - int16 count PACKED; - int16 ID PACKED; + int16 count; + int16 ID; } CommentSpec; typedef CommentSpec *CommentSpecPtr; typedef struct { CommentSpecPtr p PACKED_P; } HIDDEN_CommentSpecPtr; typedef HIDDEN_CommentSpecPtr *CommentSpecHandle; -typedef struct FontSpec +typedef struct PACKED FontSpec { - int16 pictFontID PACKED; - int16 sysFontID PACKED; - int32 size[4] PACKED; - int16 style PACKED; - int32 nameOffset PACKED; + int16 pictFontID; + int16 sysFontID; + int32 size[4]; + int16 style; + int32 nameOffset; } FontSpec; typedef FontSpec *FontSpecPtr; typedef struct { FontSpecPtr p PACKED_P; } HIDDEN_FontSpecPtr; typedef HIDDEN_FontSpecPtr *FontSpecHandle; -typedef struct PictInfo +typedef struct PACKED PictInfo { - int16 version PACKED; /* 0 */ - int32 uniqueColors PACKED; /* 2 */ + int16 version; /* 0 */ + int32 uniqueColors; /* 2 */ PaletteHandle thePalette PACKED_P; /* 6 */ CTabHandle theColorTable PACKED_P; /* 10 */ - Fixed hRes PACKED; /* 14 */ - Fixed vRes PACKED; /* 18 */ - INTEGER depth PACKED; /* 22 */ - Rect sourceRect LPACKED; /* top24, left26, bottom28, right30 */ - int32 textCount PACKED; /* 32 */ - int32 lineCount PACKED; - int32 rectCount PACKED; - int32 rRectCount PACKED; - int32 ovalCount PACKED; - int32 arcCount PACKED; - int32 polyCount PACKED; - int32 regionCount PACKED; - int32 bitMapCount PACKED; - int32 pixMapCount PACKED; - int32 commentCount PACKED; + Fixed hRes; /* 14 */ + Fixed vRes; /* 18 */ + INTEGER depth; /* 22 */ + Rect sourceRect; /* top24, left26, bottom28, right30 */ + int32 textCount; /* 32 */ + int32 lineCount; + int32 rectCount; + int32 rRectCount; + int32 ovalCount; + int32 arcCount; + int32 polyCount; + int32 regionCount; + int32 bitMapCount; + int32 pixMapCount; + int32 commentCount; - int32 uniqueComments PACKED; + int32 uniqueComments; CommentSpecHandle commentHandle PACKED_P; - int32 uniqueFonts PACKED; + int32 uniqueFonts; FontSpecHandle fontHandle PACKED_P; Handle fontNamesHandle PACKED_P; - int32 reserved1 PACKED; - int32 reserved2 PACKED; + int32 reserved1; + int32 reserved2; } PictInfo; typedef PictInfo *PictInfoPtr; diff --git a/src/include/CommTool.h b/src/include/CommTool.h index b8ab601..0e6a7b8 100644 --- a/src/include/CommTool.h +++ b/src/include/CommTool.h @@ -8,18 +8,18 @@ * $Id: CommTool.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct +typedef struct PACKED { QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - INTEGER crmVersion PACKED; - LONGINT crmPrivate PACKED; - INTEGER crmReserved PACKED; - LONGINT crmDeviceType PACKED; - LONGINT crmDeviceID PACKED; - LONGINT crmAttributes PACKED; - LONGINT crmStatus PACKED; - LONGINT crmRefCon PACKED; + INTEGER qType; + INTEGER crmVersion; + LONGINT crmPrivate; + INTEGER crmReserved; + LONGINT crmDeviceType; + LONGINT crmDeviceID; + LONGINT crmAttributes; + LONGINT crmStatus; + LONGINT crmRefCon; } CRMRec, *CRMRecPtr; @@ -32,16 +32,16 @@ enum { crmRecVersion = 1 }; enum { curCRMSerRecVer = 0 }; enum { crmSerialDevice = 1 }; -typedef struct +typedef struct PACKED { - INTEGER version PACKED; + INTEGER version; StringHandle inputDriverName PACKED_P; StringHandle outputDriverName PACKED_P; StringHandle name PACKED_P; - Handle deviceIcon PACKED; - LONGINT ratedSpeed PACKED; - LONGINT maxSpeed PACKED; - LONGINT reserved PACKED; + Handle deviceIcon ; + LONGINT ratedSpeed; + LONGINT maxSpeed; + LONGINT reserved; } CRMSerialRecord, *CRMSerialPtr; diff --git a/src/include/ControlMgr.h b/src/include/ControlMgr.h index f7f8d68..952d63c 100644 --- a/src/include/ControlMgr.h +++ b/src/include/ControlMgr.h @@ -84,27 +84,27 @@ typedef struct { ControlHandle p PACKED_P; } HIDDEN_ControlHandle; #include "WindowMgr.h" -struct __cr { - ControlHandle nextControl PACKED_P; /* actually ControlHandle */ - WindowPtr contrlOwner PACKED_P; - Rect contrlRect LPACKED; - Byte contrlVis LPACKED; - Byte contrlHilite LPACKED; - INTEGER contrlValue PACKED; - INTEGER contrlMin PACKED; - INTEGER contrlMax PACKED; - Handle contrlDefProc PACKED_P; - Handle contrlData PACKED_P; - ProcPtr contrlAction PACKED_P; - LONGINT contrlRfCon PACKED; - Str255 contrlTitle LPACKED; +struct PACKED __cr { + ControlHandle nextControl PACKED_P; /* actually ControlHandle */ + WindowPtr contrlOwner PACKED_P; + Rect contrlRect; + Byte contrlVis; + Byte contrlHilite; + INTEGER contrlValue; + INTEGER contrlMin; + INTEGER contrlMax; + Handle contrlDefProc PACKED_P; + Handle contrlData PACKED_P; + ProcPtr contrlAction PACKED_P; + LONGINT contrlRfCon; + Str255 contrlTitle; }; -typedef struct { - LONGINT ccSeed PACKED; - INTEGER ccReserved PACKED; - INTEGER ctSize PACKED; - cSpecArray ctTable LPACKED; +typedef struct PACKED { + LONGINT ccSeed; + INTEGER ccReserved; + INTEGER ctSize; + cSpecArray ctTable; } CtlCTab, *CCTabPtr; typedef struct { CCTabPtr p PACKED_P; } HIDDEN_CCTabPtr; typedef HIDDEN_CCTabPtr *CCTabHandle; @@ -114,13 +114,13 @@ typedef struct { AuxCtlPtr p PACKED_P; } HIDDEN_AuxCtlPtr; typedef HIDDEN_AuxCtlPtr *AuxCtlHandle; typedef struct { AuxCtlHandle p PACKED_P; } HIDDEN_AuxCtlHandle; -typedef struct AuxCtlRec { - AuxCtlHandle acNext PACKED_P; - ControlHandle acOwner PACKED_P; - CCTabHandle acCTable PACKED_P; - INTEGER acFlags PACKED; - LONGINT acReserved PACKED; - LONGINT acRefCon PACKED; +typedef struct PACKED AuxCtlRec { + AuxCtlHandle acNext PACKED_P; + ControlHandle acOwner PACKED_P; + CCTabHandle acCTable PACKED_P; + INTEGER acFlags; + LONGINT acReserved; + LONGINT acRefCon; } AuxCtlRec; #if !defined (AuxCtlHead_H) diff --git a/src/include/DeviceMgr.h b/src/include/DeviceMgr.h index cb9c26d..cba007b 100644 --- a/src/include/DeviceMgr.h +++ b/src/include/DeviceMgr.h @@ -27,17 +27,17 @@ typedef struct { Str255 udrvrName; } umacdriver, *umacdriverptr; -typedef struct { - INTEGER drvrFlags PACKED; - INTEGER drvrDelay PACKED; - INTEGER drvrEMask PACKED; - INTEGER drvrMenu PACKED; - INTEGER drvrOpen PACKED; - INTEGER drvrPrime PACKED; - INTEGER drvrCtl PACKED; - INTEGER drvrStatus PACKED; - INTEGER drvrClose PACKED; - char drvrName LPACKED; +typedef struct PACKED { + INTEGER drvrFlags; + INTEGER drvrDelay; + INTEGER drvrEMask; + INTEGER drvrMenu; + INTEGER drvrOpen; + INTEGER drvrPrime; + INTEGER drvrCtl; + INTEGER drvrStatus; + INTEGER drvrClose; + char drvrName; } ramdriver; typedef ramdriver *ramdriverptr; @@ -46,18 +46,18 @@ typedef HIDDEN_ramdriverptr *ramdriverhand; typedef enum { Open, Prime, Ctl, Stat, Close } DriverRoutineType; -typedef struct { - umacdriverptr dCtlDriver PACKED_P; /* not just Ptr */ - INTEGER dCtlFlags PACKED; - QHdr dCtlQHdr LPACKED; - LONGINT dCtlPosition PACKED; - Handle dCtlStorage PACKED_P; - INTEGER dCtlRefNum PACKED; - LONGINT dCtlCurTicks PACKED; - WindowPtr dCtlWindow PACKED_P; - INTEGER dCtlDelay PACKED; - INTEGER dCtlEMask PACKED; - INTEGER dCtlMenu PACKED; +typedef struct PACKED { + umacdriverptr dCtlDriver PACKED_P; /* not just Ptr */ + INTEGER dCtlFlags; + QHdr dCtlQHdr; + LONGINT dCtlPosition; + Handle dCtlStorage PACKED_P; + INTEGER dCtlRefNum; + LONGINT dCtlCurTicks; + WindowPtr dCtlWindow PACKED_P; + INTEGER dCtlDelay; + INTEGER dCtlEMask; + INTEGER dCtlMenu; } DCtlEntry, *DCtlPtr; typedef struct { DCtlPtr p PACKED_P; } HIDDEN_DCtlPtr; typedef HIDDEN_DCtlPtr *DCtlHandle; diff --git a/src/include/DialogMgr.h b/src/include/DialogMgr.h index e742834..3ace66d 100644 --- a/src/include/DialogMgr.h +++ b/src/include/DialogMgr.h @@ -30,14 +30,14 @@ #define noteIcon 1 #define cautionIcon 2 -typedef struct +typedef struct PACKED { - WindowRecord window LPACKED; - Handle items PACKED_P; - TEHandle textH PACKED_P; - INTEGER editField PACKED; - INTEGER editOpen PACKED; - INTEGER aDefItem PACKED; + WindowRecord window; + Handle items PACKED_P; + TEHandle textH PACKED_P; + INTEGER editField; + INTEGER editOpen; + INTEGER aDefItem; } DialogRecord; typedef DialogRecord *DialogPeek; @@ -60,42 +60,42 @@ typedef HIDDEN_WindowPtr HIDDEN_DialogPtr; #define DIALOG_EDIT_OPEN(dialog) (CW (DIALOG_EDIT_OPEN_X (dialog))) #define DIALOG_ADEF_ITEM(dialog) (CW (DIALOG_ADEF_ITEM_X (dialog))) -typedef struct +typedef struct PACKED { - Rect boundsRect LPACKED; - INTEGER procID PACKED; - BOOLEAN visible LPACKED; - BOOLEAN filler1 LPACKED; - BOOLEAN goAwayFlag LPACKED; - BOOLEAN filler2 LPACKED; - LONGINT refCon PACKED; - INTEGER itemsID PACKED; - Str255 title LPACKED; + Rect boundsRect; + INTEGER procID; + BOOLEAN visible; + BOOLEAN filler1; + BOOLEAN goAwayFlag; + BOOLEAN filler2; + LONGINT refCon; + INTEGER itemsID; + Str255 title; } DialogTemplate; typedef DialogTemplate *DialogTPtr; typedef struct { DialogTPtr p PACKED_P; } HIDDEN_DialogTPtr; typedef HIDDEN_DialogTPtr *DialogTHndl; -typedef struct { - unsigned boldItm4: 1 PACKED; - unsigned boxDrwn4: 1 PACKED; - unsigned sound4: 2 PACKED; - unsigned boldItm3: 1 PACKED; - unsigned boxDrwn3: 1 PACKED; - unsigned sound3: 2 PACKED; - unsigned boldItm2: 1 PACKED; - unsigned boxDrwn2: 1 PACKED; - unsigned sound2: 2 PACKED; - unsigned boldItm1: 1 PACKED; - unsigned boxDrwn1: 1 PACKED; - unsigned sound1: 2 PACKED; +typedef struct PACKED { + unsigned boldItm4: 1; + unsigned boxDrwn4: 1; + unsigned sound4: 2; + unsigned boldItm3: 1; + unsigned boxDrwn3: 1; + unsigned sound3: 2; + unsigned boldItm2: 1; + unsigned boxDrwn2: 1; + unsigned sound2: 2; + unsigned boldItm1: 1; + unsigned boxDrwn1: 1; + unsigned sound1: 2; } StageList; -typedef struct { - Rect boundsRect LPACKED; - INTEGER itemsID PACKED; - StageList stages LPACKED; +typedef struct PACKED { + Rect boundsRect; + INTEGER itemsID; + StageList stages; } AlertTemplate; typedef AlertTemplate *AlertTPtr; typedef struct { AlertTPtr p PACKED_P; } HIDDEN_AlertTPtr; diff --git a/src/include/Disk.h b/src/include/Disk.h index 4e980d9..0da09ed 100644 --- a/src/include/Disk.h +++ b/src/include/Disk.h @@ -1,7 +1,6 @@ #if !defined (__DISK__) #define __DISK__ - /* * Copyright 1986, 1989, 1990 by Abacus Research and Development, Inc. * All rights reserved. @@ -33,20 +32,20 @@ #define noDriveErr (-64) #define lastDskErr (-64) -typedef struct { - INTEGER track PACKED; - SignedByte writeProt LPACKED; - SignedByte diskInPlace LPACKED; - SignedByte installed LPACKED; - SignedByte sides LPACKED; - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - INTEGER dQDrive PACKED; - INTEGER dQRefNum PACKED; - INTEGER dQFSID PACKED; - SignedByte twoSideFmt LPACKED; - SignedByte needsFlush LPACKED; - INTEGER diskErrs PACKED; +typedef struct PACKED { + INTEGER track; + SignedByte writeProt; + SignedByte diskInPlace; + SignedByte installed; + SignedByte sides; + QElemPtr qLink PACKED_P; + INTEGER qType; + INTEGER dQDrive; + INTEGER dQRefNum; + INTEGER dQFSID; + SignedByte twoSideFmt; + SignedByte needsFlush; + INTEGER diskErrs; } DrvSts; diff --git a/src/include/EditionMgr.h b/src/include/EditionMgr.h index 58f2caa..67ca506 100644 --- a/src/include/EditionMgr.h +++ b/src/include/EditionMgr.h @@ -35,78 +35,78 @@ typedef ProcPtr ExpModalFilterProcPtr; typedef ProcPtr FormatIOProcPtr; typedef ProcPtr EditionOpenerProcPtr; -struct SectionRecord +struct PACKED SectionRecord { - SignedByte version LPACKED; - SectionType kind LPACKED; - UpdateMode mode PACKED; - TimeStamp mdDate PACKED; - int32 sectionID PACKED; - int32 refCon PACKED; + SignedByte version; + SectionType kind; + UpdateMode mode; + TimeStamp mdDate; + int32 sectionID; + int32 refCon; AliasHandle alias PACKED_P; - int32 subPart PACKED; + int32 subPart; /* ### Section */ Handle nextSection PACKED_P; Handle controlBlock PACKED_P; - EditionRefNum refNum PACKED; + EditionRefNum refNum; }; declare_record_subtypes (Section); -struct EditionContainerSpec +struct PACKED EditionContainerSpec { - FSSpec theFile LPACKED; - ScriptCode theFileScript PACKED; - int32 thePart PACKED; - Str31 thePartName LPACKED; - ScriptCode thePartScript PACKED; + FSSpec theFile; + ScriptCode theFileScript; + int32 thePart; + Str31 thePartName; + ScriptCode thePartScript; }; typedef struct EditionContainerSpec EditionContainerSpec; typedef EditionContainerSpec *EditionContainerSpecPtr; -struct EditionInfoRecord +struct PACKED EditionInfoRecord { - TimeStamp crDate PACKED; - TimeStamp mdDate PACKED; - OSType fdCreator PACKED; - OSType fdType PACKED; - EditionContainerSpec container LPACKED; + TimeStamp crDate; + TimeStamp mdDate; + OSType fdCreator; + OSType fdType; + EditionContainerSpec container; }; typedef struct EditionInfoRecord EditionInfoRecord; typedef EditionInfoRecord *EditionInfoPtr; -struct NewPublisherReply +struct PACKED NewPublisherReply { - Boolean canceled LPACKED; - Boolean replacing LPACKED; - Boolean usePart LPACKED; + Boolean canceled; + Boolean replacing; + Boolean usePart; uint8 _filler; Handle preview PACKED_P; - FormatType previewFormat LPACKED; - EditionContainerSpec container LPACKED; + FormatType previewFormat; + EditionContainerSpec container; }; typedef struct NewPublisherReply NewPublisherReply; typedef NewPublisherReply *NewPublisherReplyPtr; -struct NewSubscriberReply +struct PACKED NewSubscriberReply { - Boolean canceled LPACKED; - SignedByte formatsMask LPACKED; - EditionContainerSpec container LPACKED; + Boolean canceled; + SignedByte formatsMask; + EditionContainerSpec container; }; typedef struct NewSubscriberReply NewSubscriberReply; typedef NewSubscriberReply *NewSubscriberReplyPtr; -struct SectionOptionsReply +struct PACKED SectionOptionsReply { - Boolean canceled LPACKED; - Boolean changed LPACKED; + Boolean canceled; + Boolean changed; SectionHandle sectionH PACKED_P; - ResType action PACKED; + ResType action; }; typedef struct SectionOptionsReply SectionOptionsReply; @@ -120,16 +120,16 @@ typedef uint8 EditionOpenerVerb; #define eoCloseNew (3) #define eoCanSubscribe (4) -struct EditionOpenerParamBlock +struct PACKED EditionOpenerParamBlock { - EditionInfoRecord info LPACKED; + EditionInfoRecord info; SectionHandle sectionH PACKED_P; FSSpecPtr document PACKED_P; - OSType fdCreator PACKED; - int32 ioRefNum PACKED; + OSType fdCreator; + int32 ioRefNum; FormatIOProcPtr ioProc PACKED_P; - Boolean success LPACKED; - SignedByte formatsMask LPACKED; + Boolean success; + SignedByte formatsMask; }; typedef struct EditionOpenerParamBlock EditionOpenerParamBlock; @@ -142,14 +142,14 @@ typedef uint8 FormatIOVerb; #define ioNewFormat (2) #define ioWtriteFormat (3) -struct FormatIOParamBlock +struct PACKED FormatIOParamBlock { - int32 ioRefNum PACKED; - FormatType format LPACKED; - int32 formatIndex PACKED; - int32 offset PACKED; + int32 ioRefNum; + FormatType format; + int32 formatIndex; + int32 offset; Ptr buffPtr PACKED_P; - int32 buffLen PACKED; + int32 buffLen; }; typedef struct FormatIOParamBlock FormatIOParamBlock; diff --git a/src/include/EventMgr.h b/src/include/EventMgr.h index 67ee0b3..9da6b1c 100644 --- a/src/include/EventMgr.h +++ b/src/include/EventMgr.h @@ -63,12 +63,12 @@ enum rightControlKey = 0x8000 }; -typedef struct { - INTEGER what PACKED; - LONGINT message PACKED; - LONGINT when PACKED; - Point where LPACKED; - INTEGER modifiers PACKED; +typedef struct PACKED { + INTEGER what; + LONGINT message; + LONGINT when; + Point where; + INTEGER modifiers; } EventRecord; #if !defined (KeyMap) diff --git a/src/include/FileMgr.h b/src/include/FileMgr.h index 2a2844b..50243cc 100644 --- a/src/include/FileMgr.h +++ b/src/include/FileMgr.h @@ -70,34 +70,34 @@ enum diffVolErr = -1303, }; -typedef struct { - OSType fdType PACKED; - OSType fdCreator PACKED; - unsigned short fdFlags PACKED; - Point fdLocation LPACKED; - unsigned short fdFldr PACKED; +typedef struct PACKED { + OSType fdType; + OSType fdCreator; + uint16_t fdFlags; + Point fdLocation; + uint16_t fdFldr; } FInfo; -typedef struct { - unsigned short fdIconID PACKED; - unsigned short fdUnused[4] PACKED; - unsigned short fdComment PACKED; - LONGINT fdPutAway PACKED; +typedef struct PACKED { + uint16_t fdIconID; + uint16_t fdUnused[4]; + uint16_t fdComment; + LONGINT fdPutAway; } FXInfo; -typedef struct { - Rect frRect LPACKED; - unsigned short frFlags PACKED; - Point frLocation LPACKED; - unsigned short frView PACKED; +typedef struct PACKED { + Rect frRect; + uint16_t frFlags; + Point frLocation; + uint16_t frView; } DInfo; -typedef struct { - Point frScroll LPACKED; - LONGINT frOpenChain PACKED; - unsigned short frUnused PACKED; - unsigned short frComment PACKED; - LONGINT frPutAway PACKED; +typedef struct PACKED { + Point frScroll; + LONGINT frOpenChain; + uint16_t frUnused; + uint16_t frComment; + LONGINT frPutAway; } DXInfo; typedef enum { @@ -109,70 +109,70 @@ typedef enum { #define COMMONFSQUEUEDEFS \ QElemPtr qLink PACKED_P; \ - INTEGER qType PACKED; \ - INTEGER ioTrap PACKED; \ + INTEGER qType; \ + INTEGER ioTrap; \ Ptr ioCmdAddr PACKED_P; \ ProcPtr ioCompletion PACKED_P; \ - OSErr ioResult PACKED; \ + OSErr ioResult; \ StringPtr ioNamePtr PACKED_P; \ - INTEGER ioVRefNum /* PACKED gets added in by guys who use this macro. */ + INTEGER ioVRefNum -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioRefNum PACKED; - SignedByte ioVersNum LPACKED; - SignedByte ioPermssn LPACKED; - LONGINT ioMisc PACKED; /* should be largest of Ptr, LONGINT */ - Ptr ioBuffer PACKED_P; - LONGINT ioReqCount PACKED; - LONGINT ioActCount PACKED; - INTEGER ioPosMode PACKED; - LONGINT ioPosOffset PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioRefNum; + SignedByte ioVersNum; + SignedByte ioPermssn; + LONGINT ioMisc; /* should be largest of Ptr, LONGINT */ + Ptr ioBuffer PACKED_P; + LONGINT ioReqCount; + LONGINT ioActCount; + INTEGER ioPosMode; + LONGINT ioPosOffset; } ioParam; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioFRefNum PACKED; - SignedByte ioFVersNum LPACKED; - SignedByte filler1 LPACKED; - INTEGER ioFDirIndex PACKED; - SignedByte ioFlAttrib LPACKED; - SignedByte ioFlVersNum LPACKED; - FInfo ioFlFndrInfo LPACKED; - LONGINT ioFlNum PACKED; - INTEGER ioFlStBlk PACKED; - LONGINT ioFlLgLen PACKED; - LONGINT ioFlPyLen PACKED; - INTEGER ioFlRStBlk PACKED; - LONGINT ioFlRLgLen PACKED; - LONGINT ioFlRPyLen PACKED; - LONGINT ioFlCrDat PACKED; - LONGINT ioFlMdDat PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioFRefNum; + SignedByte ioFVersNum; + SignedByte filler1; + INTEGER ioFDirIndex; + SignedByte ioFlAttrib; + SignedByte ioFlVersNum; + FInfo ioFlFndrInfo; + LONGINT ioFlNum; + INTEGER ioFlStBlk; + LONGINT ioFlLgLen; + LONGINT ioFlPyLen; + INTEGER ioFlRStBlk; + LONGINT ioFlRLgLen; + LONGINT ioFlRPyLen; + LONGINT ioFlCrDat; + LONGINT ioFlMdDat; } fileParam; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - LONGINT filler2 PACKED; - INTEGER ioVolIndex PACKED; - LONGINT ioVCrDate PACKED; - LONGINT ioVLsBkUp PACKED; - unsigned short ioVAtrb PACKED; - unsigned short ioVNmFls PACKED; - unsigned short ioVDirSt PACKED; - unsigned short ioVBlLn PACKED; - unsigned short ioVNmAlBlks PACKED; - LONGINT ioVAlBlkSiz PACKED; - LONGINT ioVClpSiz PACKED; - unsigned short ioAlBlSt PACKED; - LONGINT ioVNxtFNum PACKED; - unsigned short ioVFrBlk PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + LONGINT filler2; + INTEGER ioVolIndex; + LONGINT ioVCrDate; + LONGINT ioVLsBkUp; + uint16_t ioVAtrb; + uint16_t ioVNmFls; + uint16_t ioVDirSt; + uint16_t ioVBlLn; + uint16_t ioVNmAlBlks; + LONGINT ioVAlBlkSiz; + LONGINT ioVClpSiz; + uint16_t ioAlBlSt; + LONGINT ioVNxtFNum; + uint16_t ioVFrBlk; } volumeParam; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioCRefNum PACKED; - INTEGER csCode PACKED; - INTEGER csParam[11] PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioCRefNum; + INTEGER csCode; + INTEGER csParam[11]; } cntrlParam; typedef union { @@ -183,65 +183,65 @@ typedef union { } ParamBlockRec; typedef ParamBlockRec *ParmBlkPtr; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioRefNum PACKED; - SignedByte ioVersNum LPACKED; - SignedByte ioPermssn LPACKED; - LONGINT ioMisc PACKED; /* should be largest of Ptr, LONGINT */ - Ptr ioBuffer PACKED_P; - LONGINT ioReqCount PACKED; - LONGINT ioActCount PACKED; - INTEGER ioPosMode PACKED; - LONGINT ioPosOffset PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioRefNum; + SignedByte ioVersNum; + SignedByte ioPermssn; + LONGINT ioMisc; /* should be largest of Ptr, LONGINT */ + Ptr ioBuffer PACKED_P; + LONGINT ioReqCount; + LONGINT ioActCount; + INTEGER ioPosMode; + LONGINT ioPosOffset; } HIoParam; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioFRefNum PACKED; - SignedByte ioFVersNum LPACKED; - SignedByte filler1 LPACKED; - INTEGER ioFDirIndex PACKED; - SignedByte ioFlAttrib LPACKED; - SignedByte ioFlVersNum LPACKED; - FInfo ioFlFndrInfo LPACKED; -/*-->*/ LONGINT ioDirID PACKED; - INTEGER ioFlStBlk PACKED; - LONGINT ioFlLgLen PACKED; - LONGINT ioFlPyLen PACKED; - INTEGER ioFlRStBlk PACKED; - LONGINT ioFlRLgLen PACKED; - LONGINT ioFlRPyLen PACKED; - LONGINT ioFlCrDat PACKED; - LONGINT ioFlMdDat PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioFRefNum; + SignedByte ioFVersNum; + SignedByte filler1; + INTEGER ioFDirIndex; + SignedByte ioFlAttrib; + SignedByte ioFlVersNum; + FInfo ioFlFndrInfo; + /*-->*/ LONGINT ioDirID; + INTEGER ioFlStBlk; + LONGINT ioFlLgLen; + LONGINT ioFlPyLen; + INTEGER ioFlRStBlk; + LONGINT ioFlRLgLen; + LONGINT ioFlRPyLen; + LONGINT ioFlCrDat; + LONGINT ioFlMdDat; } HFileParam; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - LONGINT pfiller2 PACKED; - INTEGER ioVolIndex PACKED; - LONGINT ioVCrDate PACKED; -/*-->*/ LONGINT ioVLsMod PACKED; - INTEGER ioVAtrb PACKED; - unsigned short ioVNmFls PACKED; -/*-->*/ unsigned short ioVBitMap PACKED; -/*-->*/ unsigned short ioVAllocPtr PACKED; - unsigned short ioVNmAlBlks PACKED; - LONGINT ioVAlBlkSiz PACKED; - LONGINT ioVClpSiz PACKED; - unsigned short ioAlBlSt PACKED; -/*-->*/ LONGINT ioVNxtCNID PACKED; - unsigned short ioVFrBlk PACKED; -/*-->*/ unsigned short ioVSigWord PACKED; -/*-->*/ INTEGER ioVDrvInfo PACKED; -/*-->*/ INTEGER ioVDRefNum PACKED; -/*-->*/ INTEGER ioVFSID PACKED; -/*-->*/ LONGINT ioVBkUp PACKED; -/*-->*/ unsigned short ioVSeqNum PACKED; -/*-->*/ LONGINT ioVWrCnt PACKED; -/*-->*/ LONGINT ioVFilCnt PACKED; -/*-->*/ LONGINT ioVDirCnt PACKED; -/*-->*/ LONGINT ioVFndrInfo[8] PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + LONGINT pfiller2; + INTEGER ioVolIndex; + LONGINT ioVCrDate; + /*-->*/ LONGINT ioVLsMod; + INTEGER ioVAtrb; + uint16_t ioVNmFls; + /*-->*/ uint16_t ioVBitMap; + /*-->*/ uint16_t ioVAllocPtr; + uint16_t ioVNmAlBlks; + LONGINT ioVAlBlkSiz; + LONGINT ioVClpSiz; + uint16_t ioAlBlSt; + /*-->*/ LONGINT ioVNxtCNID; + uint16_t ioVFrBlk; + /*-->*/ uint16_t ioVSigWord; + /*-->*/ INTEGER ioVDrvInfo; + /*-->*/ INTEGER ioVDRefNum; + /*-->*/ INTEGER ioVFSID; + /*-->*/ LONGINT ioVBkUp; + /*-->*/ uint16_t ioVSeqNum; + /*-->*/ LONGINT ioVWrCnt; + /*-->*/ LONGINT ioVFilCnt; + /*-->*/ LONGINT ioVDirCnt; + /*-->*/ LONGINT ioVFndrInfo[8]; } HVolumeParam; typedef union { @@ -254,43 +254,43 @@ typedef HParamBlockRec *HParmBlkPtr; typedef enum { hfileInfo, dirInfo } CInfoType; #define COMMONCINFODEFS \ - COMMONFSQUEUEDEFS PACKED; \ - INTEGER ioFRefNum PACKED; \ - SignedByte ioFVersNum LPACKED; \ - SignedByte filler1 LPACKED; \ - INTEGER ioFDirIndex PACKED; \ - SignedByte ioFlAttrib LPACKED; \ - SignedByte ioACUser /* PACKED gets added in by guys who use this macro. */ + COMMONFSQUEUEDEFS; \ + INTEGER ioFRefNum; \ + SignedByte ioFVersNum; \ + SignedByte filler1; \ + INTEGER ioFDirIndex; \ + SignedByte ioFlAttrib; \ + SignedByte ioACUser -typedef struct { - COMMONCINFODEFS LPACKED; - FInfo ioFlFndrInfo LPACKED; - LONGINT ioDirID PACKED; - INTEGER ioFlStBlk PACKED; - LONGINT ioFlLgLen PACKED; - LONGINT ioFlPyLen PACKED; - INTEGER ioFlRStBlk PACKED; - LONGINT ioFlRLgLen PACKED; - LONGINT ioFlRPyLen PACKED; - LONGINT ioFlCrDat PACKED; - LONGINT ioFlMdDat PACKED; - LONGINT ioFlBkDat PACKED; - FXInfo ioFlXFndrInfo LPACKED; - LONGINT ioFlParID PACKED; - LONGINT ioFlClpSiz PACKED; +typedef struct PACKED { + COMMONCINFODEFS; + FInfo ioFlFndrInfo; + LONGINT ioDirID; + INTEGER ioFlStBlk; + LONGINT ioFlLgLen; + LONGINT ioFlPyLen; + INTEGER ioFlRStBlk; + LONGINT ioFlRLgLen; + LONGINT ioFlRPyLen; + LONGINT ioFlCrDat; + LONGINT ioFlMdDat; + LONGINT ioFlBkDat; + FXInfo ioFlXFndrInfo; + LONGINT ioFlParID; + LONGINT ioFlClpSiz; } HFileInfo; -typedef struct { - COMMONCINFODEFS LPACKED; - DInfo ioDrUsrWds LPACKED; - LONGINT ioDrDirID PACKED; - unsigned short ioDrNmFls PACKED; - unsigned short filler3[9] PACKED; - LONGINT ioDrCrDat PACKED; - LONGINT ioDrMdDat PACKED; - LONGINT ioDrBkDat PACKED; - DXInfo ioDrFndrInfo LPACKED; - LONGINT ioDrParID PACKED; +typedef struct PACKED { + COMMONCINFODEFS; + DInfo ioDrUsrWds; + LONGINT ioDrDirID; + uint16_t ioDrNmFls; + uint16_t filler3[9]; + LONGINT ioDrCrDat; + LONGINT ioDrMdDat; + LONGINT ioDrBkDat; + DXInfo ioDrFndrInfo; + LONGINT ioDrParID; } DirInfo; typedef union { @@ -299,115 +299,115 @@ typedef union { } CInfoPBRec; typedef CInfoPBRec *CInfoPBPtr; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - LONGINT filler1 PACKED; - StringPtr ioNewName PACKED_P; - LONGINT filler2 PACKED; - LONGINT ioNewDirID PACKED; - LONGINT filler3[2] PACKED; - LONGINT ioDirID PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + LONGINT filler1; + StringPtr ioNewName PACKED_P; + LONGINT filler2; + LONGINT ioNewDirID; + LONGINT filler3[2]; + LONGINT ioDirID; } CMovePBRec; typedef CMovePBRec *CMovePBPtr; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - unsigned short filler1 PACKED; /* should be INTEGER */ - INTEGER ioWDIndex PACKED; - LONGINT ioWDProcID PACKED; - INTEGER ioWDVRefNum PACKED; - INTEGER filler2[7] PACKED; - LONGINT ioWDDirID PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + uint16_t filler1; + INTEGER ioWDIndex; + LONGINT ioWDProcID; + INTEGER ioWDVRefNum; + INTEGER filler2[7]; + LONGINT ioWDDirID; } WDPBRec; typedef WDPBRec *WDPBPtr; -typedef struct { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioRefNum PACKED; - unsigned short filler PACKED; - INTEGER ioFCBIndx PACKED; - INTEGER ioFCBobnoxiousfiller PACKED; /* ACK! not in IMIV PACKED, but ThinkC+MPW */ - LONGINT ioFCBFlNm PACKED; - unsigned short ioFCBFlags PACKED; - INTEGER ioFCBStBlk PACKED; - LONGINT ioFCBEOF PACKED; - LONGINT ioFCBPLen PACKED; - LONGINT ioFCBCrPs PACKED; - INTEGER ioFCBVRefNum PACKED; - LONGINT ioFCBClpSiz PACKED; - LONGINT ioFCBParID PACKED; +typedef struct PACKED { + COMMONFSQUEUEDEFS; + INTEGER ioRefNum; + uint16_t filler; + INTEGER ioFCBIndx; + INTEGER ioFCBobnoxiousfiller; /* ACK! not in IMIV, but ThinkC+MPW */ + LONGINT ioFCBFlNm; + uint16_t ioFCBFlags; + INTEGER ioFCBStBlk; + LONGINT ioFCBEOF; + LONGINT ioFCBPLen; + LONGINT ioFCBCrPs; + INTEGER ioFCBVRefNum; + LONGINT ioFCBClpSiz; + LONGINT ioFCBParID; } FCBPBRec; typedef FCBPBRec *FCBPBPtr; -typedef struct { - QElemPtr qLink PACKED_P; /* 0 */ - INTEGER qType PACKED; /* 4 */ - unsigned short vcbFlags PACKED; /* 6 */ - unsigned short vcbSigWord PACKED; /* 8 */ - LONGINT vcbCrDate PACKED; /* 10 */ - LONGINT vcbLsMod PACKED; /* 14 */ - unsigned short vcbAtrb PACKED; /* 18 */ - unsigned short vcbNmFls PACKED; /* 20 */ - unsigned short vcbVBMSt PACKED; /* 22 */ - unsigned short vcbAllocPtr PACKED; /* 24 */ - unsigned short vcbNmAlBlks PACKED; /* 26 */ - LONGINT vcbAlBlkSiz PACKED; /* 28 */ - LONGINT vcbClpSiz PACKED; /* 32 */ - unsigned short vcbAlBlSt PACKED; /* 36 */ - LONGINT vcbNxtCNID PACKED; /* 38 */ - unsigned short vcbFreeBks PACKED; /* 42 */ - Byte vcbVN[28] LPACKED; /* 44 */ - INTEGER vcbDrvNum PACKED; /* 72 */ - INTEGER vcbDRefNum PACKED; /* 74 */ - INTEGER vcbFSID PACKED; /* 76 */ - INTEGER vcbVRefNum PACKED; /* 78 */ - Ptr vcbMAdr PACKED_P; - Ptr vcbBufAdr PACKED_P; - unsigned short vcbMLen PACKED; - INTEGER vcbDirIndex PACKED; - unsigned short vcbDirBlk PACKED; - LONGINT vcbVolBkUp PACKED; - unsigned short vcbVSeqNum PACKED; - LONGINT vcbWrCnt PACKED; - LONGINT vcbXTClpSiz PACKED; - LONGINT vcbCTClpSiz PACKED; - unsigned short vcbNmRtDirs PACKED; - LONGINT vcbFilCnt PACKED; - LONGINT vcbDirCnt PACKED; - LONGINT vcbFndrInfo[8] PACKED; - unsigned short vcbVCSize PACKED; - unsigned short vcbVBMCSiz PACKED; - unsigned short vcbCtlCSiz PACKED; - unsigned short vcbXTAlBlks PACKED; - unsigned short vcbCTAlBlks PACKED; - INTEGER vcbXTRef PACKED; - INTEGER vcbCTRef PACKED; - Ptr vcbCtlBuf PACKED_P; - LONGINT vcbDirIDM PACKED; - unsigned short vcbOffsM PACKED; +typedef struct PACKED { + QElemPtr qLink PACKED_P; /* 0 */ + INTEGER qType; /* 4 */ + uint16_t vcbFlags; /* 6 */ + uint16_t vcbSigWord; /* 8 */ + LONGINT vcbCrDate; /* 10 */ + LONGINT vcbLsMod; /* 14 */ + uint16_t vcbAtrb; /* 18 */ + uint16_t vcbNmFls; /* 20 */ + uint16_t vcbVBMSt; /* 22 */ + uint16_t vcbAllocPtr; /* 24 */ + uint16_t vcbNmAlBlks; /* 26 */ + LONGINT vcbAlBlkSiz; /* 28 */ + LONGINT vcbClpSiz; /* 32 */ + uint16_t vcbAlBlSt; /* 36 */ + LONGINT vcbNxtCNID; /* 38 */ + uint16_t vcbFreeBks; /* 42 */ + Byte vcbVN[28]; /* 44 */ + INTEGER vcbDrvNum; /* 72 */ + INTEGER vcbDRefNum; /* 74 */ + INTEGER vcbFSID; /* 76 */ + INTEGER vcbVRefNum; /* 78 */ + Ptr vcbMAdr PACKED_P; + Ptr vcbBufAdr PACKED_P; + uint16_t vcbMLen; + INTEGER vcbDirIndex; + uint16_t vcbDirBlk; + LONGINT vcbVolBkUp; + uint16_t vcbVSeqNum; + LONGINT vcbWrCnt; + LONGINT vcbXTClpSiz; + LONGINT vcbCTClpSiz; + uint16_t vcbNmRtDirs; + LONGINT vcbFilCnt; + LONGINT vcbDirCnt; + LONGINT vcbFndrInfo[8]; + uint16_t vcbVCSize; + uint16_t vcbVBMCSiz; + uint16_t vcbCtlCSiz; + uint16_t vcbXTAlBlks; + uint16_t vcbCTAlBlks; + INTEGER vcbXTRef; + INTEGER vcbCTRef; + Ptr vcbCtlBuf PACKED_P; + LONGINT vcbDirIDM; + uint16_t vcbOffsM; } VCB; typedef VCB *VCBPtr; typedef struct { VCBPtr p PACKED_P; } HIDDEN_VCBPtr; -typedef struct { - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - INTEGER dQDrive PACKED; - INTEGER dQRefNum PACKED; - INTEGER dQFSID PACKED; - unsigned short dQDrvSz PACKED; - unsigned short dQDrvSz2 PACKED; +typedef struct PACKED { + QElemPtr qLink PACKED_P; + INTEGER qType; + INTEGER dQDrive; + INTEGER dQRefNum; + INTEGER dQFSID; + uint16_t dQDrvSz; + uint16_t dQDrvSz2; } DrvQEl; /* data types introduced by the new high level file system dispatch traps */ -struct FSSpec +struct PACKED FSSpec { - INTEGER vRefNum PACKED; - LONGINT parID PACKED; - Str63 name LPACKED; + INTEGER vRefNum; + LONGINT parID; + Str63 name; }; typedef struct FSSpec FSSpec; diff --git a/src/include/Finder.h b/src/include/Finder.h index 8b9acd1..5ef427f 100644 --- a/src/include/Finder.h +++ b/src/include/Finder.h @@ -8,32 +8,32 @@ * $Id: Finder.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct +typedef struct PACKED { - QElemPtr qLink PACKED; - INTEGER qType PACKED; - Ptr ioCmdAddr PACKED; - ProcPtr ioCompletion PACKED; - OSErr ioResult PACKED; - StringPtr ioNamePtr PACKED; - INTEGER ioVRefNum PACKED; - INTEGER ioDTRefNum PACKED; - INTEGER ioIndex PACKED; - LONGINT ioTagInfo PACKED; - Ptr ioDTBuffer PACKED; - LONGINT ioDTReqCount PACKED; - LONGINT ioDTActCount PACKED; - SignedByte filler1 LPACKED; - SignedByte ioIconType LPACKED; - INTEGER filler2 PACKED; - LONGINT ioDirID PACKED; - OSType ioFileCreator PACKED; - OSType ioFileType PACKED; - LONGINT ioFiller3 PACKED; - LONGINT ioDTLgLen PACKED; - LONGINT ioDTPyLen PACKED; - INTEGER ioFiller4[14] PACKED; - LONGINT ioAPPLParID PACKED; + QElemPtr qLink PACKED_P; + INTEGER qType; + Ptr ioCmdAddr PACKED_P; + ProcPtr ioCompletion PACKED_P; + OSErr ioResult; + StringPtr ioNamePtr PACKED_P; + INTEGER ioVRefNum; + INTEGER ioDTRefNum; + INTEGER ioIndex; + LONGINT ioTagInfo; + Ptr ioDTBuffer PACKED_P; + LONGINT ioDTReqCount; + LONGINT ioDTActCount; + SignedByte filler1; + SignedByte ioIconType; + INTEGER filler2; + LONGINT ioDirID; + OSType ioFileCreator; + OSType ioFileType; + LONGINT ioFiller3; + LONGINT ioDTLgLen; + LONGINT ioDTPyLen; + INTEGER ioFiller4[14]; + LONGINT ioAPPLParID; } DTPBRec, *DTPBRecPtr, *DTPBPtr; diff --git a/src/include/FontMgr.h b/src/include/FontMgr.h index d663ab7..1ca2a07 100644 --- a/src/include/FontMgr.h +++ b/src/include/FontMgr.h @@ -51,105 +51,105 @@ #define fontWid ((INTEGER) 0xACB0) -typedef struct { - Fixed ascent PACKED; - Fixed descent PACKED; - Fixed leading PACKED; - Fixed widMax PACKED; - Handle wTabHandle PACKED_P; +typedef struct PACKED { + Fixed ascent; + Fixed descent; + Fixed leading; + Fixed widMax; + Handle wTabHandle PACKED_P; } FMetricRec; -typedef struct { - INTEGER ffFlags PACKED; - INTEGER ffFamID PACKED; - INTEGER ffFirstChar PACKED; - INTEGER ffLastChar PACKED; - INTEGER ffAscent PACKED; - INTEGER ffDescent PACKED; - INTEGER ffLeading PACKED; - INTEGER ffWidMax PACKED; - LONGINT ffWTabOff PACKED; - LONGINT ffKernOff PACKED; - LONGINT ffStylOff PACKED; - INTEGER ffProperty[9] PACKED; - INTEGER ffIntl[2] PACKED; - INTEGER ffVersion PACKED; - /* FontAssoc ffAssoc PACKED; */ - /* WidTable ffWidthTab PACKED; */ - /* StyleTable ffStyTab PACKED; */ - /* KernTable ffKernTab PACKED; */ +typedef struct PACKED { + INTEGER ffFlags; + INTEGER ffFamID; + INTEGER ffFirstChar; + INTEGER ffLastChar; + INTEGER ffAscent; + INTEGER ffDescent; + INTEGER ffLeading; + INTEGER ffWidMax; + LONGINT ffWTabOff; + LONGINT ffKernOff; + LONGINT ffStylOff; + INTEGER ffProperty[9]; + INTEGER ffIntl[2]; + INTEGER ffVersion; + /* FontAssoc ffAssoc; */ + /* WidTable ffWidthTab; */ + /* StyleTable ffStyTab; */ + /* KernTable ffKernTab; */ } FamRec; -typedef struct { - Fixed tabData[256] PACKED; - Handle tabFont PACKED_P; - LONGINT sExtra PACKED; - LONGINT style PACKED; - INTEGER fID PACKED; - INTEGER fSize PACKED; - INTEGER face PACKED; - INTEGER device PACKED; - Point inNumer LPACKED; - Point inDenom LPACKED; - INTEGER aFID PACKED; - Handle fHand PACKED_P; - BOOLEAN usedFam LPACKED; - Byte aFace LPACKED; - INTEGER vOutput PACKED; - INTEGER hOutput PACKED; - INTEGER vFactor PACKED; - INTEGER hFactor PACKED; - INTEGER aSize PACKED; - INTEGER tabSize PACKED; +typedef struct PACKED { + Fixed tabData[256]; + Handle tabFont PACKED_P; + LONGINT sExtra; + LONGINT style; + INTEGER fID; + INTEGER fSize; + INTEGER face; + INTEGER device; + Point inNumer; + Point inDenom; + INTEGER aFID; + Handle fHand PACKED_P; + BOOLEAN usedFam; + Byte aFace; + INTEGER vOutput; + INTEGER hOutput; + INTEGER vFactor; + INTEGER hFactor; + INTEGER aSize; + INTEGER tabSize; } WidthTable; -typedef struct { - INTEGER family PACKED; - INTEGER size PACKED; - Style face LPACKED; - BOOLEAN needBits LPACKED; - INTEGER device PACKED; - Point numer LPACKED; - Point denom LPACKED; +typedef struct PACKED { + INTEGER family; + INTEGER size; + Style face; + BOOLEAN needBits; + INTEGER device; + Point numer; + Point denom; } FMInput; -typedef struct { - INTEGER errNum PACKED; /* 0x00 */ +typedef struct PACKED { + INTEGER errNum; /* 0x00 */ Handle fontHandle PACKED_P; /* 0x02 */ - Byte bold LPACKED; /* 0x06 */ - Byte italic LPACKED; /* 0x07 */ - Byte ulOffset LPACKED; /* 0x08 */ - Byte ulShadow LPACKED; /* 0x09 */ - Byte ulThick LPACKED; /* 0x0A */ - Byte shadow LPACKED; /* 0x0B */ - SignedByte extra LPACKED; /* 0x0C */ - Byte ascent LPACKED; /* 0x0D */ - Byte descent LPACKED; /* 0x0E */ - Byte widMax LPACKED; /* 0x0F */ - SignedByte leading LPACKED; /* 0x10 */ - Byte unused LPACKED; /* 0x11 */ - Point numer LPACKED; /* 0x12 */ - Point denom LPACKED; /* 0x16 */ + Byte bold; /* 0x06 */ + Byte italic; /* 0x07 */ + Byte ulOffset; /* 0x08 */ + Byte ulShadow; /* 0x09 */ + Byte ulThick; /* 0x0A */ + Byte shadow; /* 0x0B */ + SignedByte extra; /* 0x0C */ + Byte ascent; /* 0x0D */ + Byte descent; /* 0x0E */ + Byte widMax; /* 0x0F */ + SignedByte leading; /* 0x10 */ + Byte unused; /* 0x11 */ + Point numer; /* 0x12 */ + Point denom; /* 0x16 */ } FMOutput; typedef FMOutput *FMOutPtr; -typedef struct { - INTEGER fontType PACKED; - INTEGER firstChar PACKED; - INTEGER lastChar PACKED; - INTEGER widMax PACKED; - INTEGER kernMax PACKED; - INTEGER nDescent PACKED; - INTEGER fRectWidth PACKED; - INTEGER fRectHeight PACKED; - INTEGER owTLoc PACKED; - INTEGER ascent PACKED; - INTEGER descent PACKED; - INTEGER leading PACKED; - INTEGER rowWords PACKED; - /* more stuff is usually appended here ... bitImage PACKED, locTable PACKED, owTable */ +typedef struct PACKED { + INTEGER fontType; + INTEGER firstChar; + INTEGER lastChar; + INTEGER widMax; + INTEGER kernMax; + INTEGER nDescent; + INTEGER fRectWidth; + INTEGER fRectHeight; + INTEGER owTLoc; + INTEGER ascent; + INTEGER descent; + INTEGER leading; + INTEGER rowWords; + /* more stuff is usually appended here ... bitImage, locTable, owTable */ } FontRec; typedef FamRec *FamRecPtr; diff --git a/src/include/HelpMgr.h b/src/include/HelpMgr.h index 3a33023..6081d09 100644 --- a/src/include/HelpMgr.h +++ b/src/include/HelpMgr.h @@ -12,25 +12,25 @@ #include "MenuMgr.h" #include "WindowMgr.h" -typedef struct HMStringResType +typedef struct PACKED HMStringResType { - INTEGER hmmResID PACKED; - INTEGER hmmIndex PACKED; + INTEGER hmmResID; + INTEGER hmmIndex; } HMStringResType; -typedef struct HMMessageRecord +typedef struct PACKED HMMessageRecord { - INTEGER hmmHelpType PACKED; + INTEGER hmmHelpType; union - { - Str255 hmmString LPACKED; - INTEGER hmmPict PACKED; - HMStringResType hmmStringRes LPACKED; - TEHandle hmmTEHandle PACKED_P; - PicHandle hmmPictHandle PACKED_P; - INTEGER hmmTERes PACKED; - INTEGER hmmSTRRes PACKED; - } u LPACKED; + { + Str255 hmmString; + INTEGER hmmPict; + HMStringResType hmmStringRes; + TEHandle hmmTEHandle PACKED_P; + PicHandle hmmPictHandle PACKED_P; + INTEGER hmmTERes; + INTEGER hmmSTRRes; + } u; } HMMessageRecord, *HMMessageRecPtr; enum diff --git a/src/include/Iconutil.h b/src/include/Iconutil.h index 734e829..8f11b06 100644 --- a/src/include/Iconutil.h +++ b/src/include/Iconutil.h @@ -95,13 +95,13 @@ typedef uint32 IconSelectorValue; typedef int16 IconAlignmentType; typedef int16 IconTransformType; -typedef struct CIcon +typedef struct PACKED CIcon { - PixMap iconPMap LPACKED; - BitMap iconMask LPACKED; - BitMap iconBMap LPACKED; + PixMap iconPMap; + BitMap iconMask; + BitMap iconBMap; Handle iconData PACKED_P; - int16 iconMaskData[1] PACKED; + int16 iconMaskData[1]; } CIcon, *CIconPtr; typedef struct { CIconPtr p PACKED_P; } HIDDEN_CIconPtr; typedef HIDDEN_CIconPtr *CIconHandle; diff --git a/src/include/IntlUtil.h b/src/include/IntlUtil.h index 9fd757a..578fe24 100644 --- a/src/include/IntlUtil.h +++ b/src/include/IntlUtil.h @@ -54,32 +54,32 @@ #define verTurkey 24 #define verYugoslavia 25 -typedef struct { - Byte decimalPt LPACKED; - Byte thousSep LPACKED; - Byte listSep LPACKED; - Byte currSym1 LPACKED; - Byte currSym2 LPACKED; - Byte currSym3 LPACKED; - Byte currFmt LPACKED; - Byte dateOrder LPACKED; - Byte shrtDateFmt LPACKED; - Byte dateSep LPACKED; - Byte timeCycle LPACKED; - Byte timeFmt LPACKED; - LONGINT mornStr PACKED; - LONGINT eveStr PACKED; - Byte timeSep LPACKED; - Byte time1Suff LPACKED; - Byte time2Suff LPACKED; - Byte time3Suff LPACKED; - Byte time4Suff LPACKED; - Byte time5Suff LPACKED; - Byte time6Suff LPACKED; - Byte time7Suff LPACKED; - Byte time8Suff LPACKED; - Byte metricSys LPACKED; - INTEGER intl0Vers PACKED; +typedef struct PACKED { + Byte decimalPt; + Byte thousSep; + Byte listSep; + Byte currSym1; + Byte currSym2; + Byte currSym3; + Byte currFmt; + Byte dateOrder; + Byte shrtDateFmt; + Byte dateSep; + Byte timeCycle; + Byte timeFmt; + LONGINT mornStr; + LONGINT eveStr; + Byte timeSep; + Byte time1Suff; + Byte time2Suff; + Byte time3Suff; + Byte time4Suff; + Byte time5Suff; + Byte time6Suff; + Byte time7Suff; + Byte time8Suff; + Byte metricSys; + INTEGER intl0Vers; } Intl0Rec; typedef Intl0Rec *Intl0Ptr; typedef struct { Intl0Ptr p PACKED_P; } HIDDEN_Intl0Ptr; @@ -87,20 +87,20 @@ typedef HIDDEN_Intl0Ptr *Intl0Hndl; typedef Byte STRING15[16]; -typedef struct { - STRING15 days[7] LPACKED; - STRING15 months[12] LPACKED; - Byte suppressDay LPACKED; - Byte lngDateFmt LPACKED; - Byte dayLeading0 LPACKED; - Byte abbrLen LPACKED; - LONGINT st0 PACKED; - LONGINT st1 PACKED; - LONGINT st2 PACKED; - LONGINT st3 PACKED; - LONGINT st4 PACKED; - INTEGER intl1Vers PACKED; - INTEGER localRtn PACKED; +typedef struct PACKED { + STRING15 days[7]; + STRING15 months[12]; + Byte suppressDay; + Byte lngDateFmt; + Byte dayLeading0; + Byte abbrLen; + LONGINT st0; + LONGINT st1; + LONGINT st2; + LONGINT st3; + LONGINT st4; + INTEGER intl1Vers; + INTEGER localRtn; } Intl1Rec; typedef Intl1Rec *Intl1Ptr; typedef struct { Intl1Ptr p PACKED_P; } HIDDEN_Intl1Ptr; diff --git a/src/include/ListMgr.h b/src/include/ListMgr.h index 85b116c..86cc437 100644 --- a/src/include/ListMgr.h +++ b/src/include/ListMgr.h @@ -23,30 +23,30 @@ typedef DataArray *DataPtr; typedef struct { DataPtr p PACKED_P; } HIDDEN_DataPtr; typedef HIDDEN_DataPtr *DataHandle; -typedef struct { - Rect rView LPACKED; - GrafPtr port PACKED_P; - Point indent LPACKED; - Point cellSize LPACKED; - Rect visible LPACKED; - ControlHandle vScroll PACKED_P; - ControlHandle hScroll PACKED_P; - SignedByte selFlags LPACKED; - BOOLEAN lActive LPACKED; - SignedByte lReserved LPACKED; - SignedByte listFlags LPACKED; - LONGINT clikTime PACKED; - Point clikLoc LPACKED; - Point mouseLoc LPACKED; - Ptr lClikLoop PACKED_P; - Cell lastClick LPACKED; - LONGINT refCon PACKED; - Handle listDefProc PACKED_P; - Handle userHandle PACKED_P; - Rect dataBounds LPACKED; - DataHandle cells PACKED_P; - INTEGER maxIndex PACKED; - INTEGER cellArray[1] PACKED; +typedef struct PACKED { + Rect rView; + GrafPtr port PACKED_P; + Point indent; + Point cellSize; + Rect visible; + ControlHandle vScroll PACKED_P; + ControlHandle hScroll PACKED_P; + SignedByte selFlags; + BOOLEAN lActive; + SignedByte lReserved; + SignedByte listFlags; + LONGINT clikTime; + Point clikLoc; + Point mouseLoc; + Ptr lClikLoop PACKED_P; + Cell lastClick; + LONGINT refCon; + Handle listDefProc PACKED_P; + Handle userHandle PACKED_P; + Rect dataBounds; + DataHandle cells PACKED_P; + INTEGER maxIndex; + INTEGER cellArray[1]; } ListRec; typedef ListRec *ListPtr; typedef struct { ListPtr p PACKED_P; } HIDDEN_ListPtr; diff --git a/src/include/MacTypes.h b/src/include/MacTypes.h index dde0eb6..4b98971 100644 --- a/src/include/MacTypes.h +++ b/src/include/MacTypes.h @@ -1,4 +1,3 @@ - #if !defined (_MACTYPES_H_) #define _MACTYPES_H_ @@ -55,8 +54,8 @@ typedef LONGINT INTEGERRET; typedef LONGINT BOOLEANRET; typedef LONGINT SignedByteRET; -typedef struct { - INTEGER qFlags PACKED; +typedef struct PACKED { + INTEGER qFlags; union __qe *qHead PACKED_P; /* actually QElemPtr */ union __qe *qTail PACKED_P; /* actually QElemPtr */ } QHdr; @@ -68,22 +67,22 @@ typedef struct { QElemPtr p PACKED_P; } HIDDEN_QElemPtr; #define noErr 0 /* from Quickdraw.h */ -typedef struct Point +typedef struct PACKED Point { - INTEGER v PACKED; - INTEGER h PACKED; + INTEGER v; + INTEGER h; } Point; #define NULL_POINTP ((Point *) NULL) #define ZEROPOINT(p) (p.v = CWC (0), p.h = CWC (0)) -typedef struct Rect +typedef struct PACKED Rect { - INTEGER top PACKED; - INTEGER left PACKED; - INTEGER bottom PACKED; - INTEGER right PACKED; + INTEGER top; + INTEGER left; + INTEGER bottom; + INTEGER right; } Rect; typedef Rect *RectPtr; diff --git a/src/include/MemoryMgr.h b/src/include/MemoryMgr.h index 2bc8f83..f1b1cb9 100644 --- a/src/include/MemoryMgr.h +++ b/src/include/MemoryMgr.h @@ -1,4 +1,3 @@ - #if !defined (_MEMORY_MGR_H_) #define _MEMORY_MGR_H_ @@ -24,26 +23,26 @@ enum { memAZErr = -113 }; #define memBCErr (-115) #define memSCErr (-116) -typedef struct Zone +typedef struct PACKED Zone { Ptr bkLim PACKED_P; Ptr purgePtr PACKED_P; Ptr hFstFree PACKED_P; - LONGINT zcbFree PACKED; + LONGINT zcbFree; ProcPtr gzProc PACKED_P; - INTEGER moreMast PACKED; - INTEGER flags PACKED; - INTEGER cntRel PACKED; - INTEGER maxRel PACKED; - INTEGER cntNRel PACKED; - INTEGER maxNRel PACKED; - INTEGER cntEmpty PACKED; - INTEGER cntHandles PACKED; - LONGINT minCBFree PACKED; + INTEGER moreMast; + INTEGER flags; + INTEGER cntRel; + INTEGER maxRel; + INTEGER cntNRel; + INTEGER maxNRel; + INTEGER cntEmpty; + INTEGER cntHandles; + LONGINT minCBFree; ProcPtr purgeProc PACKED_P; Ptr sparePtr PACKED_P; Ptr allocPtr PACKED_P; - INTEGER heapData PACKED; + INTEGER heapData; } Zone; typedef Zone *THz; diff --git a/src/include/MenuMgr.h b/src/include/MenuMgr.h index 09d1def..f9d0ee8 100644 --- a/src/include/MenuMgr.h +++ b/src/include/MenuMgr.h @@ -20,27 +20,27 @@ #define textMenuProc 0 -typedef struct { - INTEGER menuID PACKED; - INTEGER menuWidth PACKED; - INTEGER menuHeight PACKED; - Handle menuProc PACKED_P; - LONGINT enableFlags PACKED; - Str255 menuData LPACKED; +typedef struct PACKED { + INTEGER menuID; + INTEGER menuWidth; + INTEGER menuHeight; + Handle menuProc PACKED_P; + LONGINT enableFlags; + Str255 menuData; } MenuInfo; typedef MenuInfo *MenuPtr; typedef struct { MenuPtr p PACKED_P; } HIDDEN_MenuPtr; typedef HIDDEN_MenuPtr *MenuHandle; -typedef struct MCEntry +typedef struct PACKED MCEntry { - INTEGER mctID PACKED; - INTEGER mctItem PACKED; - RGBColor mctRGB1 LPACKED; - RGBColor mctRGB2 LPACKED; - RGBColor mctRGB3 LPACKED; - RGBColor mctRGB4 LPACKED; - INTEGER mctReserved PACKED; + INTEGER mctID; + INTEGER mctItem; + RGBColor mctRGB1; + RGBColor mctRGB2; + RGBColor mctRGB3; + RGBColor mctRGB4; + INTEGER mctReserved; } MCEntry, *MCEntryPtr; typedef struct { MCEntryPtr p PACKED_P; } HIDDEN_MCEntryPtr; diff --git a/src/include/NotifyMgr.h b/src/include/NotifyMgr.h index 30b4cf7..6f2d82d 100644 --- a/src/include/NotifyMgr.h +++ b/src/include/NotifyMgr.h @@ -8,20 +8,20 @@ * $Id: NotifyMgr.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct { - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - INTEGER nmFlags PACKED; - LONGINT nmPrivate PACKED; - INTEGER nmReserved PACKED; - INTEGER nmMark PACKED; - Handle nmIcon PACKED_P; - Handle nmSound PACKED_P; - StringPtr nmStr PACKED_P; - ProcPtr nmResp PACKED_P; /* pascal void myresponse(NMRecPtr foo) */ +typedef struct PACKED { + QElemPtr qLink PACKED_P; + INTEGER qType; + INTEGER nmFlags; + LONGINT nmPrivate; + INTEGER nmReserved; + INTEGER nmMark; + Handle nmIcon PACKED_P; + Handle nmSound PACKED_P; + StringPtr nmStr PACKED_P; + ProcPtr nmResp PACKED_P; /* pascal void myresponse(NMRecPtr foo) */ /* value of -1 means remove queue element automatically */ - LONGINT nmRefCon PACKED; + LONGINT nmRefCon; } NMRec, *NMRecPtr; extern trap OSErrRET NMInstall( NMRecPtr nmptr ); diff --git a/src/include/OSEvent.h b/src/include/OSEvent.h index 00c4c8b..6c48b1a 100644 --- a/src/include/OSEvent.h +++ b/src/include/OSEvent.h @@ -15,14 +15,14 @@ #define evtNotEnb 1 -typedef struct { - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - INTEGER evtQWhat PACKED; - LONGINT evtQMessage PACKED; - LONGINT evtQWhen PACKED; - Point evtQWhere LPACKED; - INTEGER evtQModifiers PACKED; +typedef struct PACKED { + QElemPtr qLink PACKED_P; + INTEGER qType; + INTEGER evtQWhat; + LONGINT evtQMessage; + LONGINT evtQWhen; + Point evtQWhere; + INTEGER evtQModifiers; } EvQEl; typedef EvQEl *EvQElPtr; @@ -55,11 +55,17 @@ typedef enum SZreserved4 = (1 << 0) } SZ_t; -typedef struct size_info + +/* + * The first three fields are used to dereference mac memory. The two + * extra booleans are for our own use. + */ + +typedef struct PACKED size_info { - int16 size_flags PACKED; - int32 preferred_size PACKED; - int32 minimum_size PACKED; + int16 size_flags; + int32 preferred_size; + int32 minimum_size; /* extra */ boolean_t size_resource_present_p; @@ -95,23 +101,23 @@ extern QHdrPtr GetEvQHdr( void ); extern EvQEl *geteventelem (void); -typedef struct TargetID +typedef struct PACKED TargetID { - int32 sessionID PACKED; - PPCPortRec name LPACKED; - LocationNameRec location LPACKED; - PPCPortRec recvrName LPACKED; + int32 sessionID; + PPCPortRec name; + LocationNameRec location; + PPCPortRec recvrName; } TargetID, TargetIDPtr; -typedef struct HighLevelEventMsg +typedef struct PACKED HighLevelEventMsg { - int16 HighLevelEventMsgHeaderlength PACKED; - int16 version PACKED; - int32 reserved1 PACKED; - EventRecord theMsgEvent LPACKED; - int32 userRefCon PACKED; - int32 postingOptions PACKED; - int32 msgLength PACKED; + int16 HighLevelEventMsgHeaderlength; + int16 version; + int32 reserved1; + EventRecord theMsgEvent; + int32 userRefCon; + int32 postingOptions; + int32 msgLength; } HighLevelEventMsg, *HighLevelEventMsgPtr; typedef ProcPtr GetSpecificFilterProcPtr; diff --git a/src/include/OSUtil.h b/src/include/OSUtil.h index 016ce5b..f49ce3f 100644 --- a/src/include/OSUtil.h +++ b/src/include/OSUtil.h @@ -24,18 +24,18 @@ #define prInitErr (-88) #define prWrErr (-87) -typedef struct { - Byte valid LPACKED; - Byte aTalkA LPACKED; - Byte aTalkB LPACKED; - Byte config LPACKED; - INTEGER portA PACKED; - INTEGER portB PACKED; - LONGINT alarm PACKED; - INTEGER font PACKED; - INTEGER kbdPrint PACKED; - INTEGER volClik PACKED; - INTEGER misc PACKED; +typedef struct PACKED { + Byte valid; + Byte aTalkA; + Byte aTalkB; + Byte config; + INTEGER portA; + INTEGER portB; + LONGINT alarm; + INTEGER font; + INTEGER kbdPrint; + INTEGER volClik; + INTEGER misc; } SysParmType; typedef SysParmType *SysPPtr; @@ -50,26 +50,26 @@ union __qe { }; typedef union __qe QElem; -typedef struct { - INTEGER year PACKED; - INTEGER month PACKED; - INTEGER day PACKED; - INTEGER hour PACKED; - INTEGER minute PACKED; - INTEGER second PACKED; - INTEGER dayOfWeek PACKED; +typedef struct PACKED { + INTEGER year; + INTEGER month; + INTEGER day; + INTEGER hour; + INTEGER minute; + INTEGER second; + INTEGER dayOfWeek; } DateTimeRec; -typedef struct { - INTEGER environsVersion PACKED; - INTEGER machineType PACKED; - INTEGER systemVersion PACKED; - INTEGER processor PACKED; - BOOLEAN hasFPU LPACKED; - BOOLEAN hasColorQD LPACKED; - INTEGER keyBoardType PACKED; - INTEGER atDrvrVersNum PACKED; - INTEGER sysVRefNum PACKED; +typedef struct PACKED { + INTEGER environsVersion; + INTEGER machineType; + INTEGER systemVersion; + INTEGER processor; + BOOLEAN hasFPU; + BOOLEAN hasColorQD; + INTEGER keyBoardType; + INTEGER atDrvrVersNum; + INTEGER sysVRefNum; } SysEnvRec, *SysEnvRecPtr; #define SYSRECVNUM 2 diff --git a/src/include/PPC.h b/src/include/PPC.h index c0ef642..62526ba 100644 --- a/src/include/PPC.h +++ b/src/include/PPC.h @@ -15,33 +15,33 @@ typedef struct EntityName /* #### bogus */ } EntityName; -typedef struct LocationNameRec +typedef struct PACKED LocationNameRec { - PPCLocationKind locationKindSelector PACKED; + PPCLocationKind locationKindSelector; union { - EntityName npbEntity LPACKED; - Str32 npbType LPACKED; - } u LPACKED; + EntityName npbEntity; + Str32 npbType; + } u; } LocationNameRec; -typedef struct PPCPortRec +typedef struct PACKED PPCPortRec { - ScriptCode nameScript PACKED; - Str32 name LPACKED; + ScriptCode nameScript; + Str32 name; - PPCPortKinds portKindsSelector PACKED; + PPCPortKinds portKindsSelector; union + { + Str32 portTypeStr; + struct PACKED { - Str32 portTypeStr LPACKED; - struct - { - OSType creator PACKED; - OSType type PACKED; - } port LPACKED; - } u LPACKED; + OSType creator; + OSType type; + } port; + } u; } PPCPortRec, *PPCPortPtr; #endif /* !_PPC_H_ */ diff --git a/src/include/PrintMgr.h b/src/include/PrintMgr.h index dae92a7..e18d7b7 100644 --- a/src/include/PrintMgr.h +++ b/src/include/PrintMgr.h @@ -37,69 +37,69 @@ #define sPrDrvr ".Print" #define iPrDrvrRef (-3) -typedef struct { - GrafPort gPort LPACKED; - QDProcs saveprocs LPACKED; - LONGINT spare[4] PACKED; - BOOLEAN fOurPtr LPACKED; - BOOLEAN fOurBits LPACKED; +typedef struct PACKED { + GrafPort gPort; + QDProcs saveprocs; + LONGINT spare[4]; + BOOLEAN fOurPtr; + BOOLEAN fOurBits; } TPrPort; typedef TPrPort *TPPrPort; -typedef struct { - INTEGER iDev PACKED; - INTEGER iVRes PACKED; - INTEGER iHRes PACKED; - Rect rPage LPACKED; +typedef struct PACKED { + INTEGER iDev; + INTEGER iVRes; + INTEGER iHRes; + Rect rPage; } TPrInfo; typedef enum {feedCut, feedFanFold, feedMechCut, feedOther} TFeed; -typedef struct { - INTEGER wDev PACKED; - INTEGER iPageV PACKED; - INTEGER iPageH PACKED; - SignedByte bPort LPACKED; - char feed LPACKED; +typedef struct PACKED { + INTEGER wDev; + INTEGER iPageV; + INTEGER iPageH; + SignedByte bPort; + char feed; } TPrStl; typedef enum { scanTB, scanBL, scanLR, scanRL } TScan; -typedef struct { - INTEGER iRowBytes PACKED; - INTEGER iBandV PACKED; - INTEGER iBandH PACKED; - INTEGER iDevBytes PACKED; - INTEGER iBands PACKED; - SignedByte bPatScale LPACKED; - SignedByte bULThick LPACKED; - SignedByte bULOffset LPACKED; - SignedByte bULShadow LPACKED; - char scan LPACKED; - SignedByte bXInfoX LPACKED; +typedef struct PACKED { + INTEGER iRowBytes; + INTEGER iBandV; + INTEGER iBandH; + INTEGER iDevBytes; + INTEGER iBands; + SignedByte bPatScale; + SignedByte bULThick; + SignedByte bULOffset; + SignedByte bULShadow; + char scan; + SignedByte bXInfoX; } TPrXInfo; -typedef struct { - INTEGER iFstPage PACKED; - INTEGER iLstPage PACKED; - INTEGER iCopies PACKED; - SignedByte bJDocLoop LPACKED; - BOOLEAN fFromUsr LPACKED; - ProcPtr pIdleProc PACKED_P; - StringPtr pFileName PACKED_P; - INTEGER iFileVol PACKED; - SignedByte bFileVers LPACKED; - SignedByte bJobX LPACKED; +typedef struct PACKED { + INTEGER iFstPage; + INTEGER iLstPage; + INTEGER iCopies; + SignedByte bJDocLoop; + BOOLEAN fFromUsr; + ProcPtr pIdleProc PACKED_P; + StringPtr pFileName PACKED_P; + INTEGER iFileVol; + SignedByte bFileVers; + SignedByte bJobX; } TPrJob; -typedef struct { - INTEGER iPrVersion PACKED; - TPrInfo prInfo LPACKED; - Rect rPaper LPACKED; - TPrStl prStl LPACKED; - TPrInfo prInfoPT LPACKED; - TPrXInfo prXInfo LPACKED; - TPrJob prJob LPACKED; - INTEGER printX[19] PACKED; +typedef struct PACKED { + INTEGER iPrVersion; + TPrInfo prInfo; + Rect rPaper; + TPrStl prStl; + TPrInfo prInfoPT; + TPrXInfo prXInfo; + TPrJob prJob; + INTEGER printX[19]; } TPrint; typedef TPrint *TPPrint; typedef struct { TPPrint p PACKED_P; } HIDDEN_TPPrint; @@ -107,34 +107,34 @@ typedef HIDDEN_TPPrint *THPrint; typedef Rect *TPRect; -typedef struct { - INTEGER iTotPages PACKED; - INTEGER iCurPage PACKED; - INTEGER iTotCopies PACKED; - INTEGER iCurCopy PACKED; - INTEGER iTotBands PACKED; - INTEGER iCurBand PACKED; - BOOLEAN fPgDirty LPACKED; - BOOLEAN fImaging LPACKED; - THPrint hPrint PACKED_P; - TPPrPort pPRPort PACKED_P; - PicHandle hPic PACKED_P; +typedef struct PACKED { + INTEGER iTotPages; + INTEGER iCurPage; + INTEGER iTotCopies; + INTEGER iCurCopy; + INTEGER iTotBands; + INTEGER iCurBand; + BOOLEAN fPgDirty; + BOOLEAN fImaging; + THPrint hPrint PACKED_P; + TPPrPort pPRPort PACKED_P; + PicHandle hPic PACKED_P; } TPrStatus; -typedef struct { +typedef struct PACKED { /* From Technote 095 */ - DialogRecord dlg LPACKED; - ProcPtr pFltrProc PACKED_P; - ProcPtr pItemProc PACKED_P; - THPrint hPrintUsr PACKED_P; - BOOLEAN fDoIt LPACKED; - BOOLEAN fDone LPACKED; - LONGINT lUser1 PACKED; - LONGINT lUser2 PACKED; - LONGINT lUser3 PACKED; - LONGINT lUser4 PACKED; - INTEGER iNumFst PACKED; - INTEGER iNumLst PACKED; + DialogRecord dlg; + ProcPtr pFltrProc PACKED_P; + ProcPtr pItemProc PACKED_P; + THPrint hPrintUsr PACKED_P; + BOOLEAN fDoIt; + BOOLEAN fDone; + LONGINT lUser1; + LONGINT lUser2; + LONGINT lUser3; + LONGINT lUser4; + INTEGER iNumFst; + INTEGER iNumLst; /* more stuff may be here */ } TPrDlg, *TPPrDlg; diff --git a/src/include/ProcessMgr.h b/src/include/ProcessMgr.h index 679d4f5..ce8cced 100644 --- a/src/include/ProcessMgr.h +++ b/src/include/ProcessMgr.h @@ -13,10 +13,10 @@ typedef INTEGER LaunchFlags; -typedef struct ProcessSerialNumber +typedef struct PACKED ProcessSerialNumber { - uint32 highLongOfPSN PACKED; - uint32 lowLongOfPSN PACKED; + uint32 highLongOfPSN; + uint32 lowLongOfPSN; } ProcessSerialNumber; /* for now, anyway */ @@ -41,20 +41,20 @@ enum { APP_PARAMS_MAGIC = 0xd6434a1b, }; /* chosen from /dev/random */ typedef ROMlib_AppParameters_t *AppParametersPtr; -typedef struct +typedef struct PACKED { - LONGINT reserved1 PACKED; - INTEGER reserved2 PACKED; - INTEGER launchBlockID PACKED; - LONGINT launchEPBLength PACKED; - INTEGER launchFileFlags PACKED; - LaunchFlags launchControlFlags PACKED; - FSSpecPtr launchAppSpec PACKED; - ProcessSerialNumber launchProcessSN LPACKED; - LONGINT launchPreferredSize PACKED; - LONGINT launchMinimumSize PACKED; - LONGINT launchAvailableSize PACKED; - AppParametersPtr launchAppParameters PACKED; + LONGINT reserved1; + INTEGER reserved2; + INTEGER launchBlockID; + LONGINT launchEPBLength; + INTEGER launchFileFlags; + LaunchFlags launchControlFlags; + FSSpecPtr launchAppSpec; + ProcessSerialNumber launchProcessSN; + LONGINT launchPreferredSize; + LONGINT launchMinimumSize; + LONGINT launchAvailableSize; + AppParametersPtr launchAppParameters; } LaunchParamBlockRec; @@ -67,20 +67,20 @@ enum { launchContinue = 0x4000 }; ((psn0).highLongOfPSN == (psn1).highLongOfPSN \ && (psn0).lowLongOfPSN == (psn1).lowLongOfPSN) -typedef struct ProcessInfoRec +typedef struct PACKED ProcessInfoRec { - uint32 processInfoLength PACKED; + uint32 processInfoLength; StringPtr processName PACKED_P; - ProcessSerialNumber processNumber LPACKED; - uint32 processType PACKED; - OSType processSignature PACKED; - uint32 processMode PACKED; + ProcessSerialNumber processNumber; + uint32 processType; + OSType processSignature; + uint32 processMode; Ptr processLocation PACKED_P; - uint32 processSize PACKED; - uint32 processFreeMem PACKED; - ProcessSerialNumber processLauncher LPACKED; - uint32 processLaunchDate PACKED; - uint32 processActiveTime PACKED; + uint32 processSize; + uint32 processFreeMem; + ProcessSerialNumber processLauncher; + uint32 processLaunchDate; + uint32 processActiveTime; FSSpecPtr processAppSpec PACKED_P; } ProcessInfoRec; typedef ProcessInfoRec *ProcessInfoPtr; diff --git a/src/include/QuickDraw.h b/src/include/QuickDraw.h index 6e58538..cf506f9 100644 --- a/src/include/QuickDraw.h +++ b/src/include/QuickDraw.h @@ -68,9 +68,9 @@ typedef enum { bold=1, italic=2, underline=4, outline=8, typedef SignedByte Style; -typedef struct { - INTEGER rgnSize PACKED; - Rect rgnBBox LPACKED; +typedef struct PACKED { + INTEGER rgnSize; + Rect rgnBBox; } Region; typedef Region *RgnPtr; @@ -78,19 +78,19 @@ typedef struct { RgnPtr p PACKED_P; } HIDDEN_RgnPtr; typedef HIDDEN_RgnPtr *RgnHandle; typedef struct { RgnHandle p PACKED_P; } HIDDEN_RgnHandle; -typedef struct { - Ptr baseAddr PACKED_P; - INTEGER rowBytes PACKED; - Rect bounds LPACKED; +typedef struct PACKED { + Ptr baseAddr PACKED_P; + INTEGER rowBytes; + Rect bounds; } BitMap; typedef Byte Pattern[8]; typedef INTEGER Bits16[16]; -typedef struct { - Bits16 data PACKED; - Bits16 mask PACKED; - Point hotSpot LPACKED; +typedef struct PACKED { + Bits16 data; + Bits16 mask; + Point hotSpot; } Cursor; typedef Cursor *CursPtr; @@ -104,24 +104,24 @@ typedef SignedByte GrafVerb; #define invert 3 #define fill 4 -typedef struct { - INTEGER polySize PACKED; - Rect polyBBox LPACKED; - Point polyPoints[1] LPACKED; +typedef struct PACKED { + INTEGER polySize; + Rect polyBBox; + Point polyPoints[1]; } Polygon; typedef Polygon *PolyPtr; typedef struct { PolyPtr p PACKED_P; } HIDDEN_PolyPtr; typedef HIDDEN_PolyPtr *PolyHandle; -typedef struct { - INTEGER ascent PACKED; - INTEGER descent PACKED; - INTEGER widMax PACKED; - INTEGER leading PACKED; +typedef struct PACKED { + INTEGER ascent; + INTEGER descent; + INTEGER widMax; + INTEGER leading; } FontInfo; -typedef struct { +typedef struct PACKED { pascal trap void (*textProc)(INTEGER bc, Ptr textb, Point num, Point den) PACKED_P; pascal trap void (*lineProc)(Point drawto) PACKED_P; pascal trap void (*rectProc)(GrafVerb verb, Rect *rp) PACKED_P; @@ -143,52 +143,52 @@ typedef struct { typedef QDProcs *QDProcsPtr; -typedef struct { - INTEGER device PACKED; - BitMap portBits LPACKED; - Rect portRect LPACKED; - RgnHandle visRgn PACKED_P; - RgnHandle clipRgn PACKED_P; - Pattern bkPat LPACKED; - Pattern fillPat LPACKED; - Point pnLoc LPACKED; - Point pnSize LPACKED; - INTEGER pnMode PACKED; - Pattern pnPat LPACKED; - INTEGER pnVis PACKED; - INTEGER txFont PACKED; - Style txFace LPACKED; - Byte filler LPACKED; - INTEGER txMode PACKED; - INTEGER txSize PACKED; - Fixed spExtra PACKED; - LONGINT fgColor PACKED; - LONGINT bkColor PACKED; - INTEGER colrBit PACKED; - INTEGER patStretch PACKED; - Handle picSave PACKED_P; - Handle rgnSave PACKED_P; - Handle polySave PACKED_P; - QDProcsPtr grafProcs PACKED_P; +typedef struct PACKED { + INTEGER device; + BitMap portBits; + Rect portRect; + RgnHandle visRgn PACKED_P; + RgnHandle clipRgn PACKED_P; + Pattern bkPat; + Pattern fillPat; + Point pnLoc; + Point pnSize; + INTEGER pnMode; + Pattern pnPat; + INTEGER pnVis; + INTEGER txFont; + Style txFace; + Byte filler; + INTEGER txMode; + INTEGER txSize; + Fixed spExtra; + LONGINT fgColor; + LONGINT bkColor; + INTEGER colrBit; + INTEGER patStretch; + Handle picSave PACKED_P; + Handle rgnSave PACKED_P; + Handle polySave PACKED_P; + QDProcsPtr grafProcs PACKED_P; } GrafPort; typedef GrafPort *GrafPtr; typedef struct { GrafPtr p PACKED_P; } HIDDEN_GrafPtr; -typedef struct { - INTEGER picSize PACKED; - Rect picFrame LPACKED; +typedef struct PACKED { + INTEGER picSize; + Rect picFrame; } Picture; typedef Picture *PicPtr; typedef struct { PicPtr p PACKED_P; } HIDDEN_PicPtr; typedef HIDDEN_PicPtr *PicHandle; -typedef struct { - Point pnLoc LPACKED; - Point pnSize LPACKED; - INTEGER pnMode PACKED; - Pattern pnPat LPACKED; +typedef struct PACKED { + Point pnLoc; + Point pnSize; + INTEGER pnMode; + Pattern pnPat; } PenState; /* IMV stuff is used when we parse Version 2 pictures, but the IMV calls @@ -202,50 +202,50 @@ typedef enum { blend=32, addPin, addOver, subPin, #define defQDColors 127 -typedef struct { - unsigned short red PACKED; - unsigned short green PACKED; - unsigned short blue PACKED; +typedef struct PACKED { + unsigned short red; + unsigned short green; + unsigned short blue; } RGBColor; -typedef struct { - SmallFract hue PACKED; - SmallFract saturation PACKED; - SmallFract value PACKED; +typedef struct PACKED { + SmallFract hue; + SmallFract saturation; + SmallFract value; } HSVColor; -typedef struct { - SmallFract hue PACKED; - SmallFract saturation PACKED; - SmallFract lightness PACKED; +typedef struct PACKED { + SmallFract hue; + SmallFract saturation; + SmallFract lightness; } HSLColor; -typedef struct { - SmallFract cyan PACKED; - SmallFract magenta PACKED; - SmallFract yellow PACKED; +typedef struct PACKED { + SmallFract cyan; + SmallFract magenta; + SmallFract yellow; } CMYColor; -typedef struct ColorSpec +typedef struct PACKED ColorSpec { - INTEGER value PACKED; - RGBColor rgb LPACKED; + INTEGER value; + RGBColor rgb; } ColorSpec; typedef ColorSpec cSpecArray[1]; /* can't use 0 */ -typedef struct { - LONGINT ctSeed PACKED; - unsigned short ctFlags PACKED; - INTEGER ctSize PACKED; - cSpecArray ctTable LPACKED; +typedef struct PACKED { + LONGINT ctSeed; + unsigned short ctFlags; + INTEGER ctSize; + cSpecArray ctTable; } ColorTable, *CTabPtr; typedef struct { CTabPtr p PACKED_P; } HIDDEN_CTabPtr; typedef HIDDEN_CTabPtr *CTabHandle; typedef struct { CTabHandle p PACKED_P; } HIDDEN_CTabHandle; -typedef struct { +typedef struct PACKED { Ptr textProc PACKED_P; Ptr lineProc PACKED_P; Ptr rectProc PACKED_P; @@ -268,22 +268,22 @@ typedef struct { Ptr newProc6Proc PACKED_P; } CQDProcs, *CQDProcsPtr; -typedef struct { - Ptr baseAddr PACKED_P; - INTEGER rowBytes PACKED; - Rect bounds LPACKED; - INTEGER pmVersion PACKED; - INTEGER packType PACKED; - LONGINT packSize PACKED; - Fixed hRes PACKED; - Fixed vRes PACKED; - INTEGER pixelType PACKED; - INTEGER pixelSize PACKED; - INTEGER cmpCount PACKED; - INTEGER cmpSize PACKED; - LONGINT planeBytes PACKED; +typedef struct PACKED { + Ptr baseAddr PACKED_P; + INTEGER rowBytes; + Rect bounds; + INTEGER pmVersion; + INTEGER packType; + LONGINT packSize; + Fixed hRes; + Fixed vRes; + INTEGER pixelType; + INTEGER pixelSize; + INTEGER cmpCount; + INTEGER cmpSize; + LONGINT planeBytes; CTabHandle pmTable PACKED_P; - LONGINT pmReserved PACKED; + LONGINT pmReserved; } PixMap, *PixMapPtr; typedef struct { PixMapPtr p PACKED_P; } HIDDEN_PixMapPtr; typedef HIDDEN_PixMapPtr *PixMapHandle; @@ -298,77 +298,77 @@ enum pixmap_pixel_types #define ROWMASK 0x1FFF -typedef struct { - INTEGER patType PACKED; - PixMapHandle patMap PACKED_P; - Handle patData PACKED_P; - Handle patXData PACKED_P; - INTEGER patXValid PACKED; - Handle patXMap PACKED_P; - Pattern pat1Data LPACKED; +typedef struct PACKED { + INTEGER patType; + PixMapHandle patMap PACKED_P; + Handle patData PACKED_P; + Handle patXData PACKED_P; + INTEGER patXValid; + Handle patXMap PACKED_P; + Pattern pat1Data; } PixPat, *PixPatPtr; typedef struct { PixPatPtr p PACKED_P; } HIDDEN_PixPatPtr; typedef HIDDEN_PixPatPtr *PixPatHandle; typedef struct { PixPatHandle p PACKED_P; } HIDDEN_PixPatHandle; -typedef struct { - INTEGER device PACKED; - PixMapHandle portPixMap PACKED_P; - INTEGER portVersion PACKED; - Handle grafVars PACKED_P; - INTEGER chExtra PACKED; - INTEGER pnLocHFrac PACKED; - Rect portRect LPACKED; - RgnHandle visRgn PACKED_P; - RgnHandle clipRgn PACKED_P; - PixPatHandle bkPixPat PACKED_P; - RGBColor rgbFgColor LPACKED; - RGBColor rgbBkColor LPACKED; - Point pnLoc LPACKED; - Point pnSize LPACKED; - INTEGER pnMode PACKED; - PixPatHandle pnPixPat PACKED_P; - PixPatHandle fillPixPat PACKED_P; - INTEGER pnVis PACKED; - INTEGER txFont PACKED; - Style txFace LPACKED; - Byte filler LPACKED; - INTEGER txMode PACKED; - INTEGER txSize PACKED; - Fixed spExtra PACKED; - LONGINT fgColor PACKED; - LONGINT bkColor PACKED; - INTEGER colrBit PACKED; - INTEGER patStretch PACKED; - Handle picSave PACKED_P; - Handle rgnSave PACKED_P; - Handle polySave PACKED_P; - CQDProcsPtr grafProcs PACKED_P; +typedef struct PACKED { + INTEGER device; + PixMapHandle portPixMap PACKED_P; + INTEGER portVersion; + Handle grafVars PACKED_P; + INTEGER chExtra; + INTEGER pnLocHFrac; + Rect portRect; + RgnHandle visRgn PACKED_P; + RgnHandle clipRgn PACKED_P; + PixPatHandle bkPixPat PACKED_P; + RGBColor rgbFgColor; + RGBColor rgbBkColor; + Point pnLoc; + Point pnSize; + INTEGER pnMode; + PixPatHandle pnPixPat PACKED_P; + PixPatHandle fillPixPat PACKED_P; + INTEGER pnVis; + INTEGER txFont; + Style txFace; + Byte filler; + INTEGER txMode; + INTEGER txSize; + Fixed spExtra; + LONGINT fgColor; + LONGINT bkColor; + INTEGER colrBit; + INTEGER patStretch; + Handle picSave PACKED_P; + Handle rgnSave PACKED_P; + Handle polySave PACKED_P; + CQDProcsPtr grafProcs PACKED_P; } CGrafPort, *CGrafPtr; typedef struct { CGrafPtr p PACKED_P; } HIDDEN_CGrafPtr; -typedef struct { - INTEGER crsrType PACKED; - PixMapHandle crsrMap PACKED_P; - Handle crsrData PACKED_P; - Handle crsrXData PACKED_P; - INTEGER crsrXValid PACKED; - Handle crsrXHandle PACKED_P; - Bits16 crsr1Data PACKED; - Bits16 crsrMask PACKED; - Point crsrHotSpot LPACKED; - LONGINT crsrXTable PACKED; - LONGINT crsrID PACKED; +typedef struct PACKED { + INTEGER crsrType; + PixMapHandle crsrMap PACKED_P; + Handle crsrData PACKED_P; + Handle crsrXData PACKED_P; + INTEGER crsrXValid; + Handle crsrXHandle PACKED_P; + Bits16 crsr1Data; + Bits16 crsrMask; + Point crsrHotSpot; + LONGINT crsrXTable; + LONGINT crsrID; } CCrsr, *CCrsrPtr; typedef struct { CCrsrPtr p PACKED_P; } HIDDEN_CCrsrPtr; typedef HIDDEN_CCrsrPtr *CCrsrHandle; -typedef struct { - uint16 red PACKED; - uint16 green PACKED; - uint16 blue PACKED; - int32 matchData PACKED; +typedef struct PACKED { + uint16 red; + uint16 green; + uint16 blue; + int32 matchData; } MatchRec; typedef struct { HIDDEN_GrafPtr *p PACKED_P; } HIDDEN_GrafPtr_Ptr; diff --git a/src/include/SANE.h b/src/include/SANE.h index 2db0a29..a81ddf9 100644 --- a/src/include/SANE.h +++ b/src/include/SANE.h @@ -11,22 +11,22 @@ /* Big-endian 64 bit "comp" data type. Note that this has a NaN value! */ typedef union { - struct { - ULONGINT hi PACKED; - ULONGINT lo PACKED; - } hilo LPACKED; - signed long long val PACKED; + struct PACKED { + ULONGINT hi; + ULONGINT lo; + } hilo; + signed long long val; } comp_t; /* Now we have a version of this in "native" byte order. */ #if defined (LITTLEENDIAN) typedef union { - struct { - ULONGINT lo PACKED; - ULONGINT hi PACKED; - } hilo LPACKED; - signed long long val PACKED; + struct PACKED { + ULONGINT lo; + ULONGINT hi; + } hilo; + signed long long val; } native_comp_t; #else /* Not LITTLEENDIAN */ typedef comp_t native_comp_t; @@ -34,26 +34,26 @@ typedef comp_t native_comp_t; /* "Packed" IEEE 80 bit FP representation (zero field omitted). */ -typedef struct { +typedef struct PACKED { /* Sign and exponent. */ union { #if !defined (LITTLEENDIAN) - struct { /* Here for added efficiency when BIGENDIAN. */ + struct PACKED { /* Here for added efficiency when BIGENDIAN. */ unsigned short sgn:1; unsigned short exp:15; - } s PACKED; + } s; #endif - unsigned short sgn_and_exp PACKED; - } se LPACKED; + unsigned short sgn_and_exp; + } se; /* Mantissa. */ union { - struct { - ULONGINT man_hi PACKED; - ULONGINT man_lo PACKED; - } hilo LPACKED; - unsigned long long man PACKED; - } man LPACKED; + struct PACKED { + ULONGINT man_hi; + ULONGINT man_lo; + } hilo; + unsigned long long man; + } man; } x80_t; @@ -65,20 +65,20 @@ typedef comp_t comp; /* This only makes sense on the 68k. */ #if defined (mc68000) -typedef struct { - INTEGER exp PACKED; - INTEGER zero PACKED; - INTEGER man[4] PACKED; +typedef struct PACKED { + INTEGER exp; + INTEGER zero; + INTEGER man[4]; } extended96; #endif #define SIGDIGLEN 20 -typedef struct { - unsigned char sgn LPACKED; - unsigned char unused_filler LPACKED; - INTEGER exp PACKED; - unsigned char sig[SIGDIGLEN] LPACKED; +typedef struct PACKED { + unsigned char sgn; + unsigned char unused_filler; + INTEGER exp; + unsigned char sig[SIGDIGLEN]; } Decimal; typedef enum { FloatDecimal, FixedDecimal = 256 } toobigdecformstyle_t; @@ -90,9 +90,9 @@ typedef INTEGER DecFormStyle; typedef enum {SNaN = 1, QNaN, Infinite, ZeroNum, NormalNum, DenormalNum} NumClass; -typedef struct { - DecFormStyle style PACKED; - INTEGER digits PACKED; +typedef struct PACKED { + DecFormStyle style; + INTEGER digits; } DecForm; #define Decstr char * diff --git a/src/include/ScrapMgr.h b/src/include/ScrapMgr.h index e538c7e..273e8ff 100644 --- a/src/include/ScrapMgr.h +++ b/src/include/ScrapMgr.h @@ -13,12 +13,12 @@ #define noScrapErr (-100) #define noTypeErr (-102) -typedef struct { - LONGINT scrapSize PACKED; - Handle scrapHandle PACKED_P; - INTEGER scrapCount PACKED; - INTEGER scrapState PACKED; - StringPtr scrapName PACKED_P; +typedef struct PACKED { + LONGINT scrapSize; + Handle scrapHandle PACKED_P; + INTEGER scrapCount; + INTEGER scrapState; + StringPtr scrapName PACKED_P; } ScrapStuff; typedef ScrapStuff *PScrapStuff; diff --git a/src/include/ScriptMgr.h b/src/include/ScriptMgr.h index 1891956..bf9a515 100644 --- a/src/include/ScriptMgr.h +++ b/src/include/ScriptMgr.h @@ -96,27 +96,27 @@ enum { smKCHRCache = 38 }; typedef uint8 StyledLineBreakCode; -typedef struct DateCacheRec +typedef struct PACKED DateCacheRec { - int16 hidden[256] PACKED; + int16 hidden[256]; } DateCacheRec, *DateCachePtr; -typedef struct LongDateRec +typedef struct PACKED LongDateRec { - int16 era PACKED; - int16 year PACKED; - int16 month PACKED; - int16 day PACKED; - int16 hour PACKED; - int16 minute PACKED; - int16 second PACKED; - int16 dayOfWeek PACKED; - int16 dayOfYear PACKED; - int16 weekOfYear PACKED; - int16 pm PACKED; - int16 res1 PACKED; - int16 res2 PACKED; - int16 res3 PACKED; + int16 era; + int16 year; + int16 month; + int16 day; + int16 hour; + int16 minute; + int16 second; + int16 dayOfWeek; + int16 dayOfYear; + int16 weekOfYear; + int16 pm; + int16 res1; + int16 res2; + int16 res3; } LongDateRec, *LongDatePtr; typedef INTEGER TruncCode; @@ -130,11 +130,11 @@ typedef int16 ScriptRunStatus; /* Not sure this is correct, since in IM typedef INTEGER FormatStatus; -typedef struct +typedef struct PACKED { - Byte fLength LPACKED; - Byte fVersion LPACKED; - SignedByte data[253] LPACKED; + Byte fLength; + Byte fVersion; + SignedByte data[253]; } NumFormatStringRec; @@ -152,15 +152,15 @@ typedef struct } WideCharArr; -typedef struct +typedef struct PACKED { - INTEGER version PACKED; - WideChar data[31] PACKED; - WideCharArr pePlus LPACKED; - WideCharArr peMinus LPACKED; - WideCharArr peMinusPlus LPACKED; - WideCharArr altNumTable LPACKED; - CHAR reserved[20] PACKED; + INTEGER version; + WideChar data[31]; + WideCharArr pePlus; + WideCharArr peMinus; + WideCharArr peMinusPlus; + WideCharArr altNumTable; + CHAR reserved[20]; } NumberParts; @@ -172,12 +172,12 @@ typedef unsigned char LongDateField; typedef char DateDelta; -typedef struct +typedef struct PACKED { - long togFlags PACKED; - ResType amChars PACKED; - ResType pmChars PACKED; - long reserved[4] PACKED; + int32 togFlags; + ResType amChars; + ResType pmChars; + int32 reserved[4]; } TogglePB; diff --git a/src/include/SegmentLdr.h b/src/include/SegmentLdr.h index efa54b5..5367954 100644 --- a/src/include/SegmentLdr.h +++ b/src/include/SegmentLdr.h @@ -18,17 +18,15 @@ extern _NORET_1_ pascal trap void C_ExitToShell( void ) _NORET_2_; #define appOpen 0 #define appPrint 1 -typedef struct { - INTEGER vRefNum PACKED; - OSType fType PACKED; - INTEGER versNum PACKED; - Str255 fName LPACKED; +typedef struct PACKED { + INTEGER vRefNum; + OSType fType; + INTEGER versNum; + Str255 fName; } AppFile; - #define hwParamErr (-502) - #if !defined (AppParmHandle_H) extern HIDDEN_Handle AppParmHandle_H; extern Byte loadtrap; diff --git a/src/include/Serial.h b/src/include/Serial.h index 8bc46da..df6204d 100644 --- a/src/include/Serial.h +++ b/src/include/Serial.h @@ -67,24 +67,24 @@ typedef __SignedByte SPortSel; #endif /* BINCOMPAT */ -typedef struct { - __Byte fXOn LPACKED; - __Byte fCTS LPACKED; - __Byte xOn LPACKED; - __Byte xOff LPACKED; - __Byte errs LPACKED; - __Byte evts LPACKED; - __Byte fInX LPACKED; - __Byte null LPACKED; +typedef struct PACKED { + __Byte fXOn; + __Byte fCTS; + __Byte xOn; + __Byte xOff; + __Byte errs; + __Byte evts; + __Byte fInX; + __Byte null; } SerShk; -typedef struct { - __Byte cumErrs LPACKED; - __Byte xOffSent LPACKED; - __Byte rdPend LPACKED; - __Byte wrPend LPACKED; - __Byte ctsHold LPACKED; - __Byte xOffHold LPACKED; +typedef struct PACKED { + __Byte cumErrs; + __Byte xOffSent; + __Byte rdPend; + __Byte wrPend; + __Byte ctsHold; + __Byte xOffHold; } SerStaRec; #define MODEMINAME ".AIn" diff --git a/src/include/SoundDvr.h b/src/include/SoundDvr.h index ac8b239..9627d19 100644 --- a/src/include/SoundDvr.h +++ b/src/include/SoundDvr.h @@ -14,23 +14,23 @@ #define ffMode 0 typedef Byte FreeWave[30001]; -typedef struct { - INTEGER mode PACKED; - Fixed fcount PACKED; - FreeWave waveBytes LPACKED; +typedef struct PACKED { + INTEGER mode; + Fixed fcount; + FreeWave waveBytes; } FFSynthRec; typedef FFSynthRec *FFSynthPtr; -typedef struct { - INTEGER tcount PACKED; - INTEGER amplitude PACKED; - INTEGER tduration PACKED; +typedef struct PACKED { + INTEGER tcount; + INTEGER amplitude; + INTEGER tduration; } Tone; typedef Tone Tones[5001]; -typedef struct { - INTEGER mode PACKED; - Tones triplets LPACKED; +typedef struct PACKED { + INTEGER mode; + Tones triplets; } SWSynthRec; typedef SWSynthRec *SWSynthPtr; @@ -43,27 +43,27 @@ typedef Byte Wave; typedef Wave *WavePtr; -typedef struct { - INTEGER fduration PACKED; - Fixed sound1Rate PACKED; - LONGINT sound1Phase PACKED; - Fixed sound2Rate PACKED; - LONGINT sound2Phase PACKED; - Fixed sound3Rate PACKED; - LONGINT sound3Phase PACKED; - Fixed sound4Rate PACKED; - LONGINT sound4Phase PACKED; - WavePtr sound1Wave PACKED_P; - WavePtr sound2Wave PACKED_P; - WavePtr sound3Wave PACKED_P; - WavePtr sound4Wave PACKED_P; +typedef struct PACKED { + INTEGER fduration; + Fixed sound1Rate; + LONGINT sound1Phase; + Fixed sound2Rate; + LONGINT sound2Phase; + Fixed sound3Rate; + LONGINT sound3Phase; + Fixed sound4Rate; + LONGINT sound4Phase; + WavePtr sound1Wave PACKED_P; + WavePtr sound2Wave PACKED_P; + WavePtr sound3Wave PACKED_P; + WavePtr sound4Wave PACKED_P; } FTSoundRec; typedef FTSoundRec *FTSndRecPtr; typedef struct { FTSndRecPtr p PACKED_P; } HIDDEN_FTSndRecPtr; -typedef struct { - INTEGER mode PACKED; - FTSndRecPtr sndRec PACKED_P; +typedef struct PACKED { + INTEGER mode; + FTSndRecPtr sndRec PACKED_P; } FTSynthRec; typedef FTSynthRec *FTsynthPtr; diff --git a/src/include/SoundMgr.h b/src/include/SoundMgr.h index 6376926..6b2158c 100644 --- a/src/include/SoundMgr.h +++ b/src/include/SoundMgr.h @@ -10,10 +10,10 @@ #include "QuickDraw.h" -typedef struct { - INTEGER cmd PACKED; - INTEGER param1 PACKED; - LONGINT param2 PACKED; +typedef struct PACKED { + INTEGER cmd; + INTEGER param1; + LONGINT param2; } SndCommand; #define stdQLength 128 @@ -25,18 +25,18 @@ enum extSH = 0xFF, /* extended sound header */ }; -typedef struct _SndChannel { +typedef struct PACKED _SndChannel { struct _SndChannel *nextChan PACKED_P; Ptr firstMod PACKED_P; ProcPtr callBack PACKED_P; - LONGINT userInfo PACKED; - LONGINT wait PACKED; - SndCommand cmdInProg LPACKED; - INTEGER flags PACKED; - INTEGER qLength PACKED; - INTEGER qHead PACKED; - INTEGER qTail PACKED; - SndCommand queue[stdQLength] LPACKED; + LONGINT userInfo; + LONGINT wait; + SndCommand cmdInProg; + INTEGER flags; + INTEGER qLength; + INTEGER qHead; + INTEGER qTail; + SndCommand queue[stdQLength]; } SndChannel, *SndChannelPtr; #define SND_CHAN_FLAGS_X(c) (c->flags) @@ -74,46 +74,46 @@ enum { midiDataCmd = 100, }; -typedef struct { - LONGINT offset PACKED; - LONGINT nsamples PACKED; - LONGINT rate PACKED; - LONGINT altbegin PACKED; - LONGINT altend PACKED; - INTEGER basenote PACKED; - unsigned char buf[1] LPACKED; +typedef struct PACKED { + LONGINT offset; + LONGINT nsamples; + LONGINT rate; + LONGINT altbegin; + LONGINT altend; + INTEGER basenote; + unsigned char buf[1]; } soundbuffer_t; -typedef struct _SoundHeader { +typedef struct PACKED _SoundHeader { Ptr samplePtr PACKED_P; - LONGINT length PACKED; - Fixed sampleRate PACKED; - LONGINT loopStart PACKED; - LONGINT loopEnd PACKED; - Byte encode LPACKED; - Byte baseFrequency LPACKED; - Byte sampleArea[0] LPACKED; + LONGINT length; + Fixed sampleRate; + LONGINT loopStart; + LONGINT loopEnd; + Byte encode; + Byte baseFrequency; + Byte sampleArea[0]; } SoundHeader, *SoundHeaderPtr; -typedef struct _ExtSoundHeader { +typedef struct PACKED _ExtSoundHeader { Ptr samplePtr PACKED_P; - LONGINT numChannels PACKED; - Fixed sampleRate PACKED; - LONGINT loopStart PACKED; - LONGINT loopEnd PACKED; - Byte encode LPACKED; - Byte baseFrequency LPACKED; - LONGINT numFrames PACKED; - Extended AIFFSampleRate PACKED; /* ??? should be Extended80 */ - Ptr MarkerChunk PACKED; - Ptr instrumentChunks PACKED; - Ptr AESRecording PACKED; - INTEGER sampleSize PACKED; - INTEGER futureUse1 PACKED; - LONGINT futureUse2 PACKED; - LONGINT futureUse3 PACKED; - LONGINT futureUse4 PACKED; - Byte sampleArea[0] LPACKED; + LONGINT numChannels; + Fixed sampleRate; + LONGINT loopStart; + LONGINT loopEnd; + Byte encode; + Byte baseFrequency; + LONGINT numFrames; + Extended AIFFSampleRate; /* ??? should be Extended80 */ + Ptr MarkerChunk; + Ptr instrumentChunks; + Ptr AESRecording; + INTEGER sampleSize; + INTEGER futureUse1; + LONGINT futureUse2; + LONGINT futureUse3; + LONGINT futureUse4; + Byte sampleArea[0]; } ExtSoundHeader, *ExtSoundHeaderPtr; enum { @@ -142,12 +142,12 @@ enum { soundactivenone = 0xFF, }; -typedef struct +typedef struct PACKED { - LONGINT dbNumFrames PACKED; - LONGINT dbFlags PACKED; - LONGINT dbUserInfo[2] PACKED; - Byte dbSoundData[0] LPACKED; + LONGINT dbNumFrames; + LONGINT dbFlags; + LONGINT dbUserInfo[2]; + Byte dbSoundData[0]; } SndDoubleBuffer, *SndDoubleBufferPtr; enum { @@ -155,27 +155,27 @@ enum { dbLastBuffer = 4 }; -typedef struct +typedef struct PACKED { - INTEGER dbhNumChannels PACKED; - INTEGER dbhSampleSize PACKED; - INTEGER dbhCompressionID PACKED; - INTEGER dbhPacketSize PACKED; - Fixed dbhSampleRate PACKED; - SndDoubleBufferPtr dbhBufferPtr[2] PACKED; - ProcPtr dbhDoubleBack PACKED; + INTEGER dbhNumChannels; + INTEGER dbhSampleSize; + INTEGER dbhCompressionID; + INTEGER dbhPacketSize; + Fixed dbhSampleRate; + SndDoubleBufferPtr dbhBufferPtr[2]; + ProcPtr dbhDoubleBack; } SndDoubleBufferHeader, *SndDoubleBufferHeaderPtr; -typedef struct _SCSTATUS { - Fixed scStartTime PACKED; - Fixed scEndTime PACKED; - Fixed scCurrentTime PACKED; - Boolean scChannelBusy LPACKED; - Boolean scChannelDisposed LPACKED; - Boolean scChannelPaused LPACKED; - Boolean scUnused LPACKED; - LONGINT scChannelAttributes PACKED; - LONGINT scCPULoad PACKED; +typedef struct PACKED _SCSTATUS { + Fixed scStartTime; + Fixed scEndTime; + Fixed scCurrentTime; + Boolean scChannelBusy; + Boolean scChannelDisposed; + Boolean scChannelPaused; + Boolean scUnused; + LONGINT scChannelAttributes; + LONGINT scCPULoad; } SCStatus, *SCStatusPtr; #if 1 /* stub definitions */ diff --git a/src/include/StdFilePkg.h b/src/include/StdFilePkg.h index 0a3b52c..2a66722 100644 --- a/src/include/StdFilePkg.h +++ b/src/include/StdFilePkg.h @@ -28,13 +28,13 @@ #define getNmList 7 #define getScroll 8 -typedef struct { - BOOLEAN good LPACKED; - BOOLEAN copy LPACKED; - OSType fType PACKED; - INTEGER vRefNum PACKED; - INTEGER version PACKED; - Str63 fName LPACKED; +typedef struct PACKED { + BOOLEAN good; + BOOLEAN copy; + OSType fType; + INTEGER vRefNum; + INTEGER version; + Str63 fName; } SFReply; typedef OSType SFTypeList[4]; @@ -44,18 +44,18 @@ extern INTEGER SFSaveDisk; extern LONGINT CurDirStore; #endif -typedef struct +typedef struct PACKED { - BOOLEAN sfGood LPACKED; - BOOLEAN sfReplacing LPACKED; - OSType sfType PACKED; - FSSpec sfFile LPACKED; - ScriptCode sfScript PACKED; - INTEGER sfFlags PACKED; - BOOLEAN sfIsFolder LPACKED; - BOOLEAN sfIsVolume LPACKED; - LONGINT sfReserved1 PACKED; - INTEGER sfReserved2 PACKED; + BOOLEAN sfGood; + BOOLEAN sfReplacing; + OSType sfType; + FSSpec sfFile; + ScriptCode sfScript; + INTEGER sfFlags; + BOOLEAN sfIsFolder; + BOOLEAN sfIsVolume; + LONGINT sfReserved1; + INTEGER sfReserved2; } StandardFileReply; typedef ProcPtr FileFilterYDProcPtr; diff --git a/src/include/TextEdit.h b/src/include/TextEdit.h index 65c945e..171d69d 100644 --- a/src/include/TextEdit.h +++ b/src/include/TextEdit.h @@ -50,59 +50,59 @@ #define teBitSet (1) #define teBitTest (-1) -typedef struct { - Rect destRect LPACKED; - Rect viewRect LPACKED; - Rect selRect LPACKED; - INTEGER lineHeight PACKED; - INTEGER fontAscent PACKED; - Point selPoint LPACKED; - INTEGER selStart PACKED; - INTEGER selEnd PACKED; - INTEGER active PACKED; - ProcPtr wordBreak PACKED_P; - ProcPtr clikLoop PACKED_P; - LONGINT clickTime PACKED; - INTEGER clickLoc PACKED; - LONGINT caretTime PACKED; - INTEGER caretState PACKED; - INTEGER just PACKED; - INTEGER teLength PACKED; - Handle hText PACKED_P; - INTEGER recalBack PACKED; - INTEGER recalLines PACKED; - INTEGER clikStuff PACKED; - INTEGER crOnly PACKED; - INTEGER txFont PACKED; - Style txFace LPACKED; - Byte filler LPACKED; - INTEGER txMode PACKED; - INTEGER txSize PACKED; - GrafPtr inPort PACKED_P; - ProcPtr highHook PACKED_P; - ProcPtr caretHook PACKED_P; - INTEGER nLines PACKED; - INTEGER lineStarts[1] PACKED; +typedef struct PACKED { + Rect destRect; + Rect viewRect; + Rect selRect; + INTEGER lineHeight; + INTEGER fontAscent; + Point selPoint; + INTEGER selStart; + INTEGER selEnd; + INTEGER active; + ProcPtr wordBreak PACKED_P; + ProcPtr clikLoop PACKED_P; + LONGINT clickTime; + INTEGER clickLoc; + LONGINT caretTime; + INTEGER caretState; + INTEGER just; + INTEGER teLength; + Handle hText PACKED_P; + INTEGER recalBack; + INTEGER recalLines; + INTEGER clikStuff; + INTEGER crOnly; + INTEGER txFont; + Style txFace; + Byte filler; + INTEGER txMode; + INTEGER txSize; + GrafPtr inPort PACKED_P; + ProcPtr highHook PACKED_P; + ProcPtr caretHook PACKED_P; + INTEGER nLines; + INTEGER lineStarts[1]; } TERec; typedef TERec *TEPtr; typedef struct { TEPtr p PACKED_P; } HIDDEN_TEPtr; typedef HIDDEN_TEPtr *TEHandle; -typedef struct { - INTEGER startChar PACKED; - INTEGER styleIndex PACKED; +typedef struct PACKED { + INTEGER startChar; + INTEGER styleIndex; } StyleRun; -typedef struct { - INTEGER stCount PACKED; - INTEGER stHeight PACKED; - INTEGER stAscent PACKED; - INTEGER stFont PACKED; - Style stFace LPACKED; - Byte filler LPACKED; - INTEGER stSize PACKED; - RGBColor stColor LPACKED; +typedef struct PACKED { + INTEGER stCount; + INTEGER stHeight; + INTEGER stAscent; + INTEGER stFont; + Style stFace; + Byte filler; + INTEGER stSize; + RGBColor stColor; } STElement; typedef STElement TEStyleTable[1]; @@ -110,9 +110,9 @@ typedef STElement *STPtr; typedef struct { STPtr p PACKED_P; } HIDDEN_STPtr; typedef HIDDEN_STPtr *STHandle; -typedef struct { - INTEGER lhHeight PACKED; - INTEGER lhAscent PACKED; +typedef struct PACKED { + INTEGER lhHeight; + INTEGER lhAscent; } LHElement; typedef LHElement LHTable[1]; @@ -120,53 +120,53 @@ typedef LHElement *LHPtr; typedef struct { LHPtr p PACKED_P; } HIDDEN_LHPtr; typedef HIDDEN_LHPtr *LHHandle; -typedef struct { - INTEGER tsFont PACKED; - Style tsFace LPACKED; - Byte filler LPACKED; - INTEGER tsSize PACKED; - RGBColor tsColor LPACKED; +typedef struct PACKED { + INTEGER tsFont; + Style tsFace; + Byte filler; + INTEGER tsSize; + RGBColor tsColor; } TextStyle; -typedef struct { - LONGINT scrpStartChar PACKED; - INTEGER scrpHeight PACKED; - INTEGER scrpAscent PACKED; - INTEGER scrpFont PACKED; - Style scrpFace LPACKED; - Byte filler LPACKED; - INTEGER scrpSize PACKED; - RGBColor scrpColor LPACKED; +typedef struct PACKED { + LONGINT scrpStartChar; + INTEGER scrpHeight; + INTEGER scrpAscent; + INTEGER scrpFont; + Style scrpFace; + Byte filler; + INTEGER scrpSize; + RGBColor scrpColor; } ScrpSTElement; typedef ScrpSTElement ScrpSTTable[1]; -typedef struct { - INTEGER scrpNStyles PACKED; - ScrpSTTable scrpStyleTab LPACKED; +typedef struct PACKED { + INTEGER scrpNStyles; + ScrpSTTable scrpStyleTab; } StScrpRec; typedef StScrpRec *StScrpPtr; typedef struct { StScrpPtr p PACKED_P; } HIDDEN_StScrpPtr; typedef HIDDEN_StScrpPtr *StScrpHandle; -typedef struct { - LONGINT TEReserved PACKED; - StScrpHandle nullScrap PACKED_P; +typedef struct PACKED { + LONGINT TEReserved; + StScrpHandle nullScrap PACKED_P; } NullSTRec; typedef NullSTRec *NullSTPtr; typedef struct { NullSTPtr p PACKED_P; } HIDDEN_NullSTPtr; typedef HIDDEN_NullSTPtr *NullSTHandle; -typedef struct { - INTEGER nRuns PACKED; - INTEGER nStyles PACKED; - STHandle styleTab PACKED_P; - LHHandle lhTab PACKED_P; - LONGINT teRefCon PACKED; - NullSTHandle nullStyle PACKED_P; - StyleRun runs[1] LPACKED; +typedef struct PACKED { + INTEGER nRuns; + INTEGER nStyles; + STHandle styleTab PACKED_P; + LHHandle lhTab PACKED_P; + LONGINT teRefCon; + NullSTHandle nullStyle PACKED_P; + StyleRun runs[1]; } TEStyleRec; typedef TEStyleRec *TEStylePtr; diff --git a/src/include/TimeMgr.h b/src/include/TimeMgr.h index a0ecce2..52dd0da 100644 --- a/src/include/TimeMgr.h +++ b/src/include/TimeMgr.h @@ -9,11 +9,11 @@ */ -typedef struct { - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - ProcPtr tmAddr PACKED_P; - LONGINT tmCount PACKED; /* I don't trust IMIV-301 */ +typedef struct PACKED { + QElemPtr qLink PACKED_P; + INTEGER qType; + ProcPtr tmAddr PACKED_P; + LONGINT tmCount; /* I don't trust IMIV-301 */ } TMTask; diff --git a/src/include/ToolboxUtil.h b/src/include/ToolboxUtil.h index aa37f87..9d7d9a5 100644 --- a/src/include/ToolboxUtil.h +++ b/src/include/ToolboxUtil.h @@ -18,9 +18,9 @@ #define plusCursor 3 #define watchCursor 4 -typedef struct { - LONGINT hiLong PACKED; - LONGINT loLong PACKED; +typedef struct PACKED { + LONGINT hiLong; + LONGINT loLong; } Int64Bit; #if 1 || !defined(__alpha) diff --git a/src/include/VDriver.h b/src/include/VDriver.h index c56cb0e..bda3868 100644 --- a/src/include/VDriver.h +++ b/src/include/VDriver.h @@ -10,28 +10,28 @@ #include "FileMgr.h" -typedef struct +typedef struct PACKED { - COMMONFSQUEUEDEFS PACKED; - INTEGER ioRefNum PACKED; - INTEGER csCode PACKED; + COMMONFSQUEUEDEFS; + INTEGER ioRefNum; + INTEGER csCode; Ptr csParam PACKED_P; } VDParamBlock; typedef VDParamBlock *VDParamBlockPtr; -typedef struct +typedef struct PACKED { Ptr csTable PACKED_P; - INTEGER csStart PACKED; - INTEGER csCount PACKED; + INTEGER csStart; + INTEGER csCount; } VDEntryRecord; typedef VDEntryRecord *VDEntRecPtr; -typedef struct +typedef struct PACKED { Ptr csGTable PACKED_P; } VDGammaRecord; @@ -39,28 +39,28 @@ typedef struct typedef VDGammaRecord *VDGamRecPtr; -typedef struct +typedef struct PACKED { - INTEGER csMode PACKED; - LONGINT csData PACKED; - INTEGER csPage PACKED; + INTEGER csMode; + LONGINT csData; + INTEGER csPage; Ptr csBaseAddr PACKED_P; } VDPgInfo; typedef VDPgInfo *VDPgInfoPtr; -typedef struct +typedef struct PACKED { - SignedByte flag LPACKED; + SignedByte flag; } VDFlagRec; typedef VDFlagRec *VDFlagPtr; -typedef struct +typedef struct PACKED { - SignedByte spID LPACKED; + SignedByte spID; } VDDefModeRec; typedef VDDefModeRec *VDDefModePtr; diff --git a/src/include/VRetraceMgr.h b/src/include/VRetraceMgr.h index a5118fe..3bc36a2 100644 --- a/src/include/VRetraceMgr.h +++ b/src/include/VRetraceMgr.h @@ -11,12 +11,12 @@ #define qErr (-1) #define vTypErr (-2) -typedef struct { - QElemPtr qLink PACKED_P; - INTEGER qType PACKED; - ProcPtr vblAddr PACKED_P; - INTEGER vblCount PACKED; - INTEGER vblPhase PACKED; +typedef struct PACKED { + QElemPtr qLink PACKED_P; + INTEGER qType; + ProcPtr vblAddr PACKED_P; + INTEGER vblCount; + INTEGER vblPhase; } VBLTask; typedef VBLTask *VBLTaskPtr; diff --git a/src/include/WindowMgr.h b/src/include/WindowMgr.h index ca4ffee..8323992 100644 --- a/src/include/WindowMgr.h +++ b/src/include/WindowMgr.h @@ -78,29 +78,29 @@ typedef struct { WindowPeek p PACKED_P; } HIDDEN_WindowPeek; #include "ControlMgr.h" -struct __wr { - GrafPort port LPACKED; - INTEGER windowKind PACKED; - BOOLEAN visible LPACKED; - BOOLEAN hilited LPACKED; - BOOLEAN goAwayFlag LPACKED; - BOOLEAN spareFlag LPACKED; - RgnHandle strucRgn PACKED_P; - RgnHandle contRgn PACKED_P; - RgnHandle updateRgn PACKED_P; - Handle windowDefProc PACKED_P; - Handle dataHandle PACKED_P; - StringHandle titleHandle PACKED_P; - INTEGER titleWidth PACKED; - ControlHandle controlList PACKED_P; /* is really a ControlHandle */ - WindowPeek nextWindow PACKED_P; /* is really a WindowPeek */ - PicHandle windowPic PACKED_P; - LONGINT refCon PACKED; +struct PACKED __wr { + GrafPort port; + INTEGER windowKind; + BOOLEAN visible; + BOOLEAN hilited; + BOOLEAN goAwayFlag; + BOOLEAN spareFlag; + RgnHandle strucRgn PACKED_P; + RgnHandle contRgn PACKED_P; + RgnHandle updateRgn PACKED_P; + Handle windowDefProc PACKED_P; + Handle dataHandle PACKED_P; + StringHandle titleHandle PACKED_P; + INTEGER titleWidth; + ControlHandle controlList PACKED_P; /* is really a ControlHandle */ + WindowPeek nextWindow PACKED_P; /* is really a WindowPeek */ + PicHandle windowPic PACKED_P; + LONGINT refCon; }; -typedef struct { - Rect userState LPACKED, - stdState LPACKED; +typedef struct PACKED { + Rect userState; + Rect stdState; } WStateData; #define inZoomIn 7 @@ -114,14 +114,14 @@ typedef struct { AuxWinPtr p PACKED_P; } HIDDEN_AuxWinPtr; typedef HIDDEN_AuxWinPtr *AuxWinHandle; typedef struct { AuxWinHandle p PACKED_P; } HIDDEN_AuxWinHandle; -typedef struct AuxWinRec { - AuxWinHandle awNext PACKED_P; - WindowPtr awOwner PACKED_P; - CTabHandle awCTable PACKED_P; - Handle dialogCItem PACKED_P; - LONGINT awFlags PACKED; - CTabHandle awReserved PACKED_P; - LONGINT awRefCon PACKED; +typedef struct PACKED AuxWinRec { + AuxWinHandle awNext PACKED_P; + WindowPtr awOwner PACKED_P; + CTabHandle awCTable PACKED_P; + Handle dialogCItem PACKED_P; + LONGINT awFlags; + CTabHandle awReserved PACKED_P; + LONGINT awRefCon; } AuxWinRec; #if !defined (WindowList_H) diff --git a/src/include/rsys/alias.h b/src/include/rsys/alias.h index 53eb655..5db2d96 100644 --- a/src/include/rsys/alias.h +++ b/src/include/rsys/alias.h @@ -3,66 +3,66 @@ typedef unsigned char Str27[28]; -typedef struct +typedef struct PACKED { - OSType type PACKED; - INTEGER length PACKED; - INTEGER usually_2 PACKED; - INTEGER usually_0 PACKED; - Str27 volumeName LPACKED; - LONGINT ioVCrDate PACKED; - INTEGER ioVSigWord PACKED; - INTEGER zero_or_one PACKED; - LONGINT zero_or_neg_one PACKED; - Str63 fileName LPACKED; - LONGINT ioDirID PACKED; /* -1 full */ - LONGINT ioFlCrDat PACKED; - OSType type_info PACKED; - OSType creator PACKED; - INTEGER mystery_words[10] PACKED; + OSType type; + INTEGER length; + INTEGER usually_2; + INTEGER usually_0; + Str27 volumeName; + LONGINT ioVCrDate; + INTEGER ioVSigWord; + INTEGER zero_or_one; + LONGINT zero_or_neg_one; + Str63 fileName; + LONGINT ioDirID; /* -1 full */ + LONGINT ioFlCrDat; + OSType type_info; + OSType creator; + INTEGER mystery_words[10]; } alias_head_t; -typedef struct /* 0x0000 */ +typedef struct PACKED /* 0x0000 */ { - INTEGER parent_length PACKED; - unsigned char parent_bytes[1] LPACKED; + INTEGER parent_length; + unsigned char parent_bytes[1]; } alias_parent_t; -typedef struct /* 0x0001 */ +typedef struct PACKED /* 0x0001 */ { - INTEGER eight PACKED; - LONGINT mystery_longs[2] PACKED; + INTEGER eight; + LONGINT mystery_longs[2]; } alias_unknown_000100_t; -typedef struct /* 0x0002 */ +typedef struct PACKED /* 0x0002 */ { - INTEGER fullpath_length PACKED; - unsigned char fullpath_bytes[1] LPACKED; + INTEGER fullpath_length; + unsigned char fullpath_bytes[1]; } alias_fullpath_t; -typedef struct /* 0x0009 */ +typedef struct PACKED /* 0x0009 */ { - INTEGER length PACKED; - INTEGER weird_info[12] PACKED; - Str32 zone LPACKED; - Str31 server LPACKED; - Str27 volumeName LPACKED; - Str32 network_identity_owner_name LPACKED; - char filler_zeros[18] LPACKED; + INTEGER length; + INTEGER weird_info[12]; + Str32 zone; + Str31 server; + Str27 volumeName; + Str32 network_identity_owner_name; + char filler_zeros[18]; } alias_tail_t; -typedef struct +typedef struct PACKED { - alias_head_t *headp PACKED; - alias_parent_t *parentp PACKED; - alias_unknown_000100_t *unknownp PACKED; - alias_fullpath_t *fullpathp PACKED; - alias_tail_t *tailp PACKED; + alias_head_t *headp PACKED_P; + alias_parent_t *parentp PACKED_P; + alias_unknown_000100_t *unknownp PACKED_P; + alias_fullpath_t *fullpathp PACKED_P; + alias_tail_t *tailp PACKED_P; } alias_parsed_t; diff --git a/src/include/rsys/apple_events.h b/src/include/rsys/apple_events.h index 2b84528..67668a3 100644 --- a/src/include/rsys/apple_events.h +++ b/src/include/rsys/apple_events.h @@ -3,43 +3,43 @@ /* #### internal */ -typedef struct +typedef struct PACKED { - DescType type PACKED; - uint32 size PACKED; - char data[0] LPACKED; + DescType type; + uint32 size; + char data[0]; } inline_desc_t; -typedef struct +typedef struct PACKED { - int32 key PACKED; - DescType type PACKED; - uint32 size PACKED; - char data[0] LPACKED; + int32 key; + DescType type; + uint32 size; + char data[0]; } inline_key_desc_t; -typedef struct list_header +typedef struct PACKED list_header { /* #### always zero (?) */ - uint32 unknown_1 PACKED; + uint32 unknown_1; /* #### contains an applzone address */ - uint32 unknown_2 PACKED; + uint32 unknown_2; - uint32 param_offset PACKED; + uint32 param_offset; /* contains a tick that identifies the object, either `list' or `reco'; for an apple event, this fiend contains the offset to the parameter section */ - uint32 attribute_count PACKED; + uint32 attribute_count; - uint32 param_count PACKED; + uint32 param_count; /* ### always zero (?) */ - int32 unknown_3 PACKED; + int32 unknown_3; /* offset: 0x18 */ - char data[0] LPACKED; + char data[0]; } list_header_t; typedef struct { list_header_t *p PACKED_P; } hidden_list_header_ptr; @@ -56,31 +56,31 @@ typedef hidden_list_header_ptr *list_header_h; #define PARAM_OFFSET(aggr_desc_h) (CL (PARAM_OFFSET_X (aggr_desc_h))) #define ATTRIBUTE_COUNT(aggr_desc_h) (CL (ATTRIBUTE_COUNT_X (aggr_desc_h))) -typedef struct ae_header +typedef struct PACKED ae_header { /* #### always zero (?) */ - uint32 unknown_1 PACKED; + uint32 unknown_1; /* #### contains unknown values */ - uint32 unknown_2 PACKED; + uint32 unknown_2; - uint32 param_offset PACKED; + uint32 param_offset; - uint32 attribute_count PACKED; - uint32 param_count PACKED; + uint32 attribute_count; + uint32 param_count; /* #### zero pad, use unknown */ - char pad_1[26] LPACKED; + char pad_1[26]; - AEEventClass event_class PACKED; - AEEventID event_id PACKED; + AEEventClass event_class; + AEEventID event_id; /* #### takes on various values, no idea */ - uint32 unknown_3 PACKED; + uint32 unknown_3; /* beginning of target inline descriptor; `target->size' determines target's actual size */ - inline_desc_t target LPACKED; + inline_desc_t target; #if 0 /* for show */ diff --git a/src/include/rsys/cfm.h b/src/include/rsys/cfm.h index a0a67cc..681da61 100644 --- a/src/include/rsys/cfm.h +++ b/src/include/rsys/cfm.h @@ -15,16 +15,16 @@ enum kUnresolvedCFragSymbolAddress = 0 }; -typedef struct +typedef struct PACKED { - uint32 reserved0 PACKED; - uint32 reserved1 PACKED; - uint32 version PACKED; - uint32 reserved2 PACKED; - uint32 reserved3 PACKED; - uint32 reserved4 PACKED; - uint32 reserved5 PACKED; - int32 n_descripts PACKED; + uint32 reserved0; + uint32 reserved1; + uint32 version; + uint32 reserved2; + uint32 reserved3; + uint32 reserved4; + uint32 reserved5; + int32 n_descripts; } cfrg_resource_t; @@ -34,22 +34,22 @@ cfrg_resource_t; #define CFRG_N_DESCRIPTS_X(cfrg) ((cfrg)->n_descripts) #define CFRG_N_DESCRIPTS(cfrg) (CL (CFRG_N_DESCRIPTS_X (cfrg))) -typedef struct +typedef struct PACKED { - OSType isa PACKED; - uint32 update_level PACKED; - uint32 current_version PACKED; - uint32 oldest_definition_version PACKED; - uint32 stack_size PACKED; - int16 appl_library_dir PACKED; - uint8 fragment_type LPACKED; - uint8 fragment_location LPACKED; - int32 offset_to_fragment PACKED; - int32 fragment_length PACKED; - uint32 reserved0 PACKED; - uint32 reserved1 PACKED; - uint16 cfir_length PACKED; - unsigned char name[1] LPACKED; + OSType isa; + uint32 update_level; + uint32 current_version; + uint32 oldest_definition_version; + uint32 stack_size; + int16 appl_library_dir; + uint8 fragment_type; + uint8 fragment_location; + int32 offset_to_fragment; + int32 fragment_length; + uint32 reserved0; + uint32 reserved1; + uint16 cfir_length; + unsigned char name[1]; } cfir_t; @@ -108,53 +108,52 @@ typedef enum } LoadFlags; -typedef struct MemFragment +typedef struct PACKED MemFragment { - Ptr address PACKED; - uint32 length PACKED; - BOOLEAN inPlace LPACKED; + Ptr address; + uint32 length; + BOOLEAN inPlace; } MemFragment; -typedef struct DiskFragment +typedef struct PACKED DiskFragment { - FSSpecPtr fileSpec PACKED; - uint32 offset PACKED; - uint32 length PACKED; + FSSpecPtr fileSpec; + uint32 offset; + uint32 length; } DiskFragment; -typedef struct SegmentedFragment +typedef struct PACKED SegmentedFragment { - FSSpecPtr fileSpec PACKED; - OSType rsrcType PACKED; - INTEGER rsrcID PACKED; + FSSpecPtr fileSpec; + OSType rsrcType; + INTEGER rsrcID; } SegmentedFragment; -typedef struct FragmentLocator +typedef struct PACKED FragmentLocator { - uint32 where PACKED; + uint32 where; union { MemFragment inMem; DiskFragment onDisk; SegmentedFragment inSegs; - } - u LPACKED; + } u; } FragmentLocator; -typedef struct InitBlock +typedef struct PACKED InitBlock { - uint32 contextID PACKED; - uint32 closureID PACKED; - FragmentLocator fragLocator LPACKED; - Ptr libName PACKED; - uint32 reserved4a PACKED; - uint32 reserved4b PACKED; - uint32 reserved4c PACKED; - uint32 reserved4d PACKED; + uint32 contextID; + uint32 closureID; + FragmentLocator fragLocator; + Ptr libName; + uint32 reserved4a; + uint32 reserved4b; + uint32 reserved4c; + uint32 reserved4d; } InitBlock; @@ -183,10 +182,12 @@ typedef struct uint32 length; uint32 ref_count; uint8 perms; + /* TODO: should probably pad this with three bytes and then PACK the entire + structure, but only after verifying that it works that way on a Mac. */ } section_info_t; -typedef struct CFragConnection +typedef struct PACKED CFragConnection { FragmentLocator frag; struct PEFLoaderInfoHeader *lihp; @@ -204,7 +205,7 @@ enum fragNoMem = -2809 }; -typedef struct +typedef struct PACKED { ConnectionID cid; int32 n_symbols; @@ -221,7 +222,7 @@ lib_t; #define LIB_FIRST_SYMBOL_X(l) ((l)->first_symbol) #define LIB_FIRST_SYMBOL(l) (CL (LIB_FIRST_SYMBOL_X (l))) -typedef struct +typedef struct PACKED { uint32 n_libs; lib_t libs[0]; @@ -233,7 +234,7 @@ CFragClosure_t; typedef CFragClosure_t *CFragClosureID; -typedef struct +typedef struct PACKED { const char *symbol_name; void *value; diff --git a/src/include/rsys/cquick.h b/src/include/rsys/cquick.h index 715691d..f0c5358 100644 --- a/src/include/rsys/cquick.h +++ b/src/include/rsys/cquick.h @@ -11,16 +11,15 @@ #define CLEAR_HILITE_BIT() \ (BitClr ((Ptr) &HiliteMode, pHiliteBit)) -typedef struct GrafVars +typedef struct PACKED GrafVars { - RGBColor rgbOpColor LPACKED; - RGBColor rgbHiliteColor LPACKED; + RGBColor rgbOpColor; + RGBColor rgbHiliteColor; Handle pmFgColor PACKED_P; - INTEGER pmFgIndex PACKED; + INTEGER pmFgIndex; Handle pmBkColor PACKED_P; - INTEGER pmBkIndex PACKED; - INTEGER pmFlags PACKED; - + INTEGER pmBkIndex; + INTEGER pmFlags; } GrafVars, *GrafVarsPtr; typedef struct { GrafVarsPtr p PACKED_P; } HIDDEN_GrafVarsPtr, *GrafVarsHandle; diff --git a/src/include/rsys/ctl.h b/src/include/rsys/ctl.h index b8e8da5..17e926d 100644 --- a/src/include/rsys/ctl.h +++ b/src/include/rsys/ctl.h @@ -90,10 +90,10 @@ extern LONGINT ROMlib_ctlcall (ControlHandle c, INTEGER i, LONGINT l); #define POPUP_TITLE_WIDTH(popup) (HxX (popup, title_width)) #define POPUP_FLAGS(popup) (HxX (popup, flags)) -struct popup_data +struct PACKED popup_data { MenuHandle menu PACKED_P; - int16 menu_id PACKED; + int16 menu_id; /* private fields */ int16 title_width; @@ -105,28 +105,28 @@ typedef popup_data_t *popup_data_ptr; typedef struct { popup_data_ptr p PACKED_P; } hidden_popup_data_ptr; typedef hidden_popup_data_ptr *popup_data_handle; -typedef struct { - Rect _tlimit LPACKED; - Rect _tslop LPACKED; - INTEGER _taxis PACKED; +typedef struct PACKED { + Rect _tlimit; + Rect _tslop; + INTEGER _taxis; } thumbstr; -typedef struct { - Rect _crect LPACKED; - INTEGER _cvalue PACKED; - INTEGER _cvisible PACKED; - INTEGER _cmax PACKED; - INTEGER _cmin PACKED; - INTEGER _cprocid PACKED; - LONGINT _crefcon PACKED; - Byte _ctitle LPACKED; +typedef struct PACKED { + Rect _crect; + INTEGER _cvalue; + INTEGER _cvisible; + INTEGER _cmax; + INTEGER _cmin; + INTEGER _cprocid; + LONGINT _crefcon; + Byte _ctitle; } contrlrestype; -struct lsastr +struct PACKED lsastr { - Rect limitRect LPACKED; - Rect slopRect LPACKED; - INTEGER axis PACKED; + Rect limitRect; + Rect slopRect; + INTEGER axis; }; extern BOOLEAN ROMlib_cdef0_is_rectangular; diff --git a/src/include/rsys/dial.h b/src/include/rsys/dial.h index c6eb114..e8eb36a 100644 --- a/src/include/rsys/dial.h +++ b/src/include/rsys/dial.h @@ -1,14 +1,14 @@ #if !defined (__rsys_dial_h__) # define __rsys_dial_h__ -typedef struct +typedef struct PACKED { - int16 count PACKED; + int16 count; Handle h PACKED_P; - Rect r LPACKED; - uint8 type LPACKED; - uint8 len LPACKED; - int16 res_id PACKED; + Rect r; + uint8 type; + uint8 len; + int16 res_id; } icon_item_template_t; #endif /* !defined (__rsys_dial_h__) */ diff --git a/src/include/rsys/emustubs.h b/src/include/rsys/emustubs.h index 509fbc0..e786a72 100644 --- a/src/include/rsys/emustubs.h +++ b/src/include/rsys/emustubs.h @@ -8,40 +8,39 @@ * $Id: emustubs.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct +typedef struct PACKED { - Ptr buffer PACKED; - ProcPtr proc PACKED; - Ptr data PACKED; + Ptr buffer PACKED_P; + ProcPtr proc PACKED_P; + Ptr data PACKED_P; } adbop_t; -typedef struct comm_toolbox_dispatch_args +typedef struct PACKED comm_toolbox_dispatch_args { - int16 selector PACKED; + int16 selector; union + { + struct PACKED { - struct - { - int16 n_items PACKED; - DialogPtr dp PACKED_P; - } shorten_args LPACKED; - struct - { - DITLMethod method PACKED; - Handle new_items_h PACKED_P; - DialogPtr dp PACKED_P; - } append_args LPACKED; - struct - { - DialogPtr dp PACKED_P; - } count_args; - struct - { - QElemPtr qp PACKED_P; - } crm_args; - - } args; + int16 n_items; + DialogPtr dp PACKED_P; + } shorten_args; + struct PACKED + { + DITLMethod method; + Handle new_items_h PACKED_P; + DialogPtr dp PACKED_P; + } append_args; + struct PACKED + { + DialogPtr dp PACKED_P; + } count_args; + struct PACKED + { + QElemPtr qp PACKED_P; + } crm_args; + } args; } comm_toolbox_dispatch_args_t; typedef struct diff --git a/src/include/rsys/file.h b/src/include/rsys/file.h index 99aa389..acd875f 100644 --- a/src/include/rsys/file.h +++ b/src/include/rsys/file.h @@ -24,22 +24,22 @@ extern char *copystr (const char *name); #define SYSMACNAME "\006System" -typedef struct { - LONGINT fd PACKED; - LONGINT offset PACKED; - LONGINT bsize PACKED; - LONGINT maxbytes PACKED; +typedef struct PACKED { + LONGINT fd; + LONGINT offset; + LONGINT bsize; + LONGINT maxbytes; } hfs_access_t; -typedef struct { - LONGINT flags PACKED; - DrvQEl dq LPACKED; - Ptr devicename PACKED; /* "/usr" "/dev/rfd0" whatever */ +typedef struct PACKED { + LONGINT flags; + DrvQEl dq; + Ptr devicename; /* "/usr" "/dev/rfd0" whatever */ #if !defined(__alpha) - char *filler PACKED; + char *filler; #endif - INTEGER partition PACKED; /* for multiply partitioned drives */ - hfs_access_t hfs LPACKED; /* currently only for floppies -- ick */ + INTEGER partition; /* for multiply partitioned drives */ + hfs_access_t hfs; /* currently only for floppies -- ick */ } DrvQExtra; #define OURUFSDREF (-102) @@ -67,41 +67,41 @@ extern boolean_t cd_mounted_by_trickery_p; #define fcfisres (1 << 1) #define fcwriteperm (1 << 0) -typedef struct { - LONGINT fdfnum PACKED; /* LONGINT fcbFlNum */ - Byte fcflags LPACKED; /* Byte fcbMdRByt */ - Byte fcbTypByt LPACKED; - INTEGER fcbSBlk PACKED; - LONGINT fcleof PACKED; /* LONGINT fcbEOF */ - LONGINT fcPLen PACKED; - LONGINT fcbCrPs PACKED; - VCB *fcvptr PACKED_P; /* VCB *fcbVPtr */ - Ptr fcbBfAdr PACKED_P; - INTEGER fcbFlPos PACKED; - LONGINT fcbClmpSize PACKED; - LONGINT fcfd PACKED; /* instead of: LONGINT fcbBTCBPtr PACKED; */ - LONGINT zero[3] PACKED; /* these three fields are fcbExtRec */ - LONGINT fcbFType PACKED; - LONGINT hiddenfd PACKED; /* instead of LONGINT fcbCatPos */ - LONGINT fcparid PACKED; /* LONGINT fcbDirID */ - Byte fcname[32] LPACKED; /* Str31 fcbCName */ +typedef struct PACKED { + LONGINT fdfnum; /* LONGINT fcbFlNum */ + Byte fcflags; /* Byte fcbMdRByt */ + Byte fcbTypByt; + INTEGER fcbSBlk; + LONGINT fcleof; /* LONGINT fcbEOF */ + LONGINT fcPLen; + LONGINT fcbCrPs; + VCB *fcvptr PACKED_P; /* VCB *fcbVPtr */ + Ptr fcbBfAdr PACKED_P; + INTEGER fcbFlPos; + LONGINT fcbClmpSize; + LONGINT fcfd; /* instead of: LONGINT fcbBTCBPtr PACKED; */ + LONGINT zero[3]; /* these three fields are fcbExtRec */ + LONGINT fcbFType; + LONGINT hiddenfd; /* instead of LONGINT fcbCatPos */ + LONGINT fcparid; /* LONGINT fcbDirID */ + Byte fcname[32]; /* Str31 fcbCName */ } fcbrec; #define NFCB 348 /* should be related to NOFILE */ -typedef struct { - INTEGER nbytes PACKED; - fcbrec fc[NFCB] LPACKED; +typedef struct PACKED { + INTEGER nbytes; + fcbrec fc[NFCB]; } fcbhidden; #define ROMlib_fcblocks (((fcbhidden *)MR(FCBSPtr))->fc) -typedef struct { /* add new elements to the beginning of this struct */ - LONGINT magicword PACKED; - FInfo FndrInfo LPACKED; - LONGINT LgLen PACKED; - LONGINT RLgLen PACKED; - LONGINT CrDat PACKED; +typedef struct PACKED { /* add new elements to the beginning of this struct */ + LONGINT magicword; + FInfo FndrInfo; + LONGINT LgLen; + LONGINT RLgLen; + LONGINT CrDat; } hiddeninfo; typedef struct { @@ -213,23 +213,23 @@ typedef struct hashlink_str { char *dirname; } hashlink_t; -typedef struct { - VCB vcb LPACKED; - char *unixname PACKED; +typedef struct PACKED { + VCB vcb; + char *unixname; #if !defined(__alpha) - char *filler PACKED; + char *filler; #endif union { - struct { - LONGINT ino PACKED; - LONGINT nhashentries PACKED; - hashlink_t **hashtable PACKED; + struct PACKED { + LONGINT ino; + LONGINT nhashentries; + hashlink_t **hashtable; #if !defined(__alpha) - char *filler2 PACKED; + char *filler2; #endif - } ufs LPACKED; - hfs_access_t hfs LPACKED; - } u LPACKED; + } ufs; + hfs_access_t hfs; + } u; } VCBExtra; enum @@ -260,14 +260,14 @@ enum bLimitFCBs, }; -typedef struct +typedef struct PACKED { - INTEGER vMVersion PACKED; - ULONGINT vMAttrib PACKED; - LONGINT vMLocalHand PACKED; - LONGINT vMServerAdr PACKED; - LONGINT vMVolumeGrade PACKED; - INTEGER vMForeignPrivID PACKED; + INTEGER vMVersion; + ULONGINT vMAttrib; + LONGINT vMLocalHand; + LONGINT vMServerAdr; + LONGINT vMVolumeGrade; + INTEGER vMForeignPrivID; } getvolparams_info_t; diff --git a/src/include/rsys/filedouble.h b/src/include/rsys/filedouble.h index 5e5e05f..fcbd131 100644 --- a/src/include/rsys/filedouble.h +++ b/src/include/rsys/filedouble.h @@ -27,43 +27,42 @@ typedef enum { Directory_ID } Single_ID; -typedef struct { - ULONGINT id PACKED; - ULONGINT offset PACKED; - ULONGINT length PACKED; +typedef struct PACKED { + ULONGINT id; + ULONGINT offset; + ULONGINT length; } Single_descriptor; -typedef struct { - LONGINT magic PACKED; - LONGINT version PACKED; - LONGINT filler[4] PACKED; - INTEGER nentries PACKED; +typedef struct PACKED { + LONGINT magic; + LONGINT version; + LONGINT filler[4]; + INTEGER nentries; } Single_header; -typedef struct { - LONGINT crdat PACKED; - LONGINT moddat PACKED; - LONGINT backupdat PACKED; - LONGINT accessdat PACKED; +typedef struct PACKED { + LONGINT crdat; + LONGINT moddat; + LONGINT backupdat; + LONGINT accessdat; } Single_dates; -typedef struct { - FInfo finfo LPACKED; - FXInfo fxinfo LPACKED; +typedef struct PACKED { + FInfo finfo; + FXInfo fxinfo; } Single_finfo; typedef ULONGINT Single_attribs; - -typedef struct defaulthead { - Single_header head LPACKED; - Single_descriptor desc[10] LPACKED; /* we use 4, 6 for spare */ +typedef struct PACKED defaulthead { + Single_header head; + Single_descriptor desc[10]; /* we use 4, 6 for spare */ } defaulthead_t; -typedef struct defaultentries { - Single_attribs attribs PACKED; - Single_dates dates LPACKED; - Single_finfo finfo LPACKED; +typedef struct PACKED defaultentries { + Single_attribs attribs; + Single_dates dates; + Single_finfo finfo; } defaultentries_t; #define SINGLEMAGIC 0x0051600 diff --git a/src/include/rsys/float.h b/src/include/rsys/float.h index 2841081..d2097e4 100644 --- a/src/include/rsys/float.h +++ b/src/include/rsys/float.h @@ -54,31 +54,31 @@ typedef double ieee_t; /* 68k 96 bit IEEE FP memory representation. */ #if defined (mc68000) typedef union { - struct { - unsigned short sgn_and_exp PACKED; - unsigned short zero PACKED; - unsigned long long man PACKED; - } fields PACKED; - ieee_t val PACKED; + struct PACKED { + unsigned short sgn_and_exp; + unsigned short zero; + unsigned long long man; + } fields; + ieee_t val; } m68k_x96_t; #endif /* i386 80 bit IEEE FP memory representation. */ #if defined (i386) -typedef struct { - ULONGINT man_lo PACKED; /* Little endian. */ - ULONGINT man_hi PACKED; /* Little endian. */ - unsigned short sgn_and_exp PACKED; /* Little endian. */ +typedef struct PACKED { + ULONGINT man_lo; /* Little endian. */ + ULONGINT man_hi; /* Little endian. */ + unsigned short sgn_and_exp; /* Little endian. */ } i386_x80_t; #endif #if defined(__alpha) -typedef struct { - ULONGINT man_lo PACKED; - ULONGINT man_hi:20 PACKED; - ULONGINT exp:11 PACKED; - ULONGINT sgn:1 PACKED; +typedef struct PACKED { + ULONGINT man_lo; + ULONGINT man_hi:20; + ULONGINT exp:11; + ULONGINT sgn:1; } alpha_x64_t; #endif diff --git a/src/include/rsys/font.h b/src/include/rsys/font.h index e8a61d0..ed6b73b 100644 --- a/src/include/rsys/font.h +++ b/src/include/rsys/font.h @@ -5,15 +5,15 @@ * $Id: font.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct { - INTEGER size PACKED; - INTEGER style PACKED; - INTEGER fontresid PACKED; +typedef struct PACKED { + INTEGER size; + INTEGER style; + INTEGER fontresid; } fatabentry; -typedef struct { - unsigned short style; - INTEGER table[1]; /* actually more */ +typedef struct PACKED { + unsigned short style; + INTEGER table[1]; /* actually more */ } widentry_t; typedef WidthTable *WPtr; diff --git a/src/include/rsys/hfs.h b/src/include/rsys/hfs.h index 4c8ae8f..85fd623 100644 --- a/src/include/rsys/hfs.h +++ b/src/include/rsys/hfs.h @@ -39,42 +39,42 @@ #define MADROFFSET 40 -typedef struct { - unsigned short blockstart PACKED; - unsigned short blockcount PACKED; +typedef struct PACKED { + unsigned short blockstart; + unsigned short blockcount; } xtntdesc, xtntrec[3]; /* WILL NEED Cx() */ -typedef struct { - unsigned short drSigWord PACKED; /* 0 */ - LONGINT drCrDate PACKED; /* 2 */ - LONGINT drLsMod PACKED; /* 6 */ - unsigned short drAtrb PACKED; /* 10 */ - unsigned short drNmFls PACKED; /* 12 */ - unsigned short drVBMSt PACKED; /* 14 */ - unsigned short drAllocPtr PACKED; /* 16 */ - unsigned short drNmAlBlks PACKED; /* 18 */ - LONGINT drAlBlkSiz PACKED; /* 20 */ - LONGINT drClpSiz PACKED; - unsigned short drAlBlSt PACKED; - LONGINT drNxtCNID PACKED; - unsigned short drFreeBks PACKED; - unsigned char drVN[28] LPACKED; - LONGINT drVolBkUp PACKED; - unsigned short drVSeqNum PACKED; - LONGINT drWrCnt PACKED; - LONGINT drXTClpSiz PACKED; - LONGINT drCTClpSiz PACKED; - unsigned short drNmRtDirs PACKED; - LONGINT drFilCnt PACKED; - LONGINT drDirCnt PACKED; - LONGINT drFndrInfo[8] PACKED; - unsigned short drVCSize PACKED; - unsigned short drVCBMSize PACKED; - unsigned short drCtlCSize PACKED; - LONGINT drXTFlSize PACKED; - xtntrec drXTExtRec LPACKED; - LONGINT drCTFlSize PACKED; - xtntrec drCTExtRec LPACKED; +typedef struct PACKED { + unsigned short drSigWord; /* 0 */ + LONGINT drCrDate; /* 2 */ + LONGINT drLsMod; /* 6 */ + unsigned short drAtrb; /* 10 */ + unsigned short drNmFls; /* 12 */ + unsigned short drVBMSt; /* 14 */ + unsigned short drAllocPtr; /* 16 */ + unsigned short drNmAlBlks; /* 18 */ + LONGINT drAlBlkSiz; /* 20 */ + LONGINT drClpSiz; + unsigned short drAlBlSt; + LONGINT drNxtCNID; + unsigned short drFreeBks; + unsigned char drVN[28]; + LONGINT drVolBkUp; + unsigned short drVSeqNum; + LONGINT drWrCnt; + LONGINT drXTClpSiz; + LONGINT drCTClpSiz; + unsigned short drNmRtDirs; + LONGINT drFilCnt; + LONGINT drDirCnt; + LONGINT drFndrInfo[8]; + unsigned short drVCSize; + unsigned short drVCBMSize; + unsigned short drCtlCSize; + LONGINT drXTFlSize; + xtntrec drXTExtRec; + LONGINT drCTFlSize; + xtntrec drCTExtRec; } volumeinfo, *volumeinfoPtr; typedef struct { volumeinfoPtr p PACKED_P; } HIDDEN_volumeinfoPtr; typedef HIDDEN_volumeinfoPtr *volumeinfoHandle; @@ -84,29 +84,29 @@ typedef HIDDEN_volumeinfoPtr *volumeinfoHandle; #define ROUNDUP8(x) ((x+7)/8*8) #define NPHYSREQ(x) ((x+PHYSBSIZE-1)/PHYSBSIZE) -typedef struct { - LONGINT ndFLink PACKED; - LONGINT ndBLink PACKED; - unsigned char ndType LPACKED; - char ndLevel LPACKED; - short ndNRecs PACKED; - unsigned short idunno PACKED; +typedef struct PACKED { + LONGINT ndFLink; + LONGINT ndBLink; + unsigned char ndType; + char ndLevel; + short ndNRecs; + unsigned short idunno; } btnode; typedef enum { indexnode, mapnode = 2, leafnode = 0xFF } btnodetype; -typedef struct { - unsigned char ckrKeyLen LPACKED; - char ckrResrv1 LPACKED; - LONGINT ckrParID PACKED; - unsigned char ckrCName[32] LPACKED; +typedef struct PACKED { + unsigned char ckrKeyLen; + char ckrResrv1; + LONGINT ckrParID; + unsigned char ckrCName[32]; } catkey; -typedef struct { - unsigned char xkrKeyLen LPACKED; - unsigned char xkrFkType LPACKED; - LONGINT xkrFNum PACKED; - unsigned short xkrFABN PACKED; +typedef struct PACKED { + unsigned char xkrKeyLen; + unsigned char xkrFkType; + LONGINT xkrFNum; + unsigned short xkrFABN; } xtntkey; typedef union { @@ -117,53 +117,53 @@ typedef union { #define FILETYPE 2 -typedef struct { - char cdrType LPACKED; - char cdrResrv2 LPACKED; - char filFlags LPACKED; - char filTyp LPACKED; - FInfo filUsrWds LPACKED; /* not sure what form */ - LONGINT filFlNum PACKED; - unsigned short filStBlk PACKED; /* I don't think this is used */ - LONGINT filLgLen PACKED; - LONGINT filPyLen PACKED; - unsigned short filRStBlk PACKED; /* not used? */ - LONGINT filRLgLen PACKED; - LONGINT filRPyLen PACKED; - LONGINT filCrDat PACKED; - LONGINT filMdDat PACKED; - LONGINT filBkDat PACKED; - LONGINT filFndrInfo[4] PACKED; - unsigned short filClpSize PACKED; - xtntrec filExtRec LPACKED; - xtntrec filRExtRec LPACKED; - LONGINT filResrv PACKED; +typedef struct PACKED { + char cdrType; + char cdrResrv2; + char filFlags; + char filTyp; + FInfo filUsrWds; /* not sure what form */ + LONGINT filFlNum; + unsigned short filStBlk; /* I don't think this is used */ + LONGINT filLgLen; + LONGINT filPyLen; + unsigned short filRStBlk; /* not used? */ + LONGINT filRLgLen; + LONGINT filRPyLen; + LONGINT filCrDat; + LONGINT filMdDat; + LONGINT filBkDat; + LONGINT filFndrInfo[4]; + unsigned short filClpSize; + xtntrec filExtRec; + xtntrec filRExtRec; + LONGINT filResrv; } filerec; #define DIRTYPE 1 -typedef struct { - char cdrType LPACKED; - char cdrResrv2 LPACKED; - unsigned short dirFlags PACKED; - unsigned short dirVal PACKED; - LONGINT dirDirID PACKED; - LONGINT dirCrDat PACKED; - LONGINT dirMdDat PACKED; - LONGINT dirBkDat PACKED; - LONGINT dirUsrInfo[4] PACKED; - LONGINT dirFndrInfo[4] PACKED; - LONGINT dirResrv[4] PACKED; +typedef struct PACKED { + char cdrType; + char cdrResrv2; + unsigned short dirFlags; + unsigned short dirVal; + LONGINT dirDirID; + LONGINT dirCrDat; + LONGINT dirMdDat; + LONGINT dirBkDat; + LONGINT dirUsrInfo[4]; + LONGINT dirFndrInfo[4]; + LONGINT dirResrv[4]; } directoryrec; #define THREADTYPE 3 -typedef struct { - char cdrType LPACKED; - char cdrResrv2 LPACKED; - char thdResrv[8] LPACKED; - LONGINT thdParID PACKED; - unsigned char thdCName[32] LPACKED; +typedef struct PACKED { + char cdrType; + char cdrResrv2; + char thdResrv[8]; + LONGINT thdParID; + unsigned char thdCName[32]; } threadrec; typedef enum { firstisless = -1, same, firstisgreater } compretval; @@ -176,24 +176,24 @@ typedef compretval (*compfp)(void *first, void *second); #define FLOCKEDBIT (1<<5) #define DIRTYBIT (1<<7) -typedef struct { - LONGINT fcbFlNum PACKED; - Byte fcbMdRByt LPACKED; - Byte fcbTypByt LPACKED; - unsigned short fcbSBlk PACKED; - LONGINT fcbEOF PACKED; - LONGINT fcbPLen PACKED; - LONGINT fcbCrPs PACKED; - HVCB *fcbVPtr PACKED_P; - Ptr fcbBfAdr PACKED_P; - unsigned short fcbFlPos PACKED; - LONGINT fcbClmpSize PACKED; - LONGINT fcbBTCBPtr PACKED; - xtntrec fcbExtRec LPACKED; - LONGINT fcbFType PACKED; - ULONGINT fcbCatPos PACKED; - LONGINT fcbDirID PACKED; - unsigned char fcbCName[32] LPACKED; +typedef struct PACKED { + LONGINT fcbFlNum; + Byte fcbMdRByt; + Byte fcbTypByt; + unsigned short fcbSBlk; + LONGINT fcbEOF; + LONGINT fcbPLen; + LONGINT fcbCrPs; + HVCB *fcbVPtr PACKED_P; + Ptr fcbBfAdr PACKED_P; + unsigned short fcbFlPos; + LONGINT fcbClmpSize; + LONGINT fcbBTCBPtr; + xtntrec fcbExtRec; + LONGINT fcbFType; + ULONGINT fcbCatPos; + LONGINT fcbDirID; + unsigned char fcbCName[32]; } filecontrolblock; enum { datafork, resourcefork = 0xFF }; @@ -209,26 +209,26 @@ typedef enum { reading, writing } accesstype; #define FSOFTLOCKBIT (1<<0) #define FILEFLAGSUSERSETTABLEMASK FSOFTLOCKBIT -typedef struct { - LONGINT flink PACKED; /* 0 */ - LONGINT blink PACKED; /* 4 */ - unsigned char type LPACKED; /* 8 */ - unsigned char dummy LPACKED; /* 9 */ - unsigned short hesthreejim PACKED; /* 10 */ - INTEGER macdisk_uses_it PACKED; /* 12 */ - INTEGER height PACKED; /* 14 */ - LONGINT root PACKED; /* 16 */ - LONGINT numentries PACKED; /* 20 */ - ULONGINT firstleaf PACKED; /* 24 */ - ULONGINT lastleaf PACKED; /* 28 */ - unsigned short btnodesize PACKED; /* 32 */ - unsigned short indexkeylen PACKED; /* 34 */ - LONGINT nnodes PACKED; /* 36 */ - LONGINT nfreenodes PACKED; /* 40 */ - unsigned char reserved[72] LPACKED; /* 44 */ - unsigned char dummy2[132] LPACKED; /* 116 */ - unsigned char map[256] LPACKED; /* 248 */ - LONGINT unknown2[2] PACKED; /* 504 */ +typedef struct PACKED { + LONGINT flink; /* 0 */ + LONGINT blink; /* 4 */ + unsigned char type; /* 8 */ + unsigned char dummy; /* 9 */ + unsigned short hesthreejim; /* 10 */ + INTEGER macdisk_uses_it; /* 12 */ + INTEGER height; /* 14 */ + LONGINT root; /* 16 */ + LONGINT numentries; /* 20 */ + ULONGINT firstleaf; /* 24 */ + ULONGINT lastleaf; /* 28 */ + unsigned short btnodesize; /* 32 */ + unsigned short indexkeylen; /* 34 */ + LONGINT nnodes; /* 36 */ + LONGINT nfreenodes; /* 40 */ + unsigned char reserved[72]; /* 44 */ + unsigned char dummy2[132]; /* 116 */ + unsigned char map[256]; /* 248 */ + LONGINT unknown2[2]; /* 504 */ } btblock0; #define DATAPFROMKEY(p) ((char *)(p) + ((((catkey *)p)->ckrKeyLen + 2) & ~1)) @@ -251,28 +251,28 @@ typedef enum { regular = 1, directory = 2, thread = 4 } filekind; #define PBRETURN(pb, x) return (((ParmBlkPtr) (pb))->ioParam.ioResult = CW(x), (x)) -typedef struct _cacheentry { - struct _cacheentry *flink PACKED_P; - struct _cacheentry *blink PACKED_P; - HVCB *vptr PACKED_P; - LONGINT fileno PACKED; - uint16 refnum PACKED; - ULONGINT physblock PACKED; - ULONGINT logblk PACKED; - unsigned char flags LPACKED; - forktype forktype LPACKED; - char buf[PHYSBSIZE] LPACKED; +typedef struct PACKED _cacheentry { + struct _cacheentry *flink PACKED_P; + struct _cacheentry *blink PACKED_P; + HVCB *vptr PACKED_P; + LONGINT fileno; + uint16 refnum; + ULONGINT physblock; + ULONGINT logblk; + unsigned char flags; + forktype forktype; + char buf[PHYSBSIZE]; } cacheentry; #define CACHEDIRTY (1 << 7) #define CACHEBUSY (1 << 6) #define CACHEFREE (1 << 5) -typedef struct { - cacheentry *flink PACKED_P; - cacheentry *blink PACKED_P; - unsigned short nitems PACKED; - uint16 flags PACKED; +typedef struct PACKED { + cacheentry *flink PACKED_P; + cacheentry *blink PACKED_P; + unsigned short nitems; + uint16 flags; } cachehead; #define NCACHEENTRIES 16 @@ -280,9 +280,9 @@ typedef struct { #define MAXTRAILS 8 typedef struct { - cacheentry *cachep PACKED_P; - unsigned short logbno PACKED; - unsigned short after PACKED; + cacheentry *cachep; + unsigned short logbno; + unsigned short after; } trailentry; /* @@ -303,11 +303,11 @@ typedef struct { trailentry trail[MAXTRAILS]; /* out */ } btparam; -typedef struct { /* from MPW equates */ +typedef struct PACKED { /* from MPW equates */ HVCB *vcbp PACKED_P; - LONGINT dirid PACKED; - LONGINT cathint PACKED; /* ??? */ - LONGINT procid PACKED; + LONGINT dirid; + LONGINT cathint; /* ??? */ + LONGINT procid; } wdentry; #if defined(MAC) diff --git a/src/include/rsys/hfs_plus.h b/src/include/rsys/hfs_plus.h index a22011c..63ea780 100644 --- a/src/include/rsys/hfs_plus.h +++ b/src/include/rsys/hfs_plus.h @@ -24,10 +24,10 @@ typedef unsigned short UniChar; typedef UInt32 HFSCatalogNodeID; #endif -typedef struct HFSUniStr255 +typedef struct PACKED HFSUniStr255 { - UInt16 length PACKED; - UniChar unicode[255] PACKED; + UInt16 length; + UniChar unicode[255]; } HFSUniStr255; @@ -37,53 +37,53 @@ typedef const HFSUniStr255 *ConstHFSUniStr255Param; * May need a set of textEncoding values here */ -typedef struct HFSPlusPermissions +typedef struct PACKED HFSPlusPermissions { - UInt32 ownerID PACKED; - UInt32 groupID PACKED; - UInt32 permissions PACKED; - UInt32 specialDevice PACKED; + UInt32 ownerID; + UInt32 groupID; + UInt32 permissions; + UInt32 specialDevice; } HFSPlusPermissions; -typedef struct HFSPlusExtentDescriptor +typedef struct PACKED HFSPlusExtentDescriptor { - UInt32 startBlock PACKED; - UInt32 blockCount PACKED; + UInt32 startBlock; + UInt32 blockCount; } HFSPlusExtentDescriptor; typedef HFSPlusExtentDescriptor HFSPlusExtentRecord[8]; -typedef struct HFSPlusForkData +typedef struct PACKED HFSPlusForkData { - UInt64 logicalSize PACKED; - UInt32 clumpSize PACKED; - UInt32 totalBlocks PACKED; - HFSPlusExtentRecord extents LPACKED; + UInt64 logicalSize; + UInt32 clumpSize; + UInt32 totalBlocks; + HFSPlusExtentRecord extents; } HFSPlusForkData; -typedef struct HFSPlusVolumeHeader +typedef struct PACKED HFSPlusVolumeHeader { - UInt16 signature PACKED; - UInt16 version PACKED; - UInt32 attributes PACKED; - UInt32 lastMountedVersion PACKED; - UInt32 reserved PACKED; - UInt32 createDate PACKED; - UInt32 modifyDate PACKED; - UInt32 backupDate PACKED; - UInt32 checkedDate PACKED; - UInt32 fileCount PACKED; - UInt32 folderCount PACKED; - UInt32 blockSize PACKED; - UInt32 totalBlocks PACKED; - UInt32 freeBlocks PACKED; - UInt32 nextAllocation PACKED; - UInt32 rsrcClumpSize PACKED; - UInt32 dataClumpSize PACKED; - HFSCatalogNodeID nextCatalogID PACKED; + UInt16 signature; + UInt16 version; + UInt32 attributes; + UInt32 lastMountedVersion; + UInt32 reserved; + UInt32 createDate; + UInt32 modifyDate; + UInt32 backupDate; + UInt32 checkedDate; + UInt32 fileCount; + UInt32 folderCount; + UInt32 blockSize; + UInt32 totalBlocks; + UInt32 freeBlocks; + UInt32 nextAllocation; + UInt32 rsrcClumpSize; + UInt32 dataClumpSize; + HFSCatalogNodeID nextCatalogID; UInt32 writeCount; UInt64 encodingsBitmap; UInt8 finderInfo[32]; @@ -95,117 +95,117 @@ typedef struct HFSPlusVolumeHeader } HFSPlusVolumeHeader; -typedef struct BTNodeDescriptor +typedef struct PACKED BTNodeDescriptor { - UInt32 fLink PACKED; - UInt32 bLink PACKED; - SInt8 kind LPACKED; - UInt8 height LPACKED; - UInt16 numRecords PACKED; - UInt16 reserved PACKED; + UInt32 fLink; + UInt32 bLink; + SInt8 kind; + UInt8 height; + UInt16 numRecords; + UInt16 reserved; } BTNodeDescriptor; -typedef struct BTHeaderRec +typedef struct PACKED BTHeaderRec { - UInt16 treeDepth PACKED; - UInt32 rootNode PACKED; - UInt32 leafRecords PACKED; - UInt32 firstLeafNode PACKED; - UInt32 lastLeafNode PACKED; - UInt16 nodeSize PACKED; - UInt16 maxKeyLength PACKED; - UInt32 totalNodes PACKED; - UInt32 freeNodes PACKED; - UInt16 reserfed1 PACKED; - UInt32 clumpSize PACKED; - UInt8 btreeType LPACKED; - UInt8 reserfed2 LPACKED; - UInt32 attributes PACKED; - UInt32 reserved3[16] PACKED; + UInt16 treeDepth; + UInt32 rootNode; + UInt32 leafRecords; + UInt32 firstLeafNode; + UInt32 lastLeafNode; + UInt16 nodeSize; + UInt16 maxKeyLength; + UInt32 totalNodes; + UInt32 freeNodes; + UInt16 reserfed1; + UInt32 clumpSize; + UInt8 btreeType; + UInt8 reserfed2; + UInt32 attributes; + UInt32 reserved3[16]; } BTHeaderRec; -typedef struct HFSPlusCatalogKey +typedef struct PACKED HFSPlusCatalogKey { - UInt16 keyLength PACKED; - HFSCatalogNodeID parentID PACKED; - HFSUniStr255 nodeName LPACKED; + UInt16 keyLength; + HFSCatalogNodeID parentID; + HFSUniStr255 nodeName; } HFSPlusCatalogKey; -typedef struct HFSPlusCatalogFolder +typedef struct PACKED HFSPlusCatalogFolder { - SInt16 recordType PACKED; - UInt16 flags PACKED; - UInt32 valence PACKED; + SInt16 recordType; + UInt16 flags; + UInt32 valence; HFSCatalogNodeID folderID; - UInt32 createDate PACKED; - UInt32 contentModDate PACKED; - UInt32 attributeModDate PACKED; - UInt32 accessDate PACKED; - UInt32 backupDate PACKED; - HFSPlusPermissions permissions LPACKED; - DInfo userInfo LPACKED; - DXInfo finderInfo LPACKED; - UInt32 textEncoding PACKED; - UInt32 reserved PACKED; + UInt32 createDate; + UInt32 contentModDate; + UInt32 attributeModDate; + UInt32 accessDate; + UInt32 backupDate; + HFSPlusPermissions permissions; + DInfo userInfo; + DXInfo finderInfo; + UInt32 textEncoding; + UInt32 reserved; } HFSPlusCatalogFolder; -typedef struct HFSPlusCatalogFile +typedef struct PACKED HFSPlusCatalogFile { - SInt16 recordType PACKED; - UInt16 flags PACKED; - UInt32 reserved1 PACKED; - HFSCatalogNodeID fileID PACKED; - UInt32 createDate PACKED; - UInt32 contentModDate PACKED; - UInt32 attributeModDate PACKED; - UInt32 accessDate PACKED; - UInt32 backupDate PACKED; - HFSPlusPermissions permissions LPACKED; - FInfo userInfo LPACKED; - FXInfo finderInfo LPACKED; - UInt32 textEncoding PACKED; - UInt32 reserved2 PACKED; - HFSPlusForkData dataFork LPACKED; - HFSPlusForkData resourceFork LPACKED; + SInt16 recordType; + UInt16 flags; + UInt32 reserved1; + HFSCatalogNodeID fileID; + UInt32 createDate; + UInt32 contentModDate; + UInt32 attributeModDate; + UInt32 accessDate; + UInt32 backupDate; + HFSPlusPermissions permissions; + FInfo userInfo; + FXInfo finderInfo; + UInt32 textEncoding; + UInt32 reserved2; + HFSPlusForkData dataFork; + HFSPlusForkData resourceFork; } HFSPlusCatalogFile; -typedef struct HFSPlusCatalogThread +typedef struct PACKED HFSPlusCatalogThread { - SInt16 recordType PACKED; - SInt16 reserved PACKED; - HFSCatalogNodeID parentID PACKED; - HFSUniStr255 nodeName LPACKED; + SInt16 recordType; + SInt16 reserved; + HFSCatalogNodeID parentID; + HFSUniStr255 nodeName; } HFSPlusCatalogThread; -typedef struct HFSPlusExtentKey +typedef struct PACKED HFSPlusExtentKey { - UInt16 keyLength PACKED; - UInt8 forkType LPACKED; - UInt8 pad LPACKED; - HFSCatalogNodeID fileID PACKED; - UInt32 startBlock PACKED; + UInt16 keyLength; + UInt8 forkType; + UInt8 pad; + HFSCatalogNodeID fileID; + UInt32 startBlock; } HFSPlusExtentKey; -typedef struct HFSPlusAttrForkData +typedef struct PACKED HFSPlusAttrForkData { - UInt32 recordType PACKED; - UInt32 reserved PACKED; - HFSPlusForkData theFork LPACKED; + UInt32 recordType; + UInt32 reserved; + HFSPlusForkData theFork; } HFSPlusAttrForkData; -typedef struct HFSPlusAttrExtents +typedef struct PACKED HFSPlusAttrExtents { - UInt32 recordType PACKED; - UInt32 reserved PACKED; - HFSPlusExtentRecord extents LPACKED; + UInt32 recordType; + UInt32 reserved; + HFSPlusExtentRecord extents; } HFSPlusAttrExtents; diff --git a/src/include/rsys/icon.h b/src/include/rsys/icon.h index e8592da..92ca0e3 100644 --- a/src/include/rsys/icon.h +++ b/src/include/rsys/icon.h @@ -8,7 +8,7 @@ to change. I just wanted to paste in the flags field so we can drop a label in there. */ -typedef struct +typedef struct PACKED { Handle icons[N_SUITE_ICONS]; INTEGER label; diff --git a/src/include/rsys/itm.h b/src/include/rsys/itm.h index a7665ef..129723e 100644 --- a/src/include/rsys/itm.h +++ b/src/include/rsys/itm.h @@ -10,11 +10,11 @@ #include "rsys/pstuff.h" -typedef struct { - Handle itmhand PACKED_P; - Rect itmr LPACKED; - unsigned char itmtype LPACKED; - unsigned char itmlen LPACKED; +typedef struct PACKED { + Handle itmhand PACKED_P; + Rect itmr; + unsigned char itmtype; + unsigned char itmlen; } itmstr; typedef itmstr *itmp; @@ -52,47 +52,47 @@ typedef HIDDEN_itmp *itmh; extern void dialog_compute_rect (Rect *dialog_rect, Rect *dst_rect, int position); -typedef struct { - Rect altr LPACKED; - INTEGER altiid PACKED; - INTEGER altstag PACKED; +typedef struct PACKED { + Rect altr; + INTEGER altiid; + INTEGER altstag; } altstr; typedef altstr *altp; typedef struct { altp p PACKED_P; } HIDDEN_altp; typedef HIDDEN_altp *alth; -typedef struct +typedef struct PACKED { - Rect dlgr LPACKED; - INTEGER dlgprocid PACKED; - char dlgvis LPACKED; - char dlgfil1 LPACKED; - char dlggaflag LPACKED; - char dlgfil2 LPACKED; - LONGINT dlgrc PACKED; - INTEGER dlgditl PACKED; - char dlglen LPACKED; + Rect dlgr; + INTEGER dlgprocid; + char dlgvis; + char dlgfil1; + char dlggaflag; + char dlgfil2; + LONGINT dlgrc; + INTEGER dlgditl; + char dlglen; } dlogstr; typedef dlogstr *dlogp; typedef struct { dlogp p PACKED_P; } HIDDEN_dlogp; typedef HIDDEN_dlogp *dlogh; -typedef struct item_style_info +typedef struct PACKED item_style_info { - int16 font PACKED; - Style face LPACKED; - unsigned char filler LPACKED; - int16 size PACKED; - RGBColor foreground LPACKED; - RGBColor background LPACKED; - int16 mode PACKED; + int16 font; + Style face; + unsigned char filler; + int16 size; + RGBColor foreground; + RGBColor background; + int16 mode; } item_style_info_t; -typedef struct item_color_info +typedef struct PACKED item_color_info { - int16 data PACKED; - int16 offset PACKED; + int16 data; + int16 offset; } item_color_info_t; extern itmp ROMlib_dpnotoip (DialogPeek dp, INTEGER itemno, SignedByte *flags); diff --git a/src/include/rsys/keyboard.h b/src/include/rsys/keyboard.h index 4460caa..e68fff8 100644 --- a/src/include/rsys/keyboard.h +++ b/src/include/rsys/keyboard.h @@ -12,16 +12,16 @@ typedef unsigned char raw_key_t; typedef unsigned char virt_key_t; typedef unsigned char modifier_table_number_t; -typedef struct +typedef struct PACKED { - unsigned char to_look_for LPACKED; - unsigned char replacement LPACKED; + unsigned char to_look_for; + unsigned char replacement; } completer_pair_t; -typedef struct +typedef struct PACKED { - INTEGER n_recs PACKED; - completer_pair_t completer_recs[0] LPACKED; /* VARIABLE LENGTH */ + INTEGER n_recs; + completer_pair_t completer_recs[0]; /* VARIABLE LENGTH */ } completer_t; #define COMPLETER_N_RECS_X(p) ((p)->n_recs) @@ -29,13 +29,13 @@ typedef struct #define COMPLETER_N_RECS(p) (CW (COMPLETER_N_RECS_X (p))) -typedef struct +typedef struct PACKED { - modifier_table_number_t table_number LPACKED; - virt_key_t virt_key LPACKED; - completer_t completer LPACKED; /* VARIABLE LENGTH */ - unsigned char filler LPACKED; - unsigned char no_match LPACKED; + modifier_table_number_t table_number; + virt_key_t virt_key; + completer_t completer; /* VARIABLE LENGTH */ + unsigned char filler; + unsigned char no_match; } dead_key_rec_t; #define DEAD_KEY_TABLE_NUMBER_X(p) ((p)->table_number) @@ -53,14 +53,14 @@ typedef struct #define DEAD_KEY_VIRT_KEY(p) (CB (DEAD_KEY_VIRT_KEY_X (p))) #define DEAD_KEY_NO_MATCH(p) (CB (DEAD_KEY_NO_MATCH_X (p))) -typedef struct +typedef struct PACKED { - INTEGER version PACKED; - modifier_table_number_t modifier_table[256] LPACKED; - INTEGER n_tables PACKED; - unsigned char table[0][128] LPACKED; /* VARIABLE LENGTH */ - INTEGER n_dead_key_recs PACKED; - dead_key_rec_t dead_key_recs[0] LPACKED; /* VARIABLE LENGTH */ + INTEGER version; + modifier_table_number_t modifier_table[256]; + INTEGER n_tables; + unsigned char table[0][128]; /* VARIABLE LENGTH */ + INTEGER n_dead_key_recs; + dead_key_rec_t dead_key_recs[0]; /* VARIABLE LENGTH */ } kchr_str, *kchr_ptr_t; typedef struct { kchr_ptr_t p PACKED_P; } HIDDEN_kchr_ptr, *kchr_hand; diff --git a/src/include/rsys/launch.h b/src/include/rsys/launch.h index 918110e..a7b6c92 100644 --- a/src/include/rsys/launch.h +++ b/src/include/rsys/launch.h @@ -23,10 +23,10 @@ typedef enum } launch_failure_t; -typedef struct { - unsigned char c[4] LPACKED; - short loc PACKED; - unsigned char shortname[1] LPACKED; +typedef struct PACKED { + unsigned char c[4]; + int16_t loc; + unsigned char shortname[1]; } vers_t; extern launch_failure_t ROMlib_launch_failure; diff --git a/src/include/rsys/macros.h b/src/include/rsys/macros.h index ef843de..5bd9879 100644 --- a/src/include/rsys/macros.h +++ b/src/include/rsys/macros.h @@ -34,26 +34,13 @@ #if !defined (PACKED) # define PACKED __attribute__((packed)) - -// We used to blindly use PACKED on all members of a structure, but gcc -// now (perhaps starting with 4.3) issues warnings when we do this with -// certain types. LPACKED stands for Legacy Packed and I'm leaving it in -// the code for now, just on the off chance that there's an earlier version -// of gcc where we actually need the __attribute__((packed)) on the members -// that are now causing warnings. -// -// Once testing shows that LPACKED was never needed, someone should remove it. - -# define LPACKED /* legacy packed, gcc 4.3 complains */ #endif #if !defined (PACKED_P) #if !defined (__alpha) #define PACKED_P PACKED -#define LPACKED_P LPACKED #else #define PACKED_P :32 PACKED -#define LPACKED_P :32 LPACKED #endif #endif diff --git a/src/include/rsys/menu.h b/src/include/rsys/menu.h index 6ec7011..5b54bba 100644 --- a/src/include/rsys/menu.h +++ b/src/include/rsys/menu.h @@ -29,12 +29,12 @@ #define MI_TITLE(mi) (HxX (mi, menuTitle)) -typedef struct { - Byte micon LPACKED; - Byte mkeyeq LPACKED; - Byte mmarker LPACKED; - Byte mstyle LPACKED; - Byte mnextlen LPACKED; +typedef struct PACKED { + Byte micon; + Byte mkeyeq; + Byte mmarker; + Byte mstyle; + Byte mnextlen; } mext, *mextp; extern void C_mdef0(INTEGER, MenuHandle, Rect *, Point, INTEGER *); @@ -72,9 +72,9 @@ extern LONGINT ROMlib_menuhelper( MenuHandle mh, Rect *saver, LONGINT where, #define MLMAX 16 -typedef struct { - MenuHandle muhandle PACKED_P; - INTEGER muleft PACKED; +typedef struct PACKED { + MenuHandle muhandle PACKED_P; + INTEGER muleft; } muelem; typedef struct menu_elt @@ -112,24 +112,24 @@ typedef struct menu_elt #define ML_LAST_HMENU_OFFSET(ml) (CW (ML_LAST_HMENU_OFFSET_X (ml))) #define ML_MENU_TITLE_SAVE(ml) (CW (ML_MENU_TITLE_SAVE_X (ml))) -typedef struct menu_list +typedef struct PACKED menu_list { - INTEGER last_menu_offset PACKED; - INTEGER last_right PACKED; - INTEGER mb_res_id PACKED; + INTEGER last_menu_offset; + INTEGER last_right; + INTEGER mb_res_id; /* other stuff... */ char data; } menu_list; typedef menu_list menu_list_ptr; -typedef struct { menu_list_ptr p LPACKED_P; } HIDDEN_menu_list_ptr; +typedef struct { menu_list_ptr p PACKED_P; } HIDDEN_menu_list_ptr; typedef HIDDEN_menu_list_ptr *menu_list_handle; -typedef struct { - INTEGER muoff PACKED; - INTEGER muright PACKED; - INTEGER mufu PACKED; - muelem mulist[MLMAX] LPACKED; /* WILL NEED Cx() */ +typedef struct PACKED { + INTEGER muoff; + INTEGER muright; + INTEGER mufu; + muelem mulist[MLMAX]; /* WILL NEED Cx() */ } menulist; typedef menulist *menulistp; @@ -157,29 +157,29 @@ typedef HIDDEN_menulistp *mlhandle; #define DRAWMENUBAR 0 #define CLEARMENUBAR (-1) -typedef struct { /* from MPW Private.a */ - INTEGER lastMBSave PACKED; /* offset to top most menu saved */ +typedef struct PACKED { /* from MPW Private.a */ + INTEGER lastMBSave; /* offset to top most menu saved */ Handle mbCustomStorage PACKED_P; /* for custom jobs (i.e. we don't use) */ - Rect mbItemRect LPACKED; /* currently chosen menu */ - Byte mbMenuDelay LPACKED; /* MenuDelay from param ram */ - Byte mbMenuDrag LPACKED; /* MenuDrag from param ram */ - INTEGER mbUglyScroll PACKED; /* HMenu flag having to do with scrolling?? */ - INTEGER mbIconState PACKED; /* ??? NMgr icon state */ + Rect mbItemRect; /* currently chosen menu */ + Byte mbMenuDelay; /* MenuDelay from param ram */ + Byte mbMenuDrag; /* MenuDrag from param ram */ + INTEGER mbUglyScroll; /* HMenu flag having to do with scrolling?? */ + INTEGER mbIconState; /* ??? NMgr icon state */ } mbdfheader; typedef mbdfheader *mbdfheaderptr; typedef struct { mbdfheaderptr p PACKED_P; } HIDDEN_mbdfheaderptr; typedef HIDDEN_mbdfheaderptr *mbdfheaderhand; -typedef struct { - Rect mbRectSave LPACKED; /* where it is on screen */ +typedef struct PACKED { + Rect mbRectSave; /* where it is on screen */ Handle mbBitsSave PACKED_P; /* where the bits are */ - INTEGER mbMenuDir PACKED; /* what direction the menu was placed */ - INTEGER mbMLOffset PACKED; /* 6 byte offset into MenuList */ + INTEGER mbMenuDir; /* what direction the menu was placed */ + INTEGER mbMLOffset; /* 6 byte offset into MenuList */ MenuHandle mbMLHandle PACKED_P; /* the handle from MenuList */ - INTEGER mbTopScroll PACKED; /* copy of TopMenuItem */ - INTEGER mbBotScroll PACKED; /* copy of AtMenuBottom */ - LONGINT mbReserved PACKED; /* i dunno */ + INTEGER mbTopScroll; /* copy of TopMenuItem */ + INTEGER mbBotScroll; /* copy of AtMenuBottom */ + LONGINT mbReserved; /* i dunno */ } mbdfentry; #define NMBDFENTRIES 5 @@ -239,7 +239,7 @@ typedef enum { HILITE, RESTORE } highstate; /* menu item icon code */ #define ICON_PAD 4 /* space on either side */ -typedef struct icon_info +typedef struct con_info { /* true if this is a color icon */ int color_icon_p; @@ -252,31 +252,31 @@ typedef struct icon_info } icon_info_t; -typedef struct mct_res +typedef struct PACKED mct_res { int16 n_entries; MCEntry entries[1]; } mct_res_t; -typedef struct { +typedef struct PACKED { INTEGER nmen; INTEGER mrid[1]; } mbartype; -typedef struct { +typedef struct PACKED { muelem *startp; muelem *endp; } startendpairs[2]; -typedef struct +typedef struct PACKED { - int32 lasttick PACKED; - int16 count PACKED; - struct tableentry + int32 lasttick; + int16 count; + struct PACKED tableentry { - int16 top PACKED; - StringPtr name PACKED; - mextp options PACKED; + int16 top; + StringPtr name; + mextp options; } entry[1]; } table, *tablePtr, **tableHandle; diff --git a/src/include/rsys/mixed_mode.h b/src/include/rsys/mixed_mode.h index 136b9e3..57f01b7 100644 --- a/src/include/rsys/mixed_mode.h +++ b/src/include/rsys/mixed_mode.h @@ -30,28 +30,28 @@ enum typedef uint8 RDFlagsType; -typedef struct RoutineRecord +typedef struct PACKED RoutineRecord { - ProcInfoType procInfo PACKED; - uint8 reserved1 LPACKED; - ISAType ISA LPACKED; - RoutineFlagsType routineFlags PACKED; - ProcPtr procDescriptor PACKED; - uint32 reserved2 PACKED; - uint32 selector PACKED; + ProcInfoType procInfo; + uint8 reserved1; + ISAType ISA; + RoutineFlagsType routineFlags; + ProcPtr procDescriptor; + uint32 reserved2; + uint32 selector; } RoutineRecord; -typedef struct RoutineDescriptor +typedef struct PACKED RoutineDescriptor { - uint16 goMixedModeTrap PACKED; - uint8 version LPACKED; - RDFlagsType routineDescriptorFlags LPACKED; - uint32 reserved1 PACKED; - uint8 reserved2 LPACKED; - uint8 selectorInfo LPACKED; - uint16 routineCount PACKED; - RoutineRecord routineRecords[1] LPACKED; + uint16 goMixedModeTrap; + uint8 version; + RDFlagsType routineDescriptorFlags; + uint32 reserved1; + uint8 reserved2; + uint8 selectorInfo; + uint16 routineCount; + RoutineRecord routineRecords[1]; } RoutineDescriptor; diff --git a/src/include/rsys/mman_private.h b/src/include/rsys/mman_private.h index 3d66a83..5ad6995 100644 --- a/src/include/rsys/mman_private.h +++ b/src/include/rsys/mman_private.h @@ -12,7 +12,7 @@ #include "rsys/mman.h" -typedef struct block_header +typedef struct PACKED block_header { /* the bogo new IM books implies (via a picture) that the field order is `location, size, flags'; and it says that the 24bit @@ -27,14 +27,14 @@ typedef struct block_header #endif /* various flags */ - uint8 flags LPACKED; - uint8 master_ptr_flags LPACKED; - uint8 reserved LPACKED; - uint8 size_correction LPACKED; + uint8 flags; + uint8 master_ptr_flags; + uint8 reserved; + uint8 size_correction; - uint32 size PACKED; + uint32 size; - uint32 location_u PACKED; /* sometimes it's a pointer (the zone), + uint32 location_u; /* sometimes it's a pointer (the zone), sometimes it's an offset */ #if defined (MM_RECORD_ALLOCATION_STACK_TRACES) @@ -47,7 +47,7 @@ typedef struct block_header #endif /* data contained in the block */ - uint32 data[0] PACKED; + uint32 data[0]; } block_header_t; #define BLOCK_LOCATION_OFFSET_X(block) ((block)->location_u) @@ -194,10 +194,10 @@ typedef struct zone_info_t; -typedef struct { +typedef struct PACKED { Zone *sp PACKED_P; Ptr lp PACKED_P; - INTEGER mm PACKED; + INTEGER mm; ProcPtr gz PACKED_P; } pblock_t; diff --git a/src/include/rsys/nextprint.h b/src/include/rsys/nextprint.h index 97a67a9..ba63bf4 100644 --- a/src/include/rsys/nextprint.h +++ b/src/include/rsys/nextprint.h @@ -33,46 +33,46 @@ typedef struct { short h; } comPoint; -typedef struct { - char *baseAddr PACKED_P; - short rowBytes PACKED; - comRect bounds PACKED; +typedef struct PACKED { + char *baseAddr PACKED_P; + short rowBytes; + comRect bounds; } comBitMap; -typedef struct { - char *baseAddr PACKED_P; - short rowBytes PACKED; - comRect bounds PACKED; - short pmVersion PACKED; - short packType PACKED; - LONGINT packSize PACKED; - LONGINT hRes PACKED; - LONGINT vRes PACKED; - short pixelType PACKED; - short pixelSize PACKED; - short cmpCount PACKED; - short cmpSize PACKED; - LONGINT planeBytes PACKED; - LONGINT pmTable PACKED; /* really a CTabHandle */ - LONGINT pmReserved PACKED; +typedef struct PACKED { + char *baseAddr PACKED_P; + short rowBytes; + comRect bounds; + short pmVersion; + short packType; + LONGINT packSize; + LONGINT hRes; + LONGINT vRes; + short pixelType; + short pixelSize; + short cmpCount; + short cmpSize; + LONGINT planeBytes; + LONGINT pmTable; /* really a CTabHandle */ + LONGINT pmReserved; } comPixMap; -typedef struct { - short ascent PACKED; - short descent PACKED; - short widMax PACKED; - short leading PACKED; +typedef struct PACKED { + short ascent; + short descent; + short widMax; + short leading; } comFontInfo; -typedef struct { - short polySize PACKED; - comRect polyBBox PACKED; - comPoint polyPoints[1] PACKED; +typedef struct PACKED comPoly { + short polySize; + comRect polyBBox; + comPoint polyPoints[1]; } **comPolyHandle; -typedef struct { - short rgnSize PACKED; - comRect rgnBBox PACKED; +typedef struct PACKED comRgn { + short rgnSize; + comRect rgnBBox; } **comRgnHandle; typedef enum { @@ -91,33 +91,33 @@ typedef LONGINT comFixed; typedef unsigned char comPattern[8]; -typedef struct { - short device PACKED; - comBitMap portBits LPACKED; - comRect portRect PACKED; - comRgnHandle visRgn PACKED_P; - comRgnHandle clipRgn PACKED_P; - comPattern bkPat LPACKED; - comPattern fillPat LPACKED; - comPoint pnLoc PACKED; - comPoint pnSize PACKED; - short pnMode PACKED; - comPattern pnPat LPACKED; - short pnVis PACKED; - short txFont PACKED; - char txFace LPACKED; - char padding LPACKED; - short txMode PACKED; - short txSize PACKED; - comFixed spExtra PACKED; - LONGINT fgColor PACKED; - LONGINT bkColor PACKED; - short colrBit PACKED; - short patStretch PACKED; - comHandle picSave PACKED_P; - comHandle rgnSave PACKED_P; - comHandle polySave PACKED_P; - comPtr grafProcs PACKED_P; +typedef struct PACKED { + short device; + comBitMap portBits; + comRect portRect; + comRgnHandle visRgn PACKED_P; + comRgnHandle clipRgn PACKED_P; + comPattern bkPat; + comPattern fillPat; + comPoint pnLoc; + comPoint pnSize; + short pnMode; + comPattern pnPat; + short pnVis; + short txFont; + char txFace; + char padding; + short txMode; + short txSize; + comFixed spExtra; + LONGINT fgColor; + LONGINT bkColor; + short colrBit; + short patStretch; + comHandle picSave PACKED_P; + comHandle rgnSave PACKED_P; + comHandle polySave PACKED_P; + comPtr grafProcs PACKED_P; } comGrafPort, *comGrafPtr; extern void NeXTPrArc(LONGINT verb, comRect *r, LONGINT starta, LONGINT arca, diff --git a/src/include/rsys/partition.h b/src/include/rsys/partition.h index 01ce7df..6f8bb83 100644 --- a/src/include/rsys/partition.h +++ b/src/include/rsys/partition.h @@ -12,26 +12,26 @@ typedef unsigned long ULONGINT; #endif -typedef struct { - unsigned short pmSig PACKED; /* 0x504D == 'PM' */ - unsigned short pmSigPad PACKED; - ULONGINT pmMapBlkCnt PACKED; - ULONGINT pmPyPartStart PACKED; - ULONGINT pmPartBlkCnt PACKED; - unsigned char pmPartName[32] LPACKED; /* NUL terminated */ - unsigned char pmPartType[32] LPACKED; /* NUL terminated */ - ULONGINT pmLgDataStart PACKED; - ULONGINT pmDataCnt PACKED; - ULONGINT pmPartStatus PACKED; - ULONGINT pmLgBootStart PACKED; - ULONGINT pmBootSize PACKED; - ULONGINT pmBootLoad PACKED; - ULONGINT pmBootLoad2 PACKED; - ULONGINT pmBootEntry PACKED; - ULONGINT pmBootEntry2 PACKED; - ULONGINT pmBootCksum PACKED; - unsigned char pmProcessor[16] LPACKED; /* NUL terminated */ - unsigned char bootargs[120] LPACKED; /* IMV-579 says 128 PACKED, but they probably +typedef struct PACKED { + unsigned short pmSig; /* 0x504D == 'PM' */ + unsigned short pmSigPad; + ULONGINT pmMapBlkCnt; + ULONGINT pmPyPartStart; + ULONGINT pmPartBlkCnt; + unsigned char pmPartName[32]; /* NUL terminated */ + unsigned char pmPartType[32]; /* NUL terminated */ + ULONGINT pmLgDataStart; + ULONGINT pmDataCnt; + ULONGINT pmPartStatus; + ULONGINT pmLgBootStart; + ULONGINT pmBootSize; + ULONGINT pmBootLoad; + ULONGINT pmBootLoad2; + ULONGINT pmBootEntry; + ULONGINT pmBootEntry2; + ULONGINT pmBootCksum; + unsigned char pmProcessor[16]; /* NUL terminated */ + unsigned char bootargs[120]; /* IMV-579 says 128, but they probably mean that the total should be 512 */ } partmapentry_t; @@ -40,17 +40,17 @@ typedef struct { #define HFSPARTTYPE "Apple_HFS" -typedef struct { - ULONGINT pdStart PACKED; - ULONGINT pdSize PACKED; - ULONGINT pdFSID PACKED; +typedef struct PACKED { + ULONGINT pdStart; + ULONGINT pdSize; + ULONGINT pdFSID; } oldmapentry_t; #define NOLDENTRIES 42 -typedef struct { - unsigned short pdSig PACKED; /* 0x5453 == 'TS' */ - oldmapentry_t oldmapentry[NOLDENTRIES] LPACKED; +typedef struct PACKED { + unsigned short pdSig; /* 0x5453 == 'TS' */ + oldmapentry_t oldmapentry[NOLDENTRIES]; } oldblock1_t; #define OLDMAPSIG0 'T' diff --git a/src/include/rsys/pef.h b/src/include/rsys/pef.h index 614a0b8..107984d 100644 --- a/src/include/rsys/pef.h +++ b/src/include/rsys/pef.h @@ -10,19 +10,19 @@ * $Id: pef.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct PEFContainerHeader +typedef struct PACKED PEFContainerHeader { - OSType tag1 PACKED; - OSType tag2 PACKED; - OSType architecture PACKED; - uint32 formatVersion PACKED; - uint32 dateTimeStamp PACKED; - uint32 oldDefVersion PACKED; - uint32 oldImpVersion PACKED; - uint32 currentVersion PACKED; - uint16 sectionCount PACKED; - uint16 instSectionCount PACKED; - uint32 reservedA PACKED; + OSType tag1; + OSType tag2; + OSType architecture; + uint32 formatVersion; + uint32 dateTimeStamp; + uint32 oldDefVersion; + uint32 oldImpVersion; + uint32 currentVersion; + uint16 sectionCount; + uint16 instSectionCount; + uint32 reservedA; } PEFContainerHeader_t; @@ -56,18 +56,18 @@ PEFContainerHeader_t; #define PEF_CONTAINER_CURRENT_VERS_X(p) ((p)->currentVersion) #define PEF_CONTAINER_CURRENT_VERS(p) (CL (PEF_CONTAINER_CURRENT_VERS_X(p))) -typedef struct PEFSectionHeader +typedef struct PACKED PEFSectionHeader { - int32 nameOffset PACKED; - uint32 defaultAddress PACKED; - uint32 totalSize PACKED; - uint32 unpackedSize PACKED; - uint32 packedSize PACKED; - uint32 containerOffset PACKED; - uint8 sectionKind LPACKED; - uint8 shareKind LPACKED; - uint8 alignment LPACKED; - uint8 reservedA LPACKED; + int32 nameOffset; + uint32 defaultAddress; + uint32 totalSize; + uint32 unpackedSize; + uint32 packedSize; + uint32 containerOffset; + uint8 sectionKind; + uint8 shareKind; + uint8 alignment; + uint8 reservedA; } PEFSectionHeader_t; @@ -90,22 +90,22 @@ PEFSectionHeader_t; #define PEFSH_SHARE_KIND(p) ((p)->shareKind) #define PEFSH_ALIGNMENT(p) (1 << (p)->alignment) -typedef struct PEFLoaderInfoHeader +typedef struct PACKED PEFLoaderInfoHeader { - int32 mainSection PACKED; - uint32 mainOffset PACKED; - int32 initSection PACKED; - uint32 initOffset PACKED; - int32 termSection PACKED; - uint32 termOffset PACKED; - uint32 importedLibraryCount PACKED; - uint32 totalImportedSymbolCount PACKED; - uint32 relocSectionCount PACKED; - uint32 relocInstrOffset PACKED; - uint32 loaderStringsOffset PACKED; - uint32 exportHashOffset PACKED; - uint32 exportHashTablePower PACKED; - uint32 exportedSymbolCount PACKED; + int32 mainSection; + uint32 mainOffset; + int32 initSection; + uint32 initOffset; + int32 termSection; + uint32 termOffset; + uint32 importedLibraryCount; + uint32 totalImportedSymbolCount; + uint32 relocSectionCount; + uint32 relocInstrOffset; + uint32 loaderStringsOffset; + uint32 exportHashOffset; + uint32 exportHashTablePower; + uint32 exportedSymbolCount; } PEFLoaderInfoHeader_t; @@ -151,16 +151,16 @@ PEFLoaderInfoHeader_t; #define PEFLIH_SYMBOL_COUNT_X(p) ((p)->exportedSymbolCount) #define PEFLIH_SYMBOL_COUNT(p) (CL (PEFLIH_SYMBOL_COUNT_X (p))) -typedef struct PEFImportedLibrary +typedef struct PACKED PEFImportedLibrary { - uint32 nameOffset PACKED; - uint32 oldImpVersion PACKED; - uint32 currentVersion PACKED; - uint32 importedSymbolCount PACKED; - uint32 firstImportedSymbol PACKED; - uint8 options LPACKED; - uint8 reservedA LPACKED; - uint16 reservedB PACKED; + uint32 nameOffset; + uint32 oldImpVersion; + uint32 currentVersion; + uint32 importedSymbolCount; + uint32 firstImportedSymbol; + uint8 options; + uint8 reservedA; + uint16 reservedB; } PEFImportedLibrary_t; @@ -171,12 +171,12 @@ PEFImportedLibrary_t; #define PEFIL_FIRST_SYMBOL_X(p) ((p)->firstImportedSymbol) -typedef struct PEFLoaderRelocationHeader +typedef struct PACKED PEFLoaderRelocationHeader { - uint16 sectionIndex PACKED; - uint16 reservedA PACKED; - uint32 relocCount PACKED; - uint32 firstRelocOffset PACKED; + uint16 sectionIndex; + uint16 reservedA; + uint32 relocCount; + uint32 firstRelocOffset; } PEFLoaderRelocationHeader_t; @@ -211,11 +211,11 @@ enum CHAIN_COUNT_MASK = 0x3FFF, }; -typedef struct PEFExportedSymbol +typedef struct PACKED PEFExportedSymbol { - uint32 classAndName PACKED; - uint32 symbolValue PACKED; - int16 sectionIndex PACKED; + uint32 classAndName; + uint32 symbolValue; + int16 sectionIndex; } PEFExportedSymbol; diff --git a/src/include/rsys/picture.h b/src/include/rsys/picture.h index a13fa43..fb2ecda 100644 --- a/src/include/rsys/picture.h +++ b/src/include/rsys/picture.h @@ -53,20 +53,20 @@ * --ctm Sun Aug 2 19:48:35 MDT 1992 */ -typedef struct { +typedef struct PACKED { PicHandle pichandle PACKED_P; /* 0x00 - 0x03 */ - LONGINT picsize PACKED; /* 0x04 - 0x07 */ - LONGINT pichowfar PACKED; /* 0x08 - 0x0B */ + LONGINT picsize; /* 0x04 - 0x07 */ + LONGINT pichowfar; /* 0x08 - 0x0B */ RgnHandle picclip PACKED_P; /* 0x0C - 0x0F */ - Pattern picbkpat LPACKED; /* 0x10 - 0x17 */ - INTEGER picfont PACKED; /* 0x18 - 0x19 */ - Style picface LPACKED; /* 0x1A */ - char picfiller LPACKED; /* 0x1B */ - INTEGER pictxmode PACKED; /* 0x1C - 0x1D */ - INTEGER pictxsize PACKED; /* 0x1E - 0x1F */ - Fixed picspextra PACKED; /* 0x20 - 0x23 */ - Point pictxnum LPACKED; /* 0x24 - 0x27 */ - Point pictxden LPACKED; /* 0x28 - 0x2B */ + Pattern picbkpat; /* 0x10 - 0x17 */ + INTEGER picfont; /* 0x18 - 0x19 */ + Style picface; /* 0x1A */ + char picfiller; /* 0x1B */ + INTEGER pictxmode; /* 0x1C - 0x1D */ + INTEGER pictxsize; /* 0x1E - 0x1F */ + Fixed picspextra; /* 0x20 - 0x23 */ + Point pictxnum; /* 0x24 - 0x27 */ + Point pictxden; /* 0x28 - 0x2B */ /* * NOTE: After doing: @@ -83,19 +83,19 @@ typedef struct { * and pictextpnloc. */ - Point picdrawpnloc LPACKED; /* 0x2C - 0x2F */ - Point pictextpnloc LPACKED; /* 0x30 - 0x33 */ - Point picpnsize LPACKED; /* 0x34 - 0x37 */ - INTEGER picpnmode PACKED; /* 0x38 - 0x39 */ - Pattern picpnpat LPACKED; /* 0x3A - 0x41 */ - Pattern picfillpat LPACKED; /* 0x42 - 0x49 */ - Rect piclastrect LPACKED; /* 0x4A - 0x51 */ - Point picov LPACKED; /* 0x52 - 0x55 */ + Point picdrawpnloc; /* 0x2C - 0x2F */ + Point pictextpnloc; /* 0x30 - 0x33 */ + Point picpnsize; /* 0x34 - 0x37 */ + INTEGER picpnmode; /* 0x38 - 0x39 */ + Pattern picpnpat; /* 0x3A - 0x41 */ + Pattern picfillpat; /* 0x42 - 0x49 */ + Rect piclastrect; /* 0x4A - 0x51 */ + Point picov; /* 0x52 - 0x55 */ - INTEGER picidunno PACKED; /* 0x56 - 0x59 ColorBit ? */ + INTEGER picidunno; /* 0x56 - 0x59 ColorBit ? */ - LONGINT picforeColor PACKED; /* 0x5A - 0x5D */ - LONGINT picbackColor PACKED; /* 0x5E - 0x61 */ + LONGINT picforeColor; /* 0x5A - 0x5D */ + LONGINT picbackColor; /* 0x5E - 0x61 */ } piccache; extern void ROMlib_textpicupdate( Point num, Point den ); diff --git a/src/include/rsys/print.h b/src/include/rsys/print.h index 3f76720..ae29eca 100644 --- a/src/include/rsys/print.h +++ b/src/include/rsys/print.h @@ -80,60 +80,60 @@ extern boolean_t substitute_fonts_p; enum { GetRslData = 4, SetRsl, DraftBits, NoDraftBits, GetRotn }; -typedef struct +typedef struct PACKED { - INTEGER iOpCode PACKED; - INTEGER iError PACKED; - LONGINT lReserved PACKED; + INTEGER iOpCode; + INTEGER iError; + LONGINT lReserved; } TGnlData; -typedef struct +typedef struct PACKED { - INTEGER iMin PACKED; - INTEGER iMax PACKED; + INTEGER iMin; + INTEGER iMax; } TRslRg; -typedef struct +typedef struct PACKED { - INTEGER iXRsl PACKED; - INTEGER iYRsl PACKED; + INTEGER iXRsl; + INTEGER iYRsl; } TRslRec; -typedef struct +typedef struct PACKED { - INTEGER iOpCode PACKED; - INTEGER iError PACKED; - LONGINT lReserved PACKED; - INTEGER iRgType PACKED; - TRslRg xRslRg LPACKED; - TRslRg yRslRg LPACKED; - INTEGER iRslRecCnt PACKED; - TRslRec rgRslRec[27] LPACKED; + INTEGER iOpCode; + INTEGER iError; + LONGINT lReserved; + INTEGER iRgType; + TRslRg xRslRg; + TRslRg yRslRg; + INTEGER iRslRecCnt; + TRslRec rgRslRec[27]; } TGetRslBlk; -typedef struct +typedef struct PACKED { - INTEGER iOpCode PACKED; - INTEGER iError PACKED; - LONGINT lReserved PACKED; - THPrint hPrint PACKED; - INTEGER iXRsl PACKED; - INTEGER iYRsl PACKED; + INTEGER iOpCode; + INTEGER iError; + LONGINT lReserved; + THPrint hPrint; + INTEGER iXRsl; + INTEGER iYRsl; } TSetRslBlk; -typedef struct +typedef struct PACKED { - Byte tJus LPACKED; - Byte tFlop LPACKED; - INTEGER tAngle PACKED; - Byte tLine LPACKED; - Byte tCmnt LPACKED; - Fixed tAngleFixed PACKED; + Byte tJus; + Byte tFlop; + INTEGER tAngle; + Byte tLine; + Byte tCmnt; + Fixed tAngleFixed; } TTxtPicRec, *TTxtPicPtr; @@ -165,10 +165,10 @@ enum tFlipVertical = 2, }; -typedef struct +typedef struct PACKED { - Fixed y PACKED; - Fixed x PACKED; + Fixed y; + Fixed x; } TCenterRec, *TCenterRecPtr; diff --git a/src/include/rsys/process.h b/src/include/rsys/process.h index 0a2e141..0ad7a5a 100644 --- a/src/include/rsys/process.h +++ b/src/include/rsys/process.h @@ -1,11 +1,11 @@ #if !defined (__rsys_process_h__) # define __rsys_process_h__ -typedef struct size_resource +typedef struct PACKED size_resource { - int16 flags PACKED; - int32 pref_size PACKED; - int32 min_size PACKED; + int16 flags; + int32 pref_size; + int32 min_size; } size_resource_t; #endif /* !defined (__rsys_process_h__) */ diff --git a/src/include/rsys/quick.h b/src/include/rsys/quick.h index f618ba4..731cae7 100644 --- a/src/include/rsys/quick.h +++ b/src/include/rsys/quick.h @@ -14,11 +14,11 @@ in inline functions below */ #include "rsys/trapglue.h" -typedef struct ccrsr_res +typedef struct PACKED ccrsr_res { - CCrsr crsr LPACKED; - PixMap crsr_map LPACKED; - char data LPACKED; + CCrsr crsr; + PixMap crsr_map; + char data; } ccrsr_res, *ccrsr_res_ptr; extern boolean_t ROMlib_text_output_disabled_p; diff --git a/src/include/rsys/resource.h b/src/include/rsys/resource.h index 9815c4c..43051fe 100644 --- a/src/include/rsys/resource.h +++ b/src/include/rsys/resource.h @@ -15,25 +15,25 @@ extern boolean_t ROMlib_ultima_iii_hack; #endif -typedef struct { - Size rdatoff PACKED; - Size rmapoff PACKED; - Size datlen PACKED; - Size maplen PACKED; +typedef struct PACKED { + Size rdatoff; + Size rmapoff; + Size datlen; + Size maplen; } reshead; -typedef struct { - Byte rsrvsys[112] LPACKED; - Byte rsrvapp[128] LPACKED; +typedef struct PACKED { + Byte rsrvsys[112]; + Byte rsrvapp[128]; } rsrvrec; -typedef struct { - reshead rh LPACKED; - Handle nextmap PACKED_P; - INTEGER resfn PACKED; - INTEGER resfatr PACKED; - INTEGER typoff PACKED; - INTEGER namoff PACKED; +typedef struct PACKED { + reshead rh; + Handle nextmap PACKED_P; + INTEGER resfn; + INTEGER resfatr; + INTEGER typoff; + INTEGER namoff; } resmap; typedef resmap *resmapptr; @@ -52,25 +52,25 @@ typedef HIDDEN_resmapptr *resmaphand; #define MAPLEN(map) Hx(map, rh.maplen) #define MAPLENX(map) ((STARH(map))->rh.maplen) -typedef struct { - ResType rtyp PACKED; - INTEGER nres PACKED; - INTEGER rloff PACKED; +typedef struct PACKED { + ResType rtyp; + INTEGER nres; + INTEGER rloff; } typref; -typedef struct { - INTEGER rid PACKED; - INTEGER noff PACKED; - Byte ratr LPACKED; - Byte doff[3] LPACKED; - Handle rhand PACKED_P; +typedef struct PACKED { + INTEGER rid; + INTEGER noff; + Byte ratr; + Byte doff[3]; + Handle rhand PACKED_P; } resref; -typedef struct { /* empty resource template */ - reshead bhead LPACKED; - rsrvrec bfill LPACKED; - resmap bmap LPACKED; - INTEGER negone PACKED; +typedef struct PACKED { /* empty resource template */ + reshead bhead; + rsrvrec bfill; + resmap bmap; + INTEGER negone; } empty_resource_template_t; @@ -198,18 +198,18 @@ enum COMPRESSED_FLAGS = 0x120801, }; -typedef struct +typedef struct PACKED { - LONGINT compressedResourceTag PACKED; - LONGINT typeFlags PACKED; - LONGINT uncompressedSize PACKED; - uint8 workingBufferFractionalRatio LPACKED; - uint8 expansionBufferSize LPACKED; + LONGINT compressedResourceTag; + LONGINT typeFlags; + LONGINT uncompressedSize; + uint8 workingBufferFractionalRatio; + uint8 expansionBufferSize; INTEGER dcmpID; } dcomp_info_t; -typedef struct { +typedef struct PACKED { LONGINT diskoff; resref *rrptr; } res_sorttype_t; diff --git a/src/include/rsys/screen-dump.h b/src/include/rsys/screen-dump.h index 0df10c7..dbe4a56 100644 --- a/src/include/rsys/screen-dump.h +++ b/src/include/rsys/screen-dump.h @@ -1,26 +1,25 @@ #if !defined (__rsys_screen_dump_h__) # define __rsys_screen_dump_h__ -struct header +struct PACKED header { - int16 byte_order __attribute__ ((packed)); - int16 magic_number __attribute__ ((packed)); - int32 ifd_offset __attribute__ ((packed)); + int16 byte_order; + int16 magic_number; + int32 ifd_offset; }; -struct directory_entry +struct PACKED directory_entry { - int16 tag __attribute__ ((packed)); - int16 type __attribute__ ((packed)); - int32 count __attribute__ ((packed)); - int32 value_offset __attribute__ ((packed)); + int16 tag; + int16 type; + int32 count; + int32 value_offset; }; -struct ifd +struct PACKED ifd { - int16 count __attribute__ ((packed)); - /* gcc 4.3.0 warns if we leave the following packed attribute in */ - struct directory_entry entries[1] /* __attribute__ ((packed)) */; + int16 count; + struct directory_entry entries[1]; }; #endif /* !defined (__rsys_screen_dump_h__) */ diff --git a/src/include/rsys/segment.h b/src/include/rsys/segment.h index 30b93f1..c68d520 100644 --- a/src/include/rsys/segment.h +++ b/src/include/rsys/segment.h @@ -8,13 +8,12 @@ extern char ROMlib_exit; #include -typedef struct { +typedef struct PACKED { INTEGER message; INTEGER count; AppFile files[1]; } finderinfo; - extern int ROMlib_print; extern void flushcache( void ); extern void SFSaveDisk_Update (INTEGER vrefnum, Str255 filename); diff --git a/src/include/rsys/serial.h b/src/include/rsys/serial.h index ac6e994..fe14240 100644 --- a/src/include/rsys/serial.h +++ b/src/include/rsys/serial.h @@ -8,8 +8,8 @@ * $Id: serial.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct { - Ptr p; +typedef struct PACKED{ + Ptr p PACKED_P; INTEGER i; } sersetbuf_t; diff --git a/src/include/rsys/soundopts.h b/src/include/rsys/soundopts.h index 6fa6df8..0d38414 100644 --- a/src/include/rsys/soundopts.h +++ b/src/include/rsys/soundopts.h @@ -51,7 +51,7 @@ typedef uint64 snd_time; typedef LONGINT TimeL; -typedef struct _ModifierStub { +typedef struct PACKED _ModifierStub { struct _ModifierStub *nextStub; ProcPtr code; LONGINT userInfo; diff --git a/src/include/rsys/syserr.h b/src/include/rsys/syserr.h index 389026b..b00af12 100644 --- a/src/include/rsys/syserr.h +++ b/src/include/rsys/syserr.h @@ -14,39 +14,39 @@ typedef struct { INTEGER id2 PACKED, len2 PACKED; - Point point2 LPACKED; - unsigned char str2[52] LPACKED; + Point point2; + unsigned char str2[52]; INTEGER id3 PACKED, len3 PACKED; - Rect rect3 LPACKED; - char icon3[32][4] LPACKED; + Rect rect3; + char icon3[32][4]; INTEGER id4 PACKED, len4 PACKED; - Point point4 LPACKED; - char str4[46] LPACKED; + Point point4; + char str4[46]; INTEGER id5 PACKED, len5 PACKED, num5 PACKED, str5 PACKED; - Rect rect5 LPACKED; + Rect rect5; INTEGER proc5 PACKED, str5b PACKED; - Rect rect5b LPACKED; + Rect rect5b; INTEGER proc5b PACKED; INTEGER id6 PACKED, len6 PACKED; - char str6[4] LPACKED; + char str6[4]; INTEGER id7 PACKED, len7 PACKED; - char str7[6] LPACKED; + char str7[6]; INTEGER id8 PACKED, len8 PACKED; @@ -68,14 +68,14 @@ struct adef { struct tdef { INTEGER id PACKED, alen PACKED; - Point loc LPACKED; - char text[1] LPACKED; /* at least one NUL byte */ + Point loc; + char text[1]; /* at least one NUL byte */ }; struct idef { INTEGER id PACKED, alen PACKED; - Rect loc LPACKED; + Rect loc; LONGINT ike[32] PACKED; }; @@ -92,15 +92,15 @@ struct bdef { nbut PACKED; struct but { INTEGER butstrid PACKED; - Rect butloc LPACKED; + Rect butloc; INTEGER butprocid PACKED; - } buts[1] LPACKED; + } buts[1]; }; struct sdef { INTEGER id PACKED, alen PACKED; - char text[1] LPACKED; + char text[1]; }; #endif /* !defined (__rsys_syserr_h__) */ diff --git a/src/include/rsys/tesave.h b/src/include/rsys/tesave.h index 65cd50a..70f360b 100644 --- a/src/include/rsys/tesave.h +++ b/src/include/rsys/tesave.h @@ -10,30 +10,30 @@ #include "rsys/pstuff.h" -typedef struct +typedef struct PACKED { #if 0 /* TRUE if the save pattern is in _tpat, FALSE if it was placed in _tpixpat */ INTEGER _tinpat; - Pattern _tpat PACKED; + Pattern _tpat; PixPatHandle _tpixpat PACKED_P; - Point _tploc PACKED; - Point _tpsize PACKED; - INTEGER _tpmode PACKED; + Point _tploc; + Point _tpsize; + INTEGER _tpmode; #else - PenState _tpstate LPACKED_P; + PenState _tpstate; #endif GrafPtr _tport PACKED_P; - INTEGER _tpvis PACKED; + INTEGER _tpvis; - INTEGER _tfont PACKED; - INTEGER _tmode PACKED; - INTEGER _tsize PACKED; - Style _tstyle LPACKED; - Byte filler LPACKED; + INTEGER _tfont; + INTEGER _tmode; + INTEGER _tsize; + Style _tstyle; + Byte filler; RgnHandle _tsaveclip PACKED_P; /* ### is tesave mac-visible state? how is color and whatnot really @@ -59,15 +59,15 @@ typedef struct #define GENERIC_ELT_FONT(generic_elt) (CW (GENERIC_ELT_FONT_X (generic_elt))) #define GENERIC_ELT_SIZE(generic_elt) (CW (GENERIC_ELT_SIZE_X (generic_elt))) -typedef struct generic_elt +typedef struct PACKED generic_elt { - int16 Height PACKED; - int16 Ascent PACKED; - int16 Font PACKED; - Style Face LPACKED; - Byte filler LPACKED; - int16 Size PACKED; - RGBColor Color LPACKED; + int16 Height; + int16 Ascent; + int16 Font; + Style Face; + Byte filler; + int16 Size; + RGBColor Color; } generic_elt_t; extern void generic_elt_copy (generic_elt_t *dst, generic_elt_t *src); @@ -125,12 +125,12 @@ extern void ROMlib_teautoloop( TEHandle teh ); extern int16 ROMlib_call_TEDoText (TEPtr tp, int16 first, int16 last, int16 what); -typedef struct { /* from MPW: ToolEqu.a */ +typedef struct PACKED { /* from MPW: ToolEqu.a */ ProcPtr EOLHook PACKED_P; ProcPtr DRAWHook PACKED_P; ProcPtr WIDTHHook PACKED_P; ProcPtr HITTESTHook PACKED_P; - LONGINT flags PACKED; + LONGINT flags; } tehidden; typedef tehidden *tehiddenp; diff --git a/src/include/rsys/toolevent.h b/src/include/rsys/toolevent.h index 13374df..fc20be7 100644 --- a/src/include/rsys/toolevent.h +++ b/src/include/rsys/toolevent.h @@ -8,7 +8,7 @@ * $Id: toolevent.h 63 2004-12-24 18:19:43Z ctm $ */ -typedef struct { +typedef struct PACKED { INTEGER version; INTEGER tableno[256]; INTEGER ntables; diff --git a/src/include/rsys/wind.h b/src/include/rsys/wind.h index aff8a19..93b31f9 100644 --- a/src/include/rsys/wind.h +++ b/src/include/rsys/wind.h @@ -18,15 +18,15 @@ #include "rsys/smash.h" #include "rsys/pstuff.h" -typedef struct { - Rect _wrect LPACKED; - INTEGER _wprocid PACKED; - char _wvisible LPACKED; - char _padding1 LPACKED; - char _wgoaway LPACKED; - char _padding2 LPACKED; - LONGINT _wrefcon PACKED; - Byte _wtitle LPACKED; +typedef struct PACKED { + Rect _wrect; + INTEGER _wprocid; + char _wvisible; + char _padding1; + char _wgoaway; + char _padding2; + LONGINT _wrefcon; + Byte _wtitle; } windrestype; extern LONGINT C_wdef0 (INTEGER, WindowPtr, INTEGER, LONGINT),