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

--- Merging r41941 into '.':

Browse Source 
U    packages/morphunits/src/amigados.pas
U    packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r41941 into '.':
 U   .
--- Merging r41942 into '.':
U    packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r41942 into '.':
 G   .
--- Merging r41944 into '.':
U    packages/arosunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41944 into '.':
 G   .
--- Merging r41945 into '.':
U    packages/morphunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41945 into '.':
 G   .
--- Merging r41947 into '.':
U    packages/arosunits/src/intuition.pas
--- Recording mergeinfo for merge of r41947 into '.':
 G   .
--- Merging r41948 into '.':
U    packages/morphunits/src/intuition.pas
--- Recording mergeinfo for merge of r41948 into '.':
 G   .
--- Merging r41953 into '.':
U    packages/morphunits/src/utility.pas
--- Recording mergeinfo for merge of r41953 into '.':
 G   .
--- Merging r41955 into '.':
U    packages/amunits/src/coreunits/agraphics.pas
U    packages/amunits/src/coreunits/clipboard.pas
U    packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r41955 into '.':
 G   .
--- Merging r41956 into '.':
U    packages/arosunits/src/datatypes.pas
U    packages/arosunits/src/locale.pas
U    packages/arosunits/src/serial.pas
U    packages/arosunits/src/workbench.pas
--- Recording mergeinfo for merge of r41956 into '.':
 G   .
--- Merging r41957 into '.':
U    packages/morphunits/src/datatypes.pas
--- Recording mergeinfo for merge of r41957 into '.':
 G   .

# revisions: 41941,41942,41944,41945,41947,41948,41953,41955,41956,41957

git-svn-id: branches/fixes_3_2@41984 -
This commit is contained in:
marco 2019-05-04 15:51:54 +00:00
parent 02c14a51c8
commit c9a68fbdba
16 changed files with 82 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/amunits/src/coreunits/agraphics.pas
View File

