Skip to content
Snippets Groups Projects
Commit c7a8dde1 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files

#pragma pack(?) changed to #include "*pack*.h"

parent 10141fec
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,7 @@
DEFAULT_DEBUG_CHANNEL(shell)
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
......@@ -43,7 +43,7 @@ typedef struct
icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */
} icoICONDIR, *LPicoICONDIR;
#pragma pack(4)
#include "poppack.h"
#if 0
static void dumpIcoDirEnty ( LPicoICONDIRENTRY entry )
......
......@@ -62,7 +62,7 @@
#define PT_NETWORK 0x47
#define PT_SHARE 0xc3
#pragma pack(1)
#include "pshpack1.h"
typedef BYTE PIDLTYPE;
typedef struct tagPIDLDATA
......@@ -94,7 +94,7 @@ typedef struct tagPIDLDATA
} network;
}u;
} PIDLDATA, *LPPIDLDATA;
#pragma pack(4)
#include "poppack.h"
/*
* getting string values from pidls
......
......@@ -23,7 +23,7 @@ DEFAULT_DEBUG_CHANNEL(shell)
/* link file formats */
#pragma (1);
#include "pshpack1.h"
/* lnk elements: simple link has 0x0B */
#define WORKDIR 0x10
......@@ -52,7 +52,7 @@ typedef struct _LINK_HEADER
ITEMIDLIST Pidl; /* 0x4e */
} LINK_HEADER, * PLINK_HEADER;
#pragma (4);
#include "poppack.h"
/* IPersistFile Implementation */
typedef struct
......
......@@ -20,7 +20,7 @@
DEFAULT_DEBUG_CHANNEL(win16drv)
#define SUPPORT_REALIZED_FONTS 1
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
SHORT nSize;
......@@ -29,7 +29,7 @@ typedef struct
SEGPTR lpXForm;
SEGPTR lpDrawMode;
} EXTTEXTDATA, *LPEXTTEXTDATA;
#pragma pack(4)
#include "poppack.h"
SEGPTR win16drv_SegPtr_TextXForm;
LPTEXTXFORM16 win16drv_TextXFormP;
......
......@@ -20,7 +20,7 @@ DEFAULT_DEBUG_CHANNEL(snoop)
#ifdef __i386__
#pragma pack(1)
#include "pshpack1.h"
void WINAPI SNOOP16_Entry(CONTEXT *context);
void WINAPI SNOOP16_Return(CONTEXT *context);
......@@ -82,7 +82,7 @@ typedef struct tagSNOOP16_RELAY {
/* unreached */
} SNOOP16_RELAY;
#pragma pack(4)
#include "poppack.h"
static SNOOP16_DLL *firstdll = NULL;
static SNOOP16_RETURNENTRIES *firstrets = NULL;
......
......@@ -114,7 +114,7 @@ extern LONG CALLBACK CallTo16_long_llllllllllllllll(FARPROC16,LONG,LONG,LONG,
typedef void (*RELAY)();
#pragma pack(1)
#include "pshpack1.h"
typedef struct tagTHUNK
{
......@@ -127,7 +127,7 @@ typedef struct tagTHUNK
struct tagTHUNK *next WINE_PACKED;
} THUNK;
#pragma pack(4)
#include "poppack.h"
#define DECL_THUNK(name,proc,relay) \
THUNK name = { 0x58, 0x68, (FARPROC)(proc), 0x50, 0xe9, \
......@@ -1152,7 +1152,7 @@ WOW16Call(WORD x,WORD y,WORD z) {
* 16<->32 Thunklet/Callback API:
*/
#pragma pack(1)
#include "pshpack1.h"
typedef struct _THUNKLET
{
BYTE prefix_target;
......@@ -1170,7 +1170,7 @@ typedef struct _THUNKLET
HINSTANCE16 owner;
struct _THUNKLET *next;
} THUNKLET;
#pragma pack(4)
#include "poppack.h"
#define THUNKLET_TYPE_LS 1
#define THUNKLET_TYPE_SL 2
......
......@@ -3,7 +3,7 @@
#if !defined(ASPI_H)
#define ASPI_H
#pragma pack(1)
#include "pshpack1.h"
#define SS_PENDING 0x00
#define SS_COMP 0x01
......@@ -115,6 +115,6 @@ struct ASPI_DEVICE_INFO {
typedef struct ASPI_DEVICE_INFO ASPI_DEVICE_INFO;
static ASPI_DEVICE_INFO *ASPI_open_devices = NULL;
#pragma pack(4)
#include "poppack.h"
#endif
......@@ -9,7 +9,7 @@
#include "windef.h"
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
......@@ -64,7 +64,7 @@ typedef struct
} CURSORICONFILEDIR;
#pragma pack(4)
#include "poppack.h"
#define CID_RESOURCE 0x0001
#define CID_WIN32 0x0004
......
......@@ -14,7 +14,7 @@
* sizeof(DIALOGINFO) must be <= DLGWINDOWEXTRA (=30).
*/
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
......@@ -34,7 +34,7 @@ typedef struct
HGLOBAL16 hDialogHeap;
} DIALOGINFO;
#pragma pack(4)
#include "poppack.h"
#define DF_END 0x0001
......
......@@ -11,13 +11,13 @@
struct tagCURSORICONINFO;
#pragma pack(1)
#include "pshpack1.h"
typedef struct tagCURSORINFO
{
WORD wXMickeys;
WORD wYMickeys;
} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
#pragma pack(4)
#include "poppack.h"
WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo);
VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor );
......
......@@ -3,7 +3,7 @@
#include "wine/obj_base.h"
#pragma pack(1)
#include "pshpack1.h"
/*****************************************************************************
* Predeclare the interfaces
......@@ -585,6 +585,6 @@ ICOM_DEFINE(IDirectPlay3,IDirectPlay2)
#endif
#pragma pack(4)
#include "poppack.h"
#endif /* __WINE_DPLAY_H */
......@@ -9,7 +9,7 @@
#include "gdi.h"
#pragma pack(1)
#include "pshpack1.h"
/* GDI logical font object */
typedef struct
......@@ -51,7 +51,7 @@ typedef struct {
CHAR szFaceName[60]; /* dito */
} FONTDIR16, *LPFONTDIR16;
#pragma pack(4)
#include "poppack.h"
#define FONTCACHE 32 /* dynamic font cache size */
......
......@@ -9,7 +9,7 @@
#include "windef.h"
#pragma pack(1)
#include "pshpack1.h"
typedef struct _KBINFO
{
BYTE Begin_First_Range;
......@@ -18,7 +18,7 @@ typedef struct _KBINFO
BYTE End_Second_Range;
WORD StateSize;
} KBINFO, *LPKBINFO;
#pragma pack(4)
#include "poppack.h"
typedef VOID (CALLBACK *LPKEYBD_EVENT_PROC)(BYTE,BYTE,DWORD,DWORD);
......
......@@ -14,7 +14,7 @@
extern int DOSCONF_ReadConfig(void);
/* msdos/dosmem.c */
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
......@@ -74,7 +74,7 @@ typedef struct
BYTE DiskDataRate; /* 8B: Last disk data rate selected */
} BIOSDATA;
#pragma pack(4)
#include "poppack.h"
extern HANDLE16 DOSMEM_BiosDataSeg;
extern HANDLE16 DOSMEM_BiosSysSeg;
......
......@@ -13,7 +13,7 @@ extern "C" {
typedef LPSTR HPSTR; /* a huge version of LPSTR */
typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */
#pragma pack(1)
#include "pshpack1.h"
#define MAXWAVEDRIVERS 10
#define MAXMIDIDRIVERS 10
......@@ -2865,7 +2865,7 @@ DWORD WINAPI widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2);
DWORD WINAPI wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2);
#pragma pack(4)
#include "poppack.h"
#ifdef __cplusplus
}
......
......@@ -84,7 +84,7 @@ typedef struct
/* Self-loading modules contain this structure in their first segment */
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
......@@ -118,7 +118,7 @@ typedef struct
DWORD dwReserved;
} LOADPARAMS;
#pragma pack(4)
#include "poppack.h"
/* internal representation of 32bit modules. per process. */
typedef enum {
......
......@@ -11,7 +11,7 @@
struct tagCURSORICONINFO;
#pragma pack(1)
#include "pshpack1.h"
typedef struct _MOUSEINFO
{
BYTE msExist;
......@@ -24,7 +24,7 @@ typedef struct _MOUSEINFO
WORD msYRes;
WORD msMouseCommPort;
} MOUSEINFO, *LPMOUSEINFO;
#pragma pack(4)
#include "poppack.h"
typedef VOID (CALLBACK *LPMOUSE_EVENT_PROC)(DWORD,DWORD,DWORD,DWORD,DWORD);
......
#ifdef __WINE_PSHPACK_H
#undef __WINE_PSHPACK_H
#if defined(__GNUC__) || defined(__SUNPRO_C)
#pragma pack()
#elif defined(__SUNPRO_CC)
#warning "Assumes default alignment is 4"
#pragma pack(4)
#elif !defined(RC_INVOKED)
#error "Restoration of the previous alignment isn't supported by the compiler"
#endif /* defined(__GNUC__) || defined(__SUNPRO_C) ; !defined(RC_INVOKED) */
#else /* defined(__WINE_PSHPACK_H) */
#error "Popping alignment isn't possible since no alignment has been pushed"
#endif /* defined(__WINE_PSHPACK_H) */
#ifndef __WINE_PSHPACK_H
#define __WINE_PSHPACK_H 1
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#pragma pack(1)
#elif !defined(RC_INVOKED)
#error "1 as alignment isn't supported by the compiler"
#endif /* defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
#else /* !defined(__WINE_PSHPACK_H) */
#error "Nested pushing of alignment isn't supported by the compiler"
#endif /* !defined(__WINE_PSHPACK_H) */
#ifndef __WINE_PSHPACK_H
#define __WINE_PSHPACK_H 2
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#pragma pack(2)
#elif !defined(RC_INVOKED)
#error "2 as alignment isn't supported by the compiler"
#endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
#else /* !defined(__WINE_PSHPACK_H) */
#error "Nested pushing of alignment isn't supported by the compiler"
#endif /* !defined(__WINE_PSHPACK_H) */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment