Dmitry Timoshkov : msvcrt: Pack the structures on a 8-byte boundary like in PSDK.
Module: wine Branch: master Commit: 2af96fe590a6e2996c87b760c53f332356cbc4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af96fe590a6e2996c87b760c5... Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 20 16:35:41 2007 +0800 msvcrt: Pack the structures on a 8-byte boundary like in PSDK. --- include/msvcrt/direct.h | 4 ++++ include/msvcrt/dos.h | 4 ++++ include/msvcrt/eh.h | 4 ++++ include/msvcrt/io.h | 4 ++++ include/msvcrt/math.h | 4 ++++ include/msvcrt/mbstring.h | 4 ++++ include/msvcrt/setjmp.h | 4 ++++ include/msvcrt/stdio.h | 4 ++++ include/msvcrt/stdlib.h | 4 ++++ include/msvcrt/sys/stat.h | 4 ++++ include/msvcrt/sys/timeb.h | 4 ++++ include/msvcrt/sys/utime.h | 4 ++++ include/msvcrt/time.h | 4 ++++ include/msvcrt/wchar.h | 4 ++++ include/msvcrt/wctype.h | 4 ++++ 15 files changed, 60 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 167e7d7..f0fce97 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -77,4 +79,6 @@ static inline char* getcwd(char * buf, int size) { return _getcwd(buf, size); } static inline int mkdir(const char* newdir) { return _mkdir(newdir); } static inline int rmdir(const char* dir) { return _rmdir(dir); } +#include <poppack.h> + #endif /* __WINE_DIRECT_H */ diff --git a/include/msvcrt/dos.h b/include/msvcrt/dos.h index a35e642..be6d444 100644 --- a/include/msvcrt/dos.h +++ b/include/msvcrt/dos.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + /* The following are also defined in io.h */ #define _A_NORMAL 0x00000000 #define _A_RDONLY 0x00000001 @@ -44,4 +46,6 @@ unsigned int _getdiskfree(unsigned int, struct _diskfree_t *); #define diskfree_t _diskfree_t +#include <poppack.h> + #endif /* __WINE_DOS_H */ diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index fb8b2c7..2f8281e 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -27,6 +27,8 @@ #error "eh.h is meant only for C++ applications" #endif +#include <pshpack8.h> + struct _EXCEPTION_POINTERS; typedef void (*terminate_handler)(void); @@ -42,4 +44,6 @@ _se_translator_function _set_se_translator(_se_translator_function func); void terminate(void); void unexpected(void); +#include <poppack.h> + #endif /* __WINE_EH_H */ diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index c3cd315..55444f0 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -183,4 +185,6 @@ extern int sopen(const char*,int,int,...) __attribute__((alias("_sopen"))); #define sopen _sopen #endif /* __GNUC__ */ +#include <poppack.h> + #endif /* __WINE_IO_H */ diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 81a51a6..4192378 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -12,6 +12,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -94,4 +96,6 @@ static const union { } #endif +#include <poppack.h> + #endif /* __WINE_MATH_H */ diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 1da3213..7e82ce8 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #if !defined(_MSC_VER) && !defined(__int64) #define __int64 long long #endif @@ -134,4 +136,6 @@ int _ismbstrail(const unsigned char*,const unsigned char*); } #endif +#include <poppack.h> + #endif /* __WINE_MBSTRING_H */ diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 56eb5b8..cf3b294 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __i386__ typedef struct __JUMP_BUFFER @@ -61,4 +63,6 @@ int longjmp(jmp_buf,int); #define setjmp _setjmp +#include <poppack.h> + #endif /* __WINE_SETJMP_H */ diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index dfa983f..01ae243 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef RC_INVOKED #include <stdarg.h> #endif @@ -250,4 +252,6 @@ static inline int getw(FILE* file) { return _getw(file); } static inline int putw(int val, FILE* file) { return _putw(val, file); } static inline FILE* wpopen(const wchar_t* command,const wchar_t* mode) { return _wpopen(command, mode); } +#include <poppack.h> + #endif /* __WINE_STDIO_H */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index a8b6ab5..27e8dbe 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef NULL #ifdef __cplusplus #define NULL 0 @@ -246,4 +248,6 @@ static inline ldiv_t __wine_msvcrt_ldiv(long num, long denom) #define ldiv(num,denom) __wine_msvcrt_ldiv(num,denom) #endif +#include <poppack.h> + #endif /* __WINE_STDLIB_H */ diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index dcedcd5..a81a9ec 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #include <sys/types.h> #ifndef _WCHAR_T_DEFINED @@ -174,4 +176,6 @@ static inline int umask(int fd) { return _umask(fd); } #define _UMASK_DEFINED #endif +#include <poppack.h> + #endif /* __WINE_SYS_STAT_H */ diff --git a/include/msvcrt/sys/timeb.h b/include/msvcrt/sys/timeb.h index 7bea2ed..253b581 100644 --- a/include/msvcrt/sys/timeb.h +++ b/include/msvcrt/sys/timeb.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _TIME_T_DEFINED typedef long time_t; #define _TIME_T_DEFINED @@ -55,4 +57,6 @@ void _ftime(struct _timeb*); static inline void ftime(struct _timeb* ptr) { return _ftime(ptr); } +#include <poppack.h> + #endif /* __WINE_SYS_TIMEB_H */ diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h index ba65976..65a855c 100644 --- a/include/msvcrt/sys/utime.h +++ b/include/msvcrt/sys/utime.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -62,4 +64,6 @@ int _wutime(const wchar_t*,struct _utimbuf*); static inline int utime(const char* path, struct _utimbuf* buf) { return _utime(path, buf); } +#include <poppack.h> + #endif /* __WINE_SYS_UTIME_H */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 0fbf1df..60ec444 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -127,4 +129,6 @@ wchar_t*_wstrtime(wchar_t*); } #endif +#include <poppack.h> + #endif /* __WINE_TIME_H */ diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 48aa311..e298a70 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #include <stdarg.h> #ifdef __cplusplus @@ -428,4 +430,6 @@ int wctob(wint_t); } #endif +#include <poppack.h> + #endif /* __WINE_WCHAR_H */ diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 372e102..0f70e4d 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -84,4 +86,6 @@ wchar_t towupper(wchar_t); } #endif +#include <poppack.h> + #endif /* __WINE_WCTYPE_H */
participants (1)
-
Alexandre Julliard