Get rid of no longer needed WINE_PACKED define.

dlls/kernel/heap.c

@@ -320,14 +320,17 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPVOID ptr )
  * the output jpeg's > 1 MB if not */
 #define HGLOBAL_STORAGE      8  /* sizeof(HGLOBAL)*2 */
 
+#include "pshpack1.h"
+
 typedef struct __GLOBAL32_INTERN
 {
    WORD         Magic;
-   LPVOID       Pointer WINE_PACKED;
+   LPVOID       Pointer;
    BYTE         Flags;
    BYTE         LockCount;
 } GLOBAL32_INTERN, *PGLOBAL32_INTERN;
 
+#include "poppack.h"
 
 /***********************************************************************
  *           GlobalAlloc   (KERNEL32.@)

dlls/kernel/local16.c

@@ -120,7 +120,7 @@ typedef struct
     WORD hdelta;                /* 18 Delta to expand the handle table */
     WORD expand;                /* 1a Pointer to expand function (unused) */
     WORD pstat;                 /* 1c Pointer to status structure (unused) */
-    FARPROC16 notify WINE_PACKED; /* 1e Pointer to LocalNotify() function */
+    FARPROC16 notify;           /* 1e Pointer to LocalNotify() function */
     WORD lock;                  /* 22 Lock count for the heap */
     WORD extra;                 /* 24 Extra bytes to allocate when expanding */
     WORD minsize;               /* 26 Minimum size of the heap */

dlls/oleaut32/tmarshal.c

@@ -274,6 +274,8 @@ static int _nroffuncs(ITypeInfo *tinfo) {
     /*NOTREACHED*/
 }
 
+#include "pshpack1.h"
+
 typedef struct _TMAsmProxy {
     BYTE	popleax;
     BYTE	pushlval;
@@ -283,7 +285,9 @@ typedef struct _TMAsmProxy {
     DWORD	xcall;
     BYTE	lret;
     WORD	bytestopop;
-} WINE_PACKED TMAsmProxy;
+} TMAsmProxy;
+
+#include "poppack.h"
 
 typedef struct _TMProxyImpl {
     DWORD				*lpvtbl;

dlls/rpcrt4/cproxy.c

@@ -61,16 +61,20 @@ static ICOM_VTABLE(IRpcProxyBuffer) StdProxy_Vtbl;
 
 #if defined(__i386__)
 
+#include "pshpack1.h"
+
 struct StublessThunk {
-  BYTE push WINE_PACKED;
+  BYTE push;
-  DWORD index WINE_PACKED;
+  DWORD index;
-  BYTE call WINE_PACKED;
+  BYTE call;
-  LONG handler WINE_PACKED;
+  LONG handler;
-  BYTE ret WINE_PACKED;
+  BYTE ret;
-  WORD bytes WINE_PACKED;
+  WORD bytes;
   BYTE pad[3];
 };
 
+#include "poppack.h"
+
 /* adjust the stack size since we don't use Windows's method */
 #define STACK_ADJUST sizeof(DWORD)
 
@@ -318,4 +322,3 @@ ULONG WINAPI IUnknown_Release_Proxy(LPUNKNOWN iface)
   return IUnknown_Release(This->pUnkOuter);
 #endif
 }
-

dlls/winedos/module.c

@@ -80,11 +80,13 @@ BOOL DOSVM_IsWin16(void)
 
 /* structures for EXEC */
 
