mirror of
https://github.com/ctm/executor.git
synced 2024-06-25 19:29:52 +00:00
Fixed a couple remaining packing issues.
This commit is contained in:
parent
74bc9d82f3
commit
d11309c188
3
TODO
3
TODO
|
@ -1,3 +1,6 @@
|
||||||
|
link with a debugging version of Syn68k and figure out where
|
||||||
|
the Mac OS X PPC port is dieing
|
||||||
|
|
||||||
package up the System Folder and whatnot so that people w/o the
|
package up the System Folder and whatnot so that people w/o the
|
||||||
old executor-aux can run Executor
|
old executor-aux can run Executor
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ char ROMlib_rcsid_emutraptables[] =
|
||||||
|
|
||||||
#include "OSUtil.h"
|
#include "OSUtil.h"
|
||||||
#include "Gestalt.h"
|
#include "Gestalt.h"
|
||||||
|
#include "SysErr.h"
|
||||||
|
|
||||||
#include "rsys/trapglue.h"
|
#include "rsys/trapglue.h"
|
||||||
#include "rsys/ptocflags.h"
|
#include "rsys/ptocflags.h"
|
||||||
|
|
|
@ -43,11 +43,11 @@ typedef struct PACKED comm_toolbox_dispatch_args
|
||||||
} args;
|
} args;
|
||||||
} comm_toolbox_dispatch_args_t;
|
} comm_toolbox_dispatch_args_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct PACKED
|
||||||
{
|
{
|
||||||
void *startPtr PACKED_P;
|
void *startPtr PACKED_P;
|
||||||
void *limitPtr PACKED_P;
|
void *limitPtr PACKED_P;
|
||||||
short cMoreMasters PACKED;
|
short cMoreMasters;
|
||||||
void *pGrowZone PACKED_P;
|
void *pGrowZone PACKED_P;
|
||||||
} initzonehiddenargs_t;
|
} initzonehiddenargs_t;
|
||||||
|
|
||||||
|
|
|
@ -1,106 +1,105 @@
|
||||||
#if !defined (__rsys_syserr_h__)
|
#if !defined (__rsys_syserr_h__)
|
||||||
# define __rsys_syserr_h__
|
# define __rsys_syserr_h__
|
||||||
|
|
||||||
typedef struct {
|
typedef struct PACKED {
|
||||||
INTEGER count PACKED;
|
INTEGER count;
|
||||||
|
|
||||||
INTEGER id1 PACKED,
|
INTEGER id1;
|
||||||
len1 PACKED,
|
INTEGER len1;
|
||||||
prim1 PACKED,
|
INTEGER prim1;
|
||||||
sec1 PACKED,
|
INTEGER sec1;
|
||||||
icon1 PACKED,
|
INTEGER icon1;
|
||||||
proc1 PACKED,
|
INTEGER proc1;
|
||||||
but1 PACKED;
|
INTEGER but1;
|
||||||
|
|
||||||
INTEGER id2 PACKED,
|
INTEGER id2;
|
||||||
len2 PACKED;
|
INTEGER len2;
|
||||||
Point point2;
|
Point point2;
|
||||||
unsigned char str2[52];
|
unsigned char str2[52];
|
||||||
|
|
||||||
INTEGER id3 PACKED,
|
INTEGER id3;
|
||||||
len3 PACKED;
|
INTEGER len3;
|
||||||
|
|
||||||
Rect rect3;
|
Rect rect3;
|
||||||
char icon3[32][4];
|
char icon3[32][4];
|
||||||
|
|
||||||
INTEGER id4 PACKED,
|
INTEGER id4;
|
||||||
len4 PACKED;
|
INTEGER len4;
|
||||||
|
|
||||||
Point point4;
|
Point point4;
|
||||||
char str4[46];
|
char str4[46];
|
||||||
|
|
||||||
INTEGER id5 PACKED,
|
INTEGER id5;
|
||||||
len5 PACKED,
|
INTEGER len5;
|
||||||
num5 PACKED,
|
INTEGER num5;
|
||||||
str5 PACKED;
|
INTEGER str5;
|
||||||
Rect rect5;
|
Rect rect5;
|
||||||
INTEGER proc5 PACKED,
|
INTEGER proc5;
|
||||||
str5b PACKED;
|
INTEGER str5b;
|
||||||
Rect rect5b;
|
Rect rect5b;
|
||||||
INTEGER proc5b PACKED;
|
INTEGER proc5b PACKED;
|
||||||
|
|
||||||
INTEGER id6 PACKED,
|
INTEGER id6;
|
||||||
len6 PACKED;
|
INTEGER len6;
|
||||||
|
|
||||||
char str6[4];
|
char str6[4];
|
||||||
|
|
||||||
INTEGER id7 PACKED,
|
INTEGER id7;
|
||||||
len7 PACKED;
|
INTEGER len7;
|
||||||
char str7[6];
|
char str7[6];
|
||||||
|
|
||||||
INTEGER id8 PACKED,
|
|
||||||
len8 PACKED;
|
|
||||||
void (*func8)(void) PACKED;
|
|
||||||
|
|
||||||
|
INTEGER id8;
|
||||||
|
INTEGER len8;
|
||||||
|
void (*func8)(void) PACKED;
|
||||||
} myalerttab_t;
|
} myalerttab_t;
|
||||||
|
|
||||||
|
|
||||||
struct adef {
|
struct PACKED adef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED,
|
INTEGER alen;
|
||||||
primetextid PACKED,
|
INTEGER primetextid;
|
||||||
secondtextid PACKED,
|
INTEGER secondtextid;
|
||||||
iconid PACKED,
|
INTEGER iconid;
|
||||||
procid PACKED,
|
INTEGER procid;
|
||||||
buttonid PACKED;
|
INTEGER buttonid;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tdef {
|
struct PACKED tdef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED;
|
INTEGER alen;
|
||||||
Point loc;
|
Point loc;
|
||||||
char text[1]; /* at least one NUL byte */
|
char text[1]; /* at least one NUL byte */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct idef {
|
struct PACKED idef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED;
|
INTEGER alen;
|
||||||
Rect loc;
|
Rect loc;
|
||||||
LONGINT ike[32] PACKED;
|
LONGINT ike[32];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pdef {
|
struct PACKED pdef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED;
|
INTEGER alen;
|
||||||
void (*proc)() PACKED;
|
void (*proc)();
|
||||||
/* NOTE: THIS IS NOT THE WAY IT WORKS IN THE M*C */
|
/* NOTE: THIS IS NOT THE WAY IT WORKS IN THE M*C */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct bdef {
|
struct PACKED bdef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED,
|
INTEGER alen;
|
||||||
nbut PACKED;
|
INTEGER nbut;
|
||||||
struct but {
|
struct PACKED but {
|
||||||
INTEGER butstrid PACKED;
|
INTEGER butstrid;
|
||||||
Rect butloc;
|
Rect butloc;
|
||||||
INTEGER butprocid PACKED;
|
INTEGER butprocid;
|
||||||
} buts[1];
|
} buts[1];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sdef {
|
struct PACKED sdef {
|
||||||
INTEGER id PACKED,
|
INTEGER id;
|
||||||
alen PACKED;
|
INTEGER alen;
|
||||||
char text[1];
|
char text[1];
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* !defined (__rsys_syserr_h__) */
|
#endif /* !defined (__rsys_syserr_h__) */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user