@ -134,7 +134,6 @@ type
_p1,
_p2 : Pointer; { system reserved }
reserved : Longint; { system use }
Flags : Longint; { only exists in layer allocation }
end;
pLayer = ^tLayer;
@ -158,7 +157,7 @@ type
cr2,
crnew : pClipRect; { used by dedice }
SuperSaveClipRects : pClipRect; { preallocated cr's }
cliprects : pClipRect; { system use during refresh }
_cliprects : pClipRect; { system use during refresh }
LayerInfo : Pointer; { points to head of the list }
Lock : tSignalSemaphore;
BackFill : pHook;
@ -391,8 +390,8 @@ type
pCopList = ^tCopList;
tCopList = record
Next : pCopList; { next block for this copper list }
CopList : pCopList; { system use }
ViewPort : Pointer; { system use }
_CopList : pCopList; { system use }
_ViewPort : Pointer; { system use }
CopIns : pCopIns; { start of this block }
CopPtr : pCopIns; { intermediate ptr }
CopLStart : psmallint; { mrgcop fills this in for Long Frame}
@ -418,8 +417,8 @@ type
fm0 : array [0..1] of word;
diwstart : array [0..9] of word;
bplcon2 : array [0..1] of word;
sprfix : array [0..(2*8)] of word;
sprstrtup : Array [0..(2*8*2)] of Word;
sprfix : array [0..(2*8-1)] of word;
sprstrtup : Array [0..(2*8*2-1)] of Word;
wait14 : array [0..1] of word;
norm_hblank : array [0..1] of word;
jump : array [0..1] of word;
@ -1147,7 +1146,7 @@ Type
pColorMap = ^tColorMap;
tColorMap = record
Flags : Byte;
CType : Byte; { This is "Type" in C includes }
Type_ : Byte; { This is "Type" in C includes }
Count : Word;
ColorTable : Pointer;
cm_vpe : pViewPortExtra;
@ -1739,7 +1738,7 @@ Type
pQueryHeader = ^tQueryHeader;
tQueryHeader = record
tructID, { datachunk type identifier }
StructID, { datachunk type identifier }
DisplayID, { copy of display record key }
SkipID, { TAG_SKIP -- see tagitems.h }
Length : ULONG; { length of local data in double-longwords }
@ -1878,7 +1877,7 @@ Type
Header : tQueryHeader;
Vec : Pointer;
Data : Pointer;
vi_Type : WORD; { Type in C Includes }
Type_ : WORD; { Type in C Includes }
pad : Array[0..2] of WORD;
reserved : Array[0..1] of ULONG;
end;

2
packages/amunits/src/coreunits/clipboard.pas
View File

@ -13,7 +13,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
{$PACKRECORDS 2}
unit clipboard;
INTERFACE

8
packages/amunits/src/coreunits/intuition.pas
View File

@ -2433,7 +2433,7 @@ Type
ViewInitX,
ViewInitY : smallint; { View initial offset values }
EnableCLI : Boolean; { CLI availability switch }
EnableCLI : WordBool; { CLI availability switch }
{ printer configurations }
PrinterType : Word; { printer type }
@ -3905,8 +3905,8 @@ Type
pSGWork = ^tSGWork;
tSGWork = record
{ set up when gadget is first activated }
Gad : pGadget; { the contestant itself } { Gadget in C-Includes }
StrInfo : pStringInfo; { easy access to sinfo } { StrInfo in C-Includes }
Gadget : pGadget; { the contestant itself } { Gadget in C-Includes }
StringInfo : pStringInfo; { easy access to sinfo } { StrInfo in C-Includes }
WorkBuffer : STRPTR; { intuition's planned result }
PrevBuffer : STRPTR; { what was there before }
Modes : ULONG; { current mode }
@ -3919,7 +3919,7 @@ Type
Actions : ULONG; { what Intuition will do }
LongInt_ : Longint; { temp storage for longint }
GInfo : pGadgetInfo; { see cghooks.h } { GadgetInfo in C-Includes }
GadgetInfo : pGadgetInfo; { see cghooks.h } { GadgetInfo in C-Includes }
EditOp : Word; { from constants below }
END;

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

@ -341,7 +341,7 @@ type
// SYSTEM VARIABLES
NextVSprite: PVSprite; // GEL linked list forward/backward pointers sorted by y,x value
PrevVSprite: PVSprite;
DrawPath: PVSprite; // pointer of overlay drawing
IntVSprite: PVSprite; // pointer of overlay drawing
ClearPath: PVSprite; // pointer for overlay clearing
OldY, OldX: SmallInt; // previous position
// COMMON VARIABLES
@ -564,10 +564,10 @@ type
PShapeHookMsg = ^TShapeHookMsg;
TShapeHookMsg = record
Action: LongInt;
Layer: PLayer;
ActualShape: PRegion;
NewBounds: TRectangle;
OldBounds: TRectangle;
NewShape: PRegion;
OldShape: PRegion;
NewBounds: PRectangle;
OldBounds: PRectangle;
end;
// Hook for getting LA_ShapeHook and getting this Msg
TShapeHookProc = function(Hook: PHook; Layer: PLayer; Msg: PShapeHookMsg): PRegion; cdecl;
@ -990,19 +990,19 @@ type
// Copper structures
PCopIns = ^TCopIns;
TCopIns = record
OpCode : smallint; // 0 = move, 1 = wait
OpCode: smallint; // 0 = move, 1 = wait
case SmallInt of
0:(
NxtList: PCopList;
);
1:(
VWaitPos: SmallInt; // vertical wait position
DestAddr: SmallInt; // destination Pointer
DestData: SmallInt; // data to send
);
2:(
HWaitPos: SmallInt; // horizontal wait position
DestData: SmallInt; // data to send
);
VWaitPos: SmallInt; // vertical wait position
HWaitPos: SmallInt; // horizontal wait position
);
end;
TCopList = record
@ -1994,9 +1994,9 @@ type
VBCounter: ULONG;
HashTableSemaphore: PSignalSemaphore; // Semaphore for hash_table access, private in fact
ChunkyToPlanarPtr: PLongWord; // HWEmul[0];
HWEmul: array[1..8] of PLongWord;
case boolean of
true: ( ChunkyToPlanarPtr: PLongWord;); // HWEmul[0];
false: (HWEmul: array[0..8] of PLongWord;);
end;
type

45
packages/arosunits/src/amigados.pas
View File

@ -848,12 +848,6 @@ type
dl_DiskType: LongInt; // 'DOS', etc
dl_unused: BPTR;
dl_Name: BSTR; // bptr to bcpl name
{$ifdef aros}
{$ifndef AROS_DOS_PACKETS}
dl_Reserved: array[0..5] of IPTR;
dl_AROS: TDosListAROSExt;
{$endif}
{$endif}
end;
{ device structure (same as the DeviceNode structure in filehandler.h) }
@ -874,12 +868,6 @@ type
dvi_GlobVec: BSTR;
{$endif}
dvi_Name: BSTR;
{$ifdef aros}
{$ifndef AROS_DOS_PACKETS}
dvi_Reserved: array[0..5] of IPTR;
dvi_AROS: TDosListAROSExt;
{$endif}
{$endif}
end;
const
@ -1165,12 +1153,6 @@ type
* vector for you.
}
dn_Name: BSTR; { the node name, e.g. '\3','D','F','3' }
{$ifdef aros}
{$ifndef AROS_DOS_PACKETS}
dn_Reserved: array[0..5] of IPTR; // Private extensions Should not be used in user land code.
dn_AROS: TDosListAROSExt;
{$endif}
{$endif}
end;
type
@ -1518,39 +1500,16 @@ type
TDosLibrary = record
dl_lib: TLibrary;
dl_Root: PRootNode; // Pointer to RootNode, described below }
{$ifdef AROS_BINCOMPAT}
dl_GV: APTR; // Pointer to BCPL global vector }
dl_A2: LongInt; // Private register dump of DOS }
dl_A5: LongInt;
dl_A6: LongInt;
{$endif}
dl_Errors: PErrorString; // pointer to array of error msgs
dl_TimeReq: PTimeRequest; // private pointer to timer request
dl_UtilityBase : PLibrary; // private ptr to utility library
dl_IntuitionBase : PLibrary;
{ These were AROS-specific private fields. At the moment they are mostly not used
and are present only for binary compatibility with programs that used dl_Flags
(Directory Opus for example). Do not try to use them in any way!}
{$ifdef aros}
dl_TimerBase: PDevice;
dl_TimerIO: TTimeRequest;
dl_DevInfo: PDosList;
dl_SysBase: PExecBase;
dl_SegList: BPTR;
dl_NulHandler: PDevice;
dl_NulLock: PUnit;
// LDDemon (library loader) private data
dl_LDObjectsListSigSem: TSignalSemaphore;
dl_LDObjectsList: TList;
dl_LDHandler: TInterrupt;
dl_LDDemonPort: PMsgPort;
dl_LDDemonTask: PProcess;
dl_LDReturn: ULONG;
//* AROS-specific and private. Can go away in future.
dl_SYSLock: BPTR;
// The flags are ORed with RootNode^.rn_Flags. See below for definitions.
dl_Flags: ULONG;
{$endif}
end;
const

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