+#include "pshpack1.h"
+
 typedef struct {
   WORD env_seg;
-  DWORD cmdline WINE_PACKED;
+  DWORD cmdline;
-  DWORD fcb1 WINE_PACKED;
+  DWORD fcb1;
-  DWORD fcb2 WINE_PACKED;
+  DWORD fcb2;
   WORD init_sp;
   WORD init_ss;
   WORD init_ip;
@@ -96,6 +98,8 @@ typedef struct {
   WORD rel_seg;
 } OverlayBlock;
 
+#include "poppack.h"
+
 /* global variables */
 
 pid_t dosvm_pid;

dlls/winedos/xms.c

@@ -35,16 +35,20 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(int31);
 
+#include "pshpack1.h"
+
 typedef struct {
  WORD Handle;
  DWORD Offset;
-} WINE_PACKED MOVEOFS;
+} MOVEOFS;
 
 typedef struct {
  DWORD Length;
  MOVEOFS Source;
  MOVEOFS Dest;
-} WINE_PACKED MOVESTRUCT;
+} MOVESTRUCT;
+
+#include "poppack.h"
 
 static BYTE * XMS_Offset( MOVEOFS *ofs )
 {

include/cursoricon.h

@@ -55,7 +55,7 @@ typedef struct
     WORD                idReserved;
     WORD                idType;
     WORD                idCount;
-    CURSORICONDIRENTRY  idEntries[1] WINE_PACKED;
+    CURSORICONDIRENTRY  idEntries[1];
 } CURSORICONDIR;
 
 typedef struct {

include/miscemu.h

@@ -40,8 +40,8 @@ typedef struct
     WORD  Lpt4Addr;                  /* 0e: LPT4 I/O address */
     WORD  InstalledHardware;         /* 10: Installed hardware flags */
     BYTE  POSTstatus;                /* 12: Power-On Self Test status */
-    WORD  MemSize WINE_PACKED;       /* 13: Base memory size in Kb */
+    WORD  MemSize;                   /* 13: Base memory size in Kb */
-    WORD  unused1 WINE_PACKED;       /* 15: Manufacturing test scratch pad */
+    WORD  unused1;                   /* 15: Manufacturing test scratch pad */
     BYTE  KbdFlags1;                 /* 17: Keyboard flags 1 */
     BYTE  KbdFlags2;                 /* 18: Keyboard flags 2 */
     BYTE  unused2;                   /* 19: Keyboard driver workspace */
@@ -60,10 +60,10 @@ typedef struct
     BYTE  VideoCursorPos[16];        /* 50: Cursor position for 8 pages, column/row order */
     WORD  VideoCursorType;           /* 60: Video cursor type */
     BYTE  VideoCurPage;              /* 62: Video current page */
-    WORD  VideoCtrlAddr WINE_PACKED; /* 63: Video controller address */
+    WORD  VideoCtrlAddr;             /* 63: Video controller address */
     BYTE  VideoReg1;                 /* 65: Video mode select register */
     BYTE  VideoReg2;                 /* 66: Video CGA palette register */
-    DWORD ResetEntry WINE_PACKED;    /* 67: Warm reset entry point */
+    DWORD ResetEntry;                /* 67: Warm reset entry point */
     BYTE  LastIRQ;                   /* 6b: Last unexpected interrupt */
     DWORD Ticks;                     /* 6c: Ticks since midnight */
     BYTE  TicksOverflow;             /* 70: Timer overflow if past midnight */
@@ -78,7 +78,7 @@ typedef struct
     WORD  KbdBufferStart;            /* 80: Keyboard buffer start */
     WORD  KbdBufferEnd;              /* 82: Keyboard buffer end */
     BYTE  RowsOnScreenMinus1;        /* 84: EGA only */
-    WORD  BytesPerChar WINE_PACKED;  /* 85: EGA only */
+    WORD  BytesPerChar;              /* 85: EGA only */
     BYTE  ModeOptions;               /* 87: EGA only */
     BYTE  FeatureBitsSwitches;       /* 88: EGA only */
     BYTE  VGASettings;               /* 89: VGA misc settings */

include/module.h

@@ -29,6 +29,8 @@
 #include <wine/winbase16.h>
 #include <winternl.h>
 
+#include <pshpack1.h>
+
   /* In-memory module structure. See 'Windows Internals' p. 219 */
 typedef struct _NE_MODULE
 {
@@ -77,7 +79,7 @@ typedef struct {
     BYTE type;
     BYTE flags;
     BYTE segnum;
-    WORD offs WINE_PACKED;
+    WORD offs;
 } ET_ENTRY;
 
 typedef struct {
@@ -117,6 +119,8 @@ typedef struct _THHOOK
 
 extern THHOOK *pThhook;
 
+#include <poppack.h>
+
 /* Resource types */
 
 #define NE_SEG_TABLE(pModule) \

include/wine/winbase16.h

@@ -148,21 +148,21 @@ typedef struct _SEGINFO {
 /* Parameters for LoadModule() */
 typedef struct
 {
-    HGLOBAL16 hEnvironment;         /* Environment segment */
+    HGLOBAL16 hEnvironment; /* Environment segment */
-    SEGPTR    cmdLine WINE_PACKED;  /* Command-line */
+    SEGPTR    cmdLine;      /* Command-line */
-    SEGPTR    showCmd WINE_PACKED;  /* Code for ShowWindow() */
+    SEGPTR    showCmd;      /* Code for ShowWindow() */
-    SEGPTR    reserved WINE_PACKED;
+    SEGPTR    reserved;
 } LOADPARAMS16;
 
 /* Debugging support (DEBUG SYSTEM ONLY) */
 typedef struct
 {
     WORD    flags;
-    DWORD   dwOptions WINE_PACKED;
+    DWORD   dwOptions;
-    DWORD   dwFilter WINE_PACKED;
+    DWORD   dwFilter;
-    CHAR    achAllocModule[8] WINE_PACKED;
+    CHAR    achAllocModule[8];
-    DWORD   dwAllocBreak WINE_PACKED;
+    DWORD   dwAllocBreak;
-    DWORD   dwAllocCount WINE_PACKED;
+    DWORD   dwAllocCount;
 } WINDEBUGINFO16, *LPWINDEBUGINFO16;
 
 #include <poppack.h>

include/wine/winuser16.h

@@ -27,14 +27,14 @@
 typedef struct tagCOMSTAT16
 {
     BYTE   status;
-    UINT16 cbInQue WINE_PACKED;
+    UINT16 cbInQue;
-    UINT16 cbOutQue WINE_PACKED;
+    UINT16 cbOutQue;
 } COMSTAT16,*LPCOMSTAT16;
 
 typedef struct tagDCB16
 {
     BYTE   Id;
-    UINT16 BaudRate WINE_PACKED;
+    UINT16 BaudRate;
     BYTE   ByteSize;
     BYTE   Parity;
     BYTE   StopBits;
@@ -66,7 +66,7 @@ typedef struct tagDCB16
     CHAR   PeChar;
     CHAR   EofChar;
     CHAR   EvtChar;
-    UINT16 TxDelay WINE_PACKED;
+    UINT16 TxDelay;
 } DCB16, *LPDCB16;
 
 
@@ -93,9 +93,9 @@ typedef struct
     UINT16   length;
     UINT16   flags;
     UINT16   showCmd;
-    POINT16  ptMinPosition WINE_PACKED;
+    POINT16  ptMinPosition;
-    POINT16  ptMaxPosition WINE_PACKED;
+    POINT16  ptMaxPosition;
-    RECT16   rcNormalPosition WINE_PACKED;
+    RECT16   rcNormalPosition;
 } WINDOWPLACEMENT16, *LPWINDOWPLACEMENT16;
 
 /****** Window classes ******/
@@ -103,15 +103,15 @@ typedef struct
 typedef struct
 {
     UINT16      style;
-    WNDPROC16   lpfnWndProc WINE_PACKED;
+    WNDPROC16   lpfnWndProc;
     INT16       cbClsExtra;
     INT16       cbWndExtra;
     HANDLE16    hInstance;
     HICON16     hIcon;
     HCURSOR16   hCursor;
     HBRUSH16    hbrBackground;
-    SEGPTR      lpszMenuName WINE_PACKED;
+    SEGPTR      lpszMenuName;
-    SEGPTR      lpszClassName WINE_PACKED;
+    SEGPTR      lpszClassName;
 } WNDCLASS16, *LPWNDCLASS16;
 
 typedef struct
@@ -135,9 +135,9 @@ typedef struct
     HWND16    hwnd;
     UINT16    message;
     WPARAM16  wParam;
-    LPARAM    lParam WINE_PACKED;
+    LPARAM    lParam;
-    DWORD     time WINE_PACKED;
+    DWORD     time;
-    POINT16   pt WINE_PACKED;
+    POINT16   pt;
 } MSG16, *LPMSG16;
 
 typedef struct
@@ -283,10 +283,10 @@ typedef struct
     INT16       cx;
     INT16       y;
     INT16       x;
-    LONG        style WINE_PACKED;
+    LONG        style;
-    SEGPTR      lpszName WINE_PACKED;
+    SEGPTR      lpszName;
-    SEGPTR      lpszClass WINE_PACKED;
+    SEGPTR      lpszClass;
-    DWORD       dwExStyle WINE_PACKED;
+    DWORD       dwExStyle;
 } CREATESTRUCT16, *LPCREATESTRUCT16;
 
 typedef struct
@@ -314,8 +314,8 @@ typedef struct
     INT16        y;
     INT16        cx;
     INT16        cy;
-    DWORD        style WINE_PACKED;
+    DWORD        style;
-    LPARAM       lParam WINE_PACKED;
+    LPARAM       lParam;
 } MDICREATESTRUCT16, *LPMDICREATESTRUCT16;
 
   /* WM_GETMINMAXINFO struct */
