Browse Source

AROS: fixed structures and alignment for datatypes,locale,serial and workbench

git-svn-id: trunk@41956 -
marcus 6 years ago
parent
commit
cd3e6a9c73

+ 1 - 1
packages/arosunits/src/datatypes.pas

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

+ 0 - 1
packages/arosunits/src/locale.pas

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

+ 0 - 1
packages/arosunits/src/serial.pas

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

+ 6 - 4
packages/arosunits/src/workbench.pas

@@ -237,7 +237,7 @@ type
     ism_Drawer: BPTR;          // Lock on the drawer this object resides in, NULL for Workbench backdrop (devices).
     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_Name: STRPTR;          // Name of the object in question.
     ism_type: Word;            // One of WBDISK, WBDRAWER, WBTOOL, WBPROJECT, WBGARBAGE, WBDEVICE, WBKICK or WBAPPICON.
     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_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_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.
     ism_ParentWindow: PWindow; // Pointer to the window the icon resides in.
@@ -536,20 +536,22 @@ type
   TWBHandlerMessage = record
   TWBHandlerMessage = record
     wbhm_Message: TMessage; // Standard message structure.
     wbhm_Message: TMessage; // Standard message structure.
     wbhm_type: TWBHM_type;  // type of message.
     wbhm_type: TWBHM_type;  // type of message.
+    wbhm_Data: record
     case integer of
     case integer of
     0 :
     0 :
     (
     (
       Open: record
       Open: record
-        OpenName: STRPTR;   // Name of the drawer.
+        Name: STRPTR;   // Name of the drawer.
       end;
       end;
     );
     );
     1 :
     1 :
     (
     (
       Update: record
       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;
   end;
   end;