paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 08:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

AROS: Change MethodID fields (back) to their original 32-bit (longword) size

Browse Source 
Preparations for the introduction of stack aligned record fields (AROS STACKED
structure members).

MethodID really is 32-bit wide so we need to change those back to their
original size.
This commit is contained in:
magorium 2022-04-25 13:42:52 +02:00 committed by Charlie Balogh
parent aa8fe28a05
commit 1fde206ee6
3 changed files with 224 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/arosunits/src/datatypes.pas
View File

@ -353,14 +353,14 @@ type
// DTM_REMOVEDTOBJECT, DTM_CLEARSELECTED, DTM_COPY, DTM_ABORTPRINT
PdtGeneral = ^TdtGeneral;
TdtGeneral = record
MethodID: PtrUInt;
MethodID: LongWord;
dtg_GInfo: PGadgetInfo;
end;
// DTM_SELECT
PdtSelect = ^TdtSelect;
TdtSelect = record
MethodID: PtrUInt;
MethodID: LongWord;
dts_GInfo: PGadgetInfo;
dts_Select: TRectangle;
end;
@ -368,7 +368,7 @@ type
// DTM_FRAMEBOX
PdtFrameBox = ^TdtFrameBox;
TdtFrameBox = record
MethodID: PtrUInt;
MethodID: LongWord;
dtf_GInfo: PGadgetInfo;
dtf_ContentsInfo: PFrameInfo;
dtf_FrameInfo: PFrameInfo; // Input
@ -379,7 +379,7 @@ type
// DTM_GOTO
PdtGoto = ^TdtGoto;
TdtGoto = record
MethodID: PtrUInt;
MethodID: LongWord;
dtg_GInfo: PGadgetInfo;
dtg_NodeName: STRPTR; // Node to goto
dtg_AttrList: PTagItem; // Additional attributes
@ -388,7 +388,7 @@ type
// DTM_TRIGGER
PdtTrigger = ^TdtTrigger;
TdtTrigger = record
MethodID: PtrUInt;
MethodID: LongWord;
dtt_GInfo: PGadgetInfo;
dtt_Function: LongWord;
dtt_Data: APTR;
@ -437,7 +437,7 @@ type
// DTM_DRAW
PdtDraw = ^TdtDraw;
TdtDraw = record
MethodID: PtrUInt;
MethodID: LongWord;
dtd_RPort: PRastPort;
dtd_Left: LongInt;
dtd_Top: LongInt;
@ -451,14 +451,14 @@ type
// DTM_RELEASERAWINFO
PdtReleaseDrawInfo = ^TdtReleaseDrawInfo;
TdtReleaseDrawInfo = record
MethodID: PtrUInt;
MethodID: LongWord;
dtr_Handle: APTR; // Handle as returned by DTM_OBTAINDRAWINFO
end;
// DTM_WRITE
PdtWrite = ^TdtWrite;
TdtWrite = record
MethodID: PtrUInt;
MethodID: LongWord;
dtw_GInfo: PGadgetInfo; // Gadget information
dtw_FileHandle: BPTR; // File handle to write to
dtw_Mode: LongWord;
@ -589,7 +589,7 @@ const
type
PpdtBlitPixelArray = ^TpdtBlitPixelArray;
TpdtBlitPixelArray = record
MethodID: PtrUInt;
MethodID: LongWord;
pbpa_PixelData: APTR;
pbpa_PixelFormat: LongWord;
pbpa_PixelArrayMod: LongWord;
@ -601,7 +601,7 @@ type
PpdtScale = ^TpdtScale;
TpdtScale = record
MethodID: PtrUInt;
MethodID: LongWord;
ps_NewWidth: LongWord;
ps_NewHeight: LongWord;
ps_Flags: LongWord;
@ -810,7 +810,7 @@ const
type
PadtFrame = ^TadtFrame;
TadtFrame = record
MethodID: PtrUInt;
MethodID: LongWord;
alf_TimeStamp: LongWord;
alf_Frame: LongWord;
alf_Duration: LongWord;
@ -824,7 +824,7 @@ type
PadtNewFormatFrame = ^TadtNewFormatFrame;
TadtNewFormatFrame = record
MethodID: PtrUInt;
MethodID: LongWord;
alf_TimeStamp: LongWord;
alf_Frame: LongWord;
alf_Duration: LongWord;
@ -842,7 +842,7 @@ type
PadtStart = ^tadtStart;
TadtStart = record
MethodID: PtrUInt;
MethodID: LongWord;
asa_Frame: LongWord;
end;