@@ -372,7 +372,7 @@ typedef struct
     UINT16  message;
     UINT16  paramL;
     UINT16  paramH;
-    DWORD   time WINE_PACKED;
+    DWORD   time;
 } EVENTMSG16, *LPEVENTMSG16;
 
   /* Mouse hook structure */
@@ -392,7 +392,7 @@ typedef struct
     HWND16    hWnd;
     UINT16    wMessage;
     WPARAM16  wParam;
-    LPARAM    lParam WINE_PACKED;
+    LPARAM    lParam;
 } HARDWAREHOOKSTRUCT16, *LPHARDWAREHOOKSTRUCT16;
 
 /* Scrollbar messages */
@@ -424,8 +424,8 @@ typedef struct
 typedef struct
 {
     HMODULE16   hModuleHook;
-    LPARAM	reserved WINE_PACKED;
+    LPARAM      reserved;
-    LPARAM	lParam WINE_PACKED;
+    LPARAM      lParam;
     WPARAM16    wParam;
     INT16       code;
 } DEBUGHOOKINFO16, *LPDEBUGHOOKINFO16;
@@ -508,8 +508,8 @@ typedef struct
     UINT16      itemState;
     HWND16      hwndItem;
     HDC16       hDC;
-    RECT16      rcItem WINE_PACKED;
+    RECT16      rcItem;
-    DWORD       itemData WINE_PACKED;
+    DWORD       itemData;
 } DRAWITEMSTRUCT16, *PDRAWITEMSTRUCT16, *LPDRAWITEMSTRUCT16;
 
 typedef struct
