Amiga,MorphOS: structures fixes, checked again official SDK

git-svn-id: trunk@44105 -

packages/amunits/src/coreunits/agraphics.pas

@@ -371,12 +371,25 @@ type
         DestData : Longint;
 }
 
-    pCopIns = ^tCopIns;
-    tCopIns = record
-        OpCode  : smallint; { 0 = move, 1 = wait }
-        VWaitAddr : smallint; { vertical or horizontal wait position }
-        HWaitData : smallint; { destination Pointer or data to send }
-    end;
+  PCopList = ^TCopList;
+
+  // Copper structures
+  PCopIns = ^TCopIns;
+  TCopIns = record
+    OpCode: smallint; // 0 = move, 1 = wait
+    case SmallInt of
+    0:(
+      NxtList: PCopList;
+      );
+    1:(
+      DestAddr: SmallInt; // destination Pointer
+      DestData: SmallInt; // data to send      
+      );
+    2:(
+      VWaitPos: SmallInt; // vertical wait position
+      HWaitPos: SmallInt; // horizontal wait position      
+      );  
+  end;
 
 { structure of cprlist that points to list that hardware actually executes }
 
@@ -387,7 +400,7 @@ type
         MaxCount : smallint;       { number of long instructions }
     end;
 
-    pCopList = ^tCopList;
+    
     tCopList = record
         Next    : pCopList;     { next block for this copper list }
         _CopList : pCopList;    { system use }
@@ -2183,7 +2196,9 @@ type
         GfxFlags     : WORD;
         VBCounter    : ULONG;
         HashTableSemaphore  : pSignalSemaphore;
-        HWEmul       : Array[0..8] of Pointer;
+        case boolean of
+          true: ( ChunkyToPlanarPtr: PLongWord;);  // HWEmul[0];
+          false: (HWEmul: array[0..8] of PLongWord;);
     end;
 
 const

packages/amunits/src/coreunits/datatypes.pas

@@ -768,8 +768,8 @@ type
                                       compression technique (details to be
                                       released later). }
     ah_Mask: Byte;      // (XOR mode only - plane mask where each bit is set =1 if there is data and =0 if not.)
-    ah_Height: Word;    // (XOR mode only - width and height of the area represented
-    ah_Width: Word;     //   by the BODY to eliminate unnecessary un-changed data)
+    ah_Width: Word;    // (XOR mode only - width and height of the area represented
+    ah_Height: Word;     //   by the BODY to eliminate unnecessary un-changed data)
     ah_Left: SmallInt;  // (XOR mode only - position of rectangular
     ah_Top: SmallInt;   // area representd by the BODY)
     ah_AbsTime: LongWord;  // Timing for a frame relative to the time the first frame was displayed, in jiffies (1/60 sec)

packages/amunits/src/coreunits/exec.pas

@@ -1074,7 +1074,7 @@ tExecBase =  Record
 { ***** V36 Exec additions start here ************************************* }
 
         ex_Pad0           : Word;
-        ex_Reserved0      : ULONG;
+        ex_LaunchPoint    : ULONG;
         ex_RamLibPrivate  : Pointer;
 
         {  The next ULONG contains the system "E" clock frequency,

packages/amunits/src/coreunits/intuition.pas

@@ -2378,7 +2378,7 @@ Const
 
 { these are the definitions for the printer configurations }
     FILENAME_SIZE       = 30;           { Filename size }
-
+    DEVNAME_SIZE        = 16;
     POINTERSIZE         = (1 + 16 + 1) * 2;     { Size of Pointer data buffer }
 
 { These defines are for the default font size.   These actually describe the
@@ -2469,8 +2469,11 @@ Type
                              { lower nibble = (value for Handshake mode) }
         LaceWB          : Byte;         { if workbench is to be interlaced      }
 
-        WorkName        : Array [0..FILENAME_SIZE-1] of Char;
+        Pad             : array[0..11] of Byte;
+        PrtDevName      : array [0..DEVNAME_SIZE-1] of Char;
                                         { temp file for printer         }
+        DefaultPrtUnit: Byte;
+        DefaultSerUnit: Byte;
 
         RowSizeChange   : Shortint;
         ColumnSizeChange : Shortint;

packages/amunits/src/coreunits/locale.pas

@@ -112,7 +112,7 @@ Type
  pLocaleBase = ^tLocaleBase;
  tLocaleBase = record
     lb_LibNode      : tLibrary;
-    lb_SysPatches   : Boolean;   { TRUE if locale installed its patches }
+    lb_SysPatches   : WordBool;   { TRUE if locale installed its patches }
  end;
 
 {***************************************************************************}

packages/amunits/src/otherlibs/cybergraphics.pas

@@ -29,7 +29,7 @@
 }
 
 UNIT CYBERGRAPHICS;
-
+{$packrecords 2}
 INTERFACE
 USES Exec,agraphics,utility;
 

packages/morphunits/src/keymap.pas

@@ -40,16 +40,15 @@ type
     kn_KeyMap: TKeyMap;
   end;
 
-{$PACKRECORDS 4}
   PExtendedKeyMapNode = ^TExtendedKeyMapNode;
   TExtendedKeyMapNode = record
     ekn_Node: TNode;
     ekn_KeyMap: TKeyMap;
+    pad1: Word; 
     ekn_Seglist: BPTR;
     ekn_Resident: PResident;
     ekn_Future0: APTR;        // keep 0 for now
   end;
-{$PACKRECORDS 2}
 
 // the structure of keymap.resource
   PKeyMapResource = ^TKeyMapResource;

packages/morphunits/src/mui.pas

@@ -655,6 +655,7 @@ const
             mri_Window : PWindow;
             mri_RastPort : PRastPort;
             mri_Flags : LongWord;
+            mri_DummyWasTinyFont: PTextFont;
          end;
        pMUI_RenderInfo = ^tMUI_RenderInfo;