[PATCH 1/4] [Include]: push/pop pack fixes on 64 bit platforms
Eric Pouech
eric.pouech at orange.fr
Sat Jan 23 11:56:29 CST 2010
A+
---
include/commctrl.h | 16 ++++++++++++++++
include/fci.h | 4 ++++
include/fdi.h | 8 ++++++++
include/mmsystem.h | 4 ++++
include/richedit.h | 4 ++++
include/shlwapi.h | 6 +++++-
include/wingdi.h | 6 ++++++
include/ws2spi.h | 4 ++++
8 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/include/commctrl.h b/include/commctrl.h
index 27bd745..c841d51 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -2245,7 +2245,9 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 };
#define PGN_SCROLL (PGN_FIRST-1)
#define PGN_CALCSIZE (PGN_FIRST-2)
+#ifdef _WIN32
#include <pshpack1.h>
+#endif
typedef struct
{
@@ -2258,7 +2260,9 @@ typedef struct
INT iScroll;
} NMPGSCROLL, *LPNMPGSCROLL;
+#ifdef _WIN32
#include <poppack.h>
+#endif
typedef struct
{
@@ -2709,14 +2713,18 @@ typedef struct tagNMTVGETINFOTIPW
#define NMTVGETINFOTIP WINELIB_NAME_AW(NMTVGETINFOTIP)
#define LPNMTVGETINFOTIP WINELIB_NAME_AW(LPNMTVGETINFOTIP)
+#ifdef _WIN32
#include <pshpack1.h>
+#endif
typedef struct tagTVKEYDOWN
{
NMHDR hdr;
WORD wVKey;
UINT flags;
} NMTVKEYDOWN, *LPNMTVKEYDOWN;
+#ifdef _WIN32
#include <poppack.h>
+#endif
#define TV_KEYDOWN NMTVKEYDOWN
@@ -3531,14 +3539,18 @@ typedef struct tagLVDISPINFOW
#define LV_DISPINFOA NMLVDISPINFOA
#define LV_DISPINFOW NMLVDISPINFOW
+#ifdef _WIN32
#include <pshpack1.h>
+#endif
typedef struct tagLVKEYDOWN
{
NMHDR hdr;
WORD wVKey;
UINT flags;
} NMLVKEYDOWN, *LPNMLVKEYDOWN;
+#ifdef _WIN32
#include <poppack.h>
+#endif
#define LV_KEYDOWN NMLVKEYDOWN
@@ -4273,14 +4285,18 @@ typedef struct tagTCITEMW
#define TCN_GETOBJECT (TCN_FIRST - 3)
#define TCN_FOCUSCHANGE (TCN_FIRST - 4)
+#ifdef _WIN32
#include <pshpack1.h>
+#endif
typedef struct tagTCKEYDOWN
{
NMHDR hdr;
WORD wVKey;
UINT flags;
} NMTCKEYDOWN;
+#ifdef _WIN32
#include <poppack.h>
+#endif
#define TC_KEYDOWN NMTCKEYDOWN
diff --git a/include/fci.h b/include/fci.h
index 5ef6c7e..03152c3 100644
--- a/include/fci.h
+++ b/include/fci.h
@@ -25,7 +25,9 @@
extern "C" {
#endif /* defined(__cplusplus) */
+#ifndef _WIN64
#include <pshpack4.h>
+#endif
#ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1
@@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci);
/**********************************************************************/
+#ifndef _WIN64
#include <poppack.h>
+#endif
#ifdef __cplusplus
} /* extern "C" */
diff --git a/include/fdi.h b/include/fdi.h
index ef97958..811b65c 100644
--- a/include/fdi.h
+++ b/include/fdi.h
@@ -23,7 +23,9 @@
extern "C" {
#endif /* defined(__cplusplus) */
+#ifndef _WIN64
#include <pshpack4.h>
+#endif
#ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1
@@ -257,14 +259,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
#define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \
PFDINOTIFICATION pfdin)
+#ifndef _WIN64
#include <pshpack1.h>
+#endif
typedef struct {
char ach[2]; /* Set to { '*', '\0' } */
LONG cbFile; /* Required spill file size */
} FDISPILLFILE, *PFDISPILLFILE;
+#ifndef _WIN64
#include <poppack.h>
+#endif
#define cpuUNKNOWN (-1) /* FDI does detection */
#define cpu80286 (0) /* '286 opcodes only */
@@ -282,7 +288,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT);
/**********************************************************************/
+#ifndef _WIN64
#include <poppack.h>
+#endif
#ifdef __cplusplus
} /* extern "C" */
diff --git a/include/mmsystem.h b/include/mmsystem.h
index dd9723a..c4d1491 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -50,7 +50,9 @@ typedef HMIXEROBJ *LPHMIXEROBJ;
typedef HWAVEIN *LPHWAVEIN;
typedef HWAVEOUT *LPHWAVEOUT;
+#ifdef _WIN32
#include <pshpack1.h>
+#endif
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM);
@@ -2508,7 +2510,9 @@ DECL_WINELIB_TYPE_AW(LPMCI_OVLY_LOAD_PARMS)
#define SC_SCREENSAVE 0xf140
#endif
+#ifdef _WIN32
#include <poppack.h>
+#endif
#ifdef __cplusplus
}
diff --git a/include/richedit.h b/include/richedit.h
index 095cc8a..16a22e9 100644
--- a/include/richedit.h
+++ b/include/richedit.h
@@ -20,7 +20,9 @@
#ifndef __WINE_RICHEDIT_H
#define __WINE_RICHEDIT_H
+#ifdef _WIN32
#include <pshpack4.h>
+#endif
#ifdef __cplusplus
extern "C" {
@@ -1074,6 +1076,8 @@ typedef struct _settextex {
}
#endif
+#ifdef _WIN32
#include <poppack.h>
+#endif
#endif /* __WINE_RICHEDIT_H */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index eb36345..629df80 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -29,7 +29,9 @@
extern "C" {
#endif /* defined(__cplusplus) */
+#ifdef _WIN32
#include <pshpack8.h>
+#endif
#ifndef NO_SHLWAPI_REG
@@ -1046,7 +1048,9 @@ BOOL WINAPI IsOS(DWORD);
#define TPS_EXECUTEIO 0x00000001
#define TPS_LONGEXECTIME 0x00000008
-#include <poppack.h>
+#ifdef _WIN32
+#include <poppack.h>
+#endif
#ifdef __cplusplus
} /* extern "C" */
diff --git a/include/wingdi.h b/include/wingdi.h
index 99fd2bc..197bcaa 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -792,6 +792,7 @@ typedef struct tagXFORM
#ifndef _TEXTMETRIC_DEFINED
#define _TEXTMETRIC_DEFINED
+#include <pshpack4.h>
typedef struct tagTEXTMETRICA
{
@@ -844,6 +845,8 @@ typedef struct tagTEXTMETRICW
DECL_WINELIB_TYPE_AW(TEXTMETRIC)
DECL_WINELIB_TYPE_AW(PTEXTMETRIC)
DECL_WINELIB_TYPE_AW(LPTEXTMETRIC)
+
+#include <poppack.h>
#endif /* _TEXTMETRIC_DEFINED */
@@ -1133,6 +1136,7 @@ DECL_WINELIB_TYPE_AW(LPPOLYTEXT)
#define NTM_TYPE1 0x00100000
#define NTM_DSIG 0x00200000
+#include <pshpack4.h>
typedef struct
{
@@ -1194,6 +1198,8 @@ DECL_WINELIB_TYPE_AW(NEWTEXTMETRIC)
DECL_WINELIB_TYPE_AW(PNEWTEXTMETRIC)
DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRIC)
+#include <poppack.h>
+
typedef struct
{
NEWTEXTMETRICA ntmTm;
diff --git a/include/ws2spi.h b/include/ws2spi.h
index b30c45c..c05948d 100644
--- a/include/ws2spi.h
+++ b/include/ws2spi.h
@@ -25,7 +25,9 @@
#include <winsock2.h>
#endif /* !defined(_WINSOCK2API_) */
+#ifndef _WIN64
#include <pshpack4.h>
+#endif
#ifdef __cplusplus
extern "C" {
@@ -48,6 +50,8 @@ INT WINAPI WSCWriteProviderOrder(LPDWORD,DWORD);
} /* extern "C" */
#endif /* defined(__cplusplus) */
+#ifndef _WIN64
#include <poppack.h>
+#endif
#endif /* !defined(_WINSOCK2SPI_) */
More information about the wine-patches
mailing list