@ -781,8 +781,8 @@ type
TAnimHeader = record
ah_Operation: Byte;
ah_Mask: Byte;
ah_Height: Word;
ah_Width: Word;
ah_Height: Word;
ah_Left: SmallInt;
ah_Top: SmallInt;
ah_AbsTime: LongWord;

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

@ -1471,7 +1471,7 @@ type
ViewInitX,
ViewInitY: SmallInt; // View initial offset values
EnableCLI: LongBool; // CLI availability switch
EnableCLI: WordBool; // CLI availability switch
// printer configurations
PrinterType: Word; // printer type
@ -1663,11 +1663,11 @@ type
Screens are then maintained in a front to back order using Screen.NextScreen }
Flags: LongWord; // see definitions below
{$ifdef AROS_BINCOMPAT}
MouseX,
MouseY: SmallInt; // mouse position relative to View
{$else}
MouseY,
MouseX: SmallInt; // mouse position relative to View
{$else}
MouseX,
MouseY: SmallInt; // mouse position relative to View
{$endif}
Seconds: LongWord; // timestamp of most current input event

1
packages/arosunits/src/locale.pas
View File

@ -12,7 +12,6 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
{$PACKRECORDS 2}
unit locale;

1
packages/arosunits/src/serial.pas
View File

@ -17,7 +17,6 @@
unit serial;
interface
{$PACKRECORDS 2}
uses
exec;

10
packages/arosunits/src/workbench.pas
View File

@ -237,7 +237,7 @@ type
ism_Drawer: BPTR; // Lock on the drawer this object resides in, NULL for Workbench backdrop (devices).
ism_Name: STRPTR; // Name of the object in question.
ism_type: Word; // One of WBDISK, WBDRAWER, WBTOOL, WBPROJECT, WBGARBAGE, WBDEVICE, WBKICK or WBAPPICON.
ism_Selected: LongBool; // TRUE if currently selected, FALSE otherwise.
ism_Selected: WordBool; // TRUE if currently selected, FALSE otherwise.
ism_Tags: PTagItem; // Pointer to the list of tag items passed to ChangeWorkbenchSelectionA().
ism_DrawerWindow: PWindow; // Pointer to the window attached to this icon, if the icon is a drawer-like object.
ism_ParentWindow: PWindow; // Pointer to the window the icon resides in.
@ -536,20 +536,22 @@ type
TWBHandlerMessage = record
wbhm_Message: TMessage; // Standard message structure.
wbhm_type: TWBHM_type; // type of message.
wbhm_Data: record
case integer of
0 :
(
Open: record
OpenName: STRPTR; // Name of the drawer.
Name: STRPTR; // Name of the drawer.
end;
);
1 :
(
Update: record
UpdateName: STRPTR; // Mame of the object.
Updatetype: LongInt; // type of object (WBDRAWER, WBPROJECT, ...).
Name: STRPTR; // Mame of the object.
Type_: LongInt; // type of object (WBDRAWER, WBPROJECT, ...).
end;
);
end;
end;

36
packages/morphunits/src/agraphics.pas
View File