78
packages/arosunits/src/intuition.pas
View File

@ -1733,7 +1733,7 @@ type
packet structure definitions are defined below.}
PMsg = ^TMsg;
TMsg = record
MethodID: PtrUInt;
MethodID: LongWord;
end;
{ Class id strings for Intuition classes.
@ -1784,7 +1784,7 @@ type
// OM_NEW and OM_SET
PopSet = ^TopSet;
TopSet = record
MethodID: PtrUInt;
MethodID: LongWord;
ops_AttrList: PTagItem; // new attributes
ops_GInfo: PGadgetInfo; // always there for gadgets, when SetGadgetAttrs() is used, but will be nil for OM_NEW
end;
@ -1793,7 +1793,7 @@ type
PopGet = ^TopGet;
TopGet = record
MethodID,
opg_AttrID: PtrUInt;
opg_AttrID: LongWord;
opg_Storage: Pointer; // may be other types, but 'int' types are all LongWord
end;
@ -1801,14 +1801,14 @@ type
PopAddTail = ^TopAddTail;
TopAddTail = record
MethodID: PtrUInt;
MethodID: LongWord;
opat_List: PList;
end;
// OM_ADDMEMBER, OM_REMMEMBER
PopMember = ^TopMember;
TopMember = record
MethodID: PtrUInt;
MethodID: LongWord;
opam_Object: PObject_;
end;
TopAddMember = TopMember;
@ -1817,7 +1817,7 @@ type
// OM_NOTIFY, and OM_UPDATE
PopUpdate = ^TopUpdate;
TopUpdate = record
MethodID: PtrUInt;
MethodID: LongWord;
opu_AttrList: PTagItem; // new attributes
opu_GInfo: PGadgetInfo; // non-nil when SetGadgetAttrs OR notification resulting from gadget input occurs.
opu_Flags: LongWord; // defined below (OPUF_*)
@ -2053,7 +2053,7 @@ type
have to test, if you were hit, no matter if you are disabled or not.}
PgpHitTest = ^TgpHitTest;
TgpHitTest = record
MethodID: PtrUInt; // GM_HITEST or GM_HELPTEST
MethodID: LongWord; // GM_HITEST or GM_HELPTEST
gpht_GInfo: PGadgetInfo;
gpht_Mouse: record // These values are relative to the gadget select box for GM_HITTEST. For
x: SmallInt; // GM_HELPTEST they are relative to the bounding box (which is often
@ -2070,7 +2070,7 @@ type
// GM_RENDER This method is invoked to draw the gadget into a rastport.
PgpRender = ^TgpRender;
TgpRender = record
MethodID: PtrUInt; // GM_RENDER
MethodID: LongWord; // GM_RENDER
gpr_GInfo: PGadgetInfo; // gadget context
gpr_RPort: PRastPort; // all ready for use
gpr_Redraw: LongInt; // might be a "highlight pass" (GREDRAW_*)
@ -2090,7 +2090,7 @@ type
same values, as defined below.}
PgpInput = ^TgpInput;
TgpInput = record
MethodID: PtrUInt; // GM_GOACTIVE or GM_HANDLEINPUT
MethodID: LongWord; // GM_GOACTIVE or GM_HANDLEINPUT
gpi_GInfo: PGadgetInfo; // gadget context
gpi_IEvent: PInputEvent; // Pointer to the InputEvent that caused the method to be invoked.
gpi_Termination: Pointer; { Pointer to a variable that is to be set by the gadget class, if
@ -2120,7 +2120,7 @@ type
// GM_GOINACTIVE see GM_GOACTIVE for explanation
PgpGoInactive = ^TgpGoInactive;
TgpGoInactive = record
MethodID: PtrUInt; // GM_GOINACTIVE
MethodID: LongWord; // GM_GOINACTIVE
gpgi_GInfo: PGadgetInfo;
gpgi_Abort: LongWord; { Boolean field to indicate, who wanted the gadget to go inactive. If
this is 1 this method was sent, because intution wants the gadget to
@ -2135,7 +2135,7 @@ type
are not allowed to do any rendering operation during this method!}
PgpLayout = ^TgpLayout;
TgpLayout = record
MethodID: PtrUInt; // GM_LAYOUT
MethodID: LongWord; // GM_LAYOUT
gpl_GInfo: PGadgetInfo;
gpl_Initial: LongWord; {Boolean that indicated, if this method was invoked, when you are added
to a window (True) or if it is called, because the window was resized
@ -2147,7 +2147,7 @@ type
before an object is created. This is AROS specific.}
PgpDomain = ^TgpDomain;
TgpDomain = record
MethodID: PtrUInt; // GM_DOMAIN
MethodID: LongWord; // GM_DOMAIN
gpd_GInfo: PGadgetInfo;
gpd_RPort: PRastPort; // RastPort to calculate dimensions for.
gpd_Which: LONG; // what to calculate (GDOMAIN_*)
@ -2276,7 +2276,7 @@ type
// IM_FRAMEBOX
PimpFrameBox = ^TimpFrameBox;
TimpFrameBox = record
MethodID: PtrUInt;
MethodID: LongWord;
imp_ContentsBox: PIBox; // input: relative box of contents
imp_FrameBox: PIBox; // output: rel. box of encl frame
imp_DrInfo: PDrawInfo; // may be nil
@ -2302,7 +2302,7 @@ type
// IM_DRAW, IM_DRAWFRAME
PimpDraw = ^TimpDraw;
TimpDraw = record
MethodID: PtrUInt;
MethodID: LongWord;
imp_RPort: PRastPort;
imp_Offset: TimpPos;
imp_State: LongWord;
@ -2313,7 +2313,7 @@ type
// IM_ERASE, IM_ERASEFRAME NOTE: This is a subset of TimpDraw
PimpErase = ^TimpErase;
TimpErase = record
MethodID: PtrUInt;
MethodID: LongWord;
imp_RPort: PRastPort;
imp_Offset: TimpPos;
imp_Dimensions: TimpSize; // // Only valid for IM_DRAWFRAME
@ -2322,7 +2322,7 @@ type
// IM_HITTEST, IM_HITFRAME
PimpHitTest = ^TimpHitTest;
TimpHitTest = record
MethodID: PtrUInt;
MethodID: LongWord;
imp_Point: TimpPos;
imp_Dimensions: TimpSize; // only valid for IM_HITFRAME
end;
@ -2560,7 +2560,7 @@ const
type
PmdpGetDefSizeSysImage = ^TmdpGetDefSizeSysImage;
TmdpGetDefSizeSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: ShortInt;
mdp_Dri: PDrawInfo;
mdp_ReferenceFont: PTextFont; // In:
@ -2573,7 +2573,7 @@ type
PmdpDrawSysImage = ^TmdpDrawSysImage;
TmdpDrawSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: ShortInt;
mdp_Dri: PDrawInfo;
mdp_RPort: PRastPort;
@ -2589,7 +2589,7 @@ type
PmdpGetMenuSpaces = ^TmdpGetMenuSpaces;
TmdpGetMenuSpaces = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: ShortInt;
mdp_InnerLeft: LongInt; // Out
mdp_InnerTop: LongInt; // Out
@ -2605,7 +2605,7 @@ type
PmdpDrawBackground = ^TmdpDrawBackground;
TmdpDrawBackground = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: ShortInt;
mdp_RPort: PRastPort;
mdp_X: LongInt;
@ -2623,7 +2623,7 @@ type
PmdpInitMenu = ^TmdpInitMenu;
TmdpInitMenu = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: SmallInt;
mdp_RPort: PRastPort;
mdp_Screen: PScreen;
@ -2638,7 +2638,7 @@ type
PmdpExitMenu = ^TmdpExitMenu;
TmdpExitMenu = record
MethodID: PtrUInt;
MethodID: LongWord;
mdp_TrueColor: ShortInt;
mdp_UserBuffer: IPTR;
end;
@ -2701,14 +2701,14 @@ const
type
PmsGetRootBitMap = ^TmsGetRootBitMap;
TmsGetRootBitMap = record
MethodID: PtrUInt;
MethodID: LongWord;
PixelFormat: LongWord;
Store: ^PBitMap;
end;
PmsQuery3DSupport = ^TmsQuery3DSupport;
TmsQuery3DSupport = record
MethodID: PtrUInt;
MethodID: LongWord;
PixelFormat: LongWord;
Store: PLongWord;
end;
@ -2720,7 +2720,7 @@ const
type
PmsGetDefaultGammaTables = ^TmsGetDefaultGammaTables;
TmsGetDefaultGammaTables = record
MethodID: PtrUInt;
MethodID: LongWord;
Red: PByte; // Optional pointers to 256-byte arrays to fill in
Green: PByte;
Blue: PByte;
@ -2728,14 +2728,14 @@ type
PmsGetDefaultPixelFormat = ^TmsGetDefaultPixelFormat;
TmsGetDefaultPixelFormat = record
MethodID: PtrUInt;
MethodID: LongWord;
Depth: LongWord;
Store: PLongWord;
end;
PmsGetPointerBounds = ^TmsGetPointerBounds;
TmsGetPointerBounds = record
MethodID: PtrUInt;
MethodID: LongWord;
PointerType: LongWord;
Width: PLongWord;
Height: PLongWord;
@ -2763,7 +2763,7 @@ const
type
PsdpGetDefSizeSysImage = ^TsdpGetDefSizeSysImage;
TsdpGetDefSizeSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_Dri: PDrawInfo;
sdp_ReferenceFont: PTextFont; // In:
@ -2777,7 +2777,7 @@ type
PsdpDrawSysImage = ^TsdpDrawSysImage;
TsdpDrawSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_Dri: PDrawInfo;
sdp_RPort: PRastPort;
@ -2793,7 +2793,7 @@ type
PsdpDrawScreenBar = ^TsdpDrawScreenBar;
TsdpDrawScreenBar = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_Dri: PDrawInfo;
sdp_Layer: PLayer;
@ -2805,7 +2805,7 @@ type
PsdpLayoutScreenGadgets = ^TsdpLayoutScreenGadgets;
TsdpLayoutScreenGadgets = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_Dri: PDrawInfo;
sdp_Layer: PLayer;
@ -2816,7 +2816,7 @@ type
PsdpInitScreen = ^TsdpInitScreen;
TsdpInitScreen = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_Dri: PDrawInfo;
sdp_Screen: PScreen;
@ -2836,7 +2836,7 @@ type
PsdpExitScreen = ^TsdpExitScreen;
TsdpExitScreen = record
MethodID: PtrUInt;
MethodID: LongWord;
sdp_TrueColor: ShortInt;
sdp_UserBuffer: IPTR;
end;
@ -2871,7 +2871,7 @@ const
type
PwdpGetDefSizeSysImage = ^TwdpGetDefSizeSysImage;
TwdpGetDefSizeSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_ReferenceFont: PTextFont; // In:
@ -2885,7 +2885,7 @@ type
PwdpDrawSysImage = ^TwdpDrawSysImage;
TwdpDrawSysImage = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_RPort: PRastPort;
@ -2901,7 +2901,7 @@ type
PwdpDrawWinBorder = ^TwdpDrawWinBorder;
TwdpDrawWinBorder = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_Window: PWindow;
@ -2912,7 +2912,7 @@ type
PwdpLayoutBorderGadgets = ^TwdpLayoutBorderGadgets;
TwdpLayoutBorderGadgets = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_Window: PWindow;
@ -2924,7 +2924,7 @@ type
PwdpDrawBorderPropBack = ^TwdpDrawBorderPropBack;
TwdpDrawBorderPropBack = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_Window: PWindow;
@ -2939,7 +2939,7 @@ type
PwdpDrawBorderPropKnob = ^TwdpDrawBorderPropKnob;
TwdpDrawBorderPropKnob = record
MethodID: PtrUInt;
MethodID: LongWord;
wdp_TrueColor: ShortInt;
wdp_Dri: PDrawInfo;
wdp_Window: PWindow;

344
packages/arosunits/src/mui.pas
View File

File diff suppressed because it is too large Load Diff