@@ -519,7 +519,7 @@ typedef struct
     UINT16      itemID;
     UINT16      itemWidth;
     UINT16      itemHeight;
-    DWORD       itemData WINE_PACKED;
+    DWORD       itemData;
 } MEASUREITEMSTRUCT16, *PMEASUREITEMSTRUCT16, *LPMEASUREITEMSTRUCT16;
 
 typedef struct
@@ -539,9 +539,31 @@ typedef struct
     UINT16      itemID1;
     DWORD       itemData1;
     UINT16      itemID2;
-    DWORD       itemData2 WINE_PACKED;
+    DWORD       itemData2;
 } COMPAREITEMSTRUCT16, *LPCOMPAREITEMSTRUCT16;
 
+/* DragObject stuff */
+
+typedef struct
+{
+    HWND16     hWnd;
+    HANDLE16   hScope;
+    WORD       wFlags;
+    HANDLE16   hList;
+    HANDLE16   hOfStruct;
+    POINT16    pt;
+    LONG       l;
+} DRAGINFO16, *LPDRAGINFO16;
+
+#define DRAGOBJ_PROGRAM    0x0001
+#define DRAGOBJ_DATA       0x0002
+#define DRAGOBJ_DIRECTORY  0x0004
+#define DRAGOBJ_MULTIPLE   0x0008
+#define DRAGOBJ_EXTERNAL   0x8000
+
+#define DRAG_PRINT 0x544E5250
+#define DRAG_FILE  0x454C4946
+
 #include <poppack.h>
 
 /* WM_COMMNOTIFY flags */
@@ -945,27 +967,4 @@ DWORD       WINAPI GetFileResourceSize16(LPCSTR,LPCSTR,LPCSTR,LPDWORD);
 DWORD       WINAPI GetFileResource16(LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD,LPVOID);
 FARPROC16   WINAPI SetTaskSignalProc(HTASK16,FARPROC16);
 
-
-/* DragObject stuff */
-
-typedef struct
-{
-    HWND16     hWnd;
-    HANDLE16   hScope;
-    WORD       wFlags;
-    HANDLE16   hList;
-    HANDLE16   hOfStruct;
-    POINT16 pt WINE_PACKED;
-    LONG       l WINE_PACKED;
-} DRAGINFO16, *LPDRAGINFO16;
-
-#define DRAGOBJ_PROGRAM		0x0001
-#define DRAGOBJ_DATA		0x0002
-#define DRAGOBJ_DIRECTORY	0x0004
-#define DRAGOBJ_MULTIPLE	0x0008
-#define DRAGOBJ_EXTERNAL	0x8000
-
-#define DRAG_PRINT		0x544E5250
-#define DRAG_FILE		0x454C4946
-
 #endif /* __WINE_WINE_WINUSER16_H */

include/winnt.h

@@ -34,10 +34,8 @@
 /* Macro for structure packing and more. */
 
 #ifdef __GNUC__
-#define WINE_PACKED   __attribute__((packed))
 #define WINE_UNUSED   __attribute__((unused))
 #else
-#define WINE_PACKED    /* nothing */
 #define WINE_UNUSED    /* nothing */
 #endif
 

include/winuser.h

@@ -483,9 +483,9 @@ typedef struct
     UINT   length;
     UINT   flags;
     UINT   showCmd;
-    POINT  ptMinPosition WINE_PACKED;
+    POINT  ptMinPosition;
-    POINT  ptMaxPosition WINE_PACKED;
+    POINT  ptMaxPosition;
-    RECT   rcNormalPosition WINE_PACKED;
+    RECT   rcNormalPosition;
 } WINDOWPLACEMENT, *PWINDOWPLACEMENT, *LPWINDOWPLACEMENT;
 
 
@@ -3164,8 +3164,8 @@ typedef struct
     UINT      itemState;
     HWND      hwndItem;
     HDC       hDC;
-    RECT      rcItem WINE_PACKED;
+    RECT      rcItem;
-    ULONG_PTR itemData WINE_PACKED;
+    ULONG_PTR itemData;
 } DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;