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

AROS: Some more 64bit MethodID fixes

Browse Source 
git-svn-id: trunk@36207 -
This commit is contained in:
marcus 2017-05-14 13:43:01 +00:00
parent 67c3fd2276
commit 102fcc5ac6
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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