@ -129,7 +129,29 @@ type
_p1,
_p2 : APTR; // system reserved
reserved: LongInt; // system use
Flags : LongInt; // only exists in layer allocation
end;
PLayer_Info = ^TLayer_Info;
TLayer_Info = record
Top_Layer: Player;
check_lp: PLayer;
Obs: PClipRect;
FreeClipRects: PClipRect;
PrivateReserve1: LongInt;
PrivateReserve2: LongInt;
Lock: TSignalSemaphore;
gs_Head: TMinList;
PrivateReserve3: SmallInt;
PrivateReserve4: APTR;
Flags: Word; // LIFLG_SUPPORTS_OFFSCREEN_LAYERS
fatten_count: ShortInt;
LockLayersCount: ShortInt;
PrivateReserve5: SmallInt;
BlankHook: APTR;
LayerInfo_extra: APTR;
end;
@ -275,12 +297,12 @@ type
NxtList: PCopList;
);
1:(
VWaitPos: SmallInt; // vertical wait position
DestAddr: SmallInt; // destination Pointer
DestData: SmallInt; // data to send
);
2:(
VWaitPos: SmallInt; // vertical wait position
HWaitPos: SmallInt; // horizontal wait position
DestData: SmallInt; // data to send
);
end;
@ -288,7 +310,7 @@ type
PCprList = ^TCprList;
TCprList = record
Next: PCprList;
Start: Word; // start of copper list
Start: PWord; // start of copper list
MaxCount: SmallInt; // number of long instructions
end;
@ -1903,9 +1925,9 @@ type
VBCounter: LongWord;
HashTableSemaphore: PSignalSemaphore; // Semaphore for hash_table access, private in fact
ChunkyToPlanarPtr: PLongWord; // HWEmul[0];
HWEmul: array[1..8] of PLongWord;
case boolean of
true: ( ChunkyToPlanarPtr: PLongWord;); // HWEmul[0];
false: (HWEmul: array[0..8] of PLongWord;);
end;
const

4
packages/morphunits/src/amigados.pas
View File

@ -546,7 +546,7 @@ type
PErrorString = ^TErrorString;
TErrorString = packed record
estr_Nums: PLongInt;
estr_Byte: PByte;
estr_Strings: PByte;
end;
type
@ -852,7 +852,7 @@ type
ap_Reserved : ShortInt;
ap_Strlen : SmallInt;
ap_Info : TFileInfoBlock;
ap_Buf : Array[0..0] of Char;
ap_Buf : Array[0..1] of Char;
{ * an_Buf continues * }
);
end;

7
packages/morphunits/src/datatypes.pas
View File

@ -629,6 +629,13 @@ Type
dtd_AttrList : pTagItem; { Additional attributes }
end;
// DTM_RELEASERAWINFO
PdtReleaseDrawInfo = ^TdtReleaseDrawInfo;
TdtReleaseDrawInfo = record
MethodID: PtrUInt;
dtr_Handle: APTR; // Handle as returned by DTM_OBTAINDRAWINFO
end;
{ DTM_WRITE }
pdtWrite = ^tdtWrite;
tdtWrite = record

4
packages/morphunits/src/exec.pas
View File

@ -1071,7 +1071,7 @@ type
lib_Node : TNode;
lib_Flags : Byte;
lib_pad : Byte;
lib_MegSize : Word;
lib_NegSize : Word;
lib_PosSize : Word;
lib_Version : Word;
lib_Revision: Word;
@ -1418,7 +1418,7 @@ type
PortList : TList;
TaskReady : TList;
TaskWait : TList;
SoftInts : Array[0..5] Of TSoftIntList;
SoftInts : Array[0..4] Of TSoftIntList;
LastAlert : Array[0..3] Of LongInt;
VBlankFrequency : Byte;

4
packages/morphunits/src/intuition.pas
View File

@ -1707,7 +1707,7 @@ type
ViewInitX,
ViewInitY: SmallInt; // View initial offset values
EnableCLI: LongBool; // CLI availability switch
EnableCLI: WordBool; // CLI availability switch
// printer configurations
PrinterType: Word; // printer type
@ -2075,8 +2075,6 @@ type
cl_SubclassCount: LongWord; // number of direct subclasses
cl_ObjectCount: LongWord; // number of instances
cl_Flags: LongWord; // Flags (CLF_INLIST)
cl_ObjectSize: LongWord; // cl_InstOffset + cl_InstSize + SizeOf(_Object)
cl_MemoryPool: APTR;
end;
const

4
packages/morphunits/src/utility.pas
View File

@ -140,8 +140,8 @@ const
type
PUtilityBase = ^TUtilityName;
TUtilityName = packed record
PUtilityBase = ^TUtilityBase;
TUtilityBase = packed record
ub_LibNode : TLibrary;
ub_Language: Byte;
ub_Reserved: Byte;