Module: wine Branch: master Commit: 3bb752736c4743754a6203293dcb62b52a1757c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bb752736c4743754a6203293dcb62b...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Oct 10 11:11:26 2023 +0200
include: Stop pretending to support big-endian.
---
include/basetsd.h | 32 -------------------------------- include/mapidefs.h | 10 ---------- include/winbase.h | 15 --------------- include/windef.h | 10 ---------- include/winnt.h | 28 ++-------------------------- include/winternl.h | 5 ----- include/winuser.h | 6 ------ include/wtypes.idl | 10 ---------- 8 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/include/basetsd.h b/include/basetsd.h index 55e900d4f8e..c16d55422bb 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -295,38 +295,6 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY;
#define MINLONGLONG ((LONGLONG)~MAXLONGLONG)
-/* Some Wine-specific definitions */ - -/* Architecture dependent settings. */ -/* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ -#if defined(__i386__) -# undef WORDS_BIGENDIAN -#elif defined(__x86_64__) -# undef WORDS_BIGENDIAN -#elif defined(__powerpc64__) && defined(__BIG_ENDIAN__) -# define WORDS_BIGENDIAN -#elif defined(__powerpc64__) -# undef WORDS_BIGENDIAN -#elif defined(__powerpc__) -# define WORDS_BIGENDIAN -#elif defined(__ALPHA__) -# undef WORDS_BIGENDIAN -#elif defined(__ARMEB__) -# define WORDS_BIGENDIAN -#elif defined(__ARMEL__) || defined(__arm__) -# undef WORDS_BIGENDIAN -#elif defined(__AARCH64EB__) -# define WORDS_BIGENDIAN -#elif defined(__AARCH64EL__) || defined(__aarch64__) -# undef WORDS_BIGENDIAN -#elif defined(__MIPSEB__) -# define WORDS_BIGENDIAN -#elif defined(__MIPSEL__) -# undef WORDS_BIGENDIAN -#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) -# error Unknown CPU architecture! -#endif - #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/include/mapidefs.h b/include/mapidefs.h index 84e0f2d7447..e3e2bd40b5f 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -37,13 +37,8 @@ typedef union tagCY { struct { -#ifdef WORDS_BIGENDIAN - LONG Hi; - ULONG Lo; -#else ULONG Lo; LONG Hi; -#endif } DUMMYSTRUCTNAME; LONGLONG int64; } CY; @@ -55,13 +50,8 @@ typedef CY CURRENCY; #define _FILETIME_ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif
diff --git a/include/winbase.h b/include/winbase.h index 4429fac21c7..5f005fcd82b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -252,13 +252,8 @@ typedef struct _SECURITY_ATTRIBUTES /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */
@@ -556,22 +551,12 @@ typedef struct _SYSTEMTIME{ /* The 'overlapped' data structure used by async I/O functions. */ typedef struct _OVERLAPPED { -#ifdef WORDS_BIGENDIAN - ULONG_PTR InternalHigh; - ULONG_PTR Internal; -#else ULONG_PTR Internal; ULONG_PTR InternalHigh; -#endif union { struct { -#ifdef WORDS_BIGENDIAN - DWORD OffsetHigh; - DWORD Offset; -#else DWORD Offset; DWORD OffsetHigh; -#endif } DUMMYSTRUCTNAME; PVOID Pointer; } DUMMYUNIONNAME; diff --git a/include/windef.h b/include/windef.h index cce3dbb36f4..b22e15c4dbf 100644 --- a/include/windef.h +++ b/include/windef.h @@ -390,23 +390,13 @@ typedef struct _POINTL
typedef struct tagPOINTS { -#ifdef WORDS_BIGENDIAN - SHORT y; - SHORT x; -#else SHORT x; SHORT y; -#endif } POINTS, *PPOINTS, *LPPOINTS;
typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #define _FILETIME_
diff --git a/include/winnt.h b/include/winnt.h index d8690d313ba..6ff508215dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4788,49 +4788,25 @@ typedef struct _TOKEN_GROUPS {
typedef union _LARGE_INTEGER { struct { -#ifdef WORDS_BIGENDIAN - LONG HighPart; - DWORD LowPart; -#else DWORD LowPart; LONG HighPart; -#endif } u; -#ifndef NONAMELESSSTRUCT struct { -#ifdef WORDS_BIGENDIAN - LONG HighPart; - DWORD LowPart; -#else DWORD LowPart; LONG HighPart; -#endif - }; -#endif + } DUMMYSTRUCTNAME; LONGLONG QuadPart; } LARGE_INTEGER, *PLARGE_INTEGER;
typedef union _ULARGE_INTEGER { struct { -#ifdef WORDS_BIGENDIAN - DWORD HighPart; - DWORD LowPart; -#else DWORD LowPart; DWORD HighPart; -#endif } u; -#ifndef NONAMELESSSTRUCT struct { -#ifdef WORDS_BIGENDIAN - DWORD HighPart; - DWORD LowPart; -#else DWORD LowPart; DWORD HighPart; -#endif - }; -#endif + } DUMMYSTRUCTNAME; ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER;
diff --git a/include/winternl.h b/include/winternl.h index d50bc730660..40d4ca4716a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -76,13 +76,8 @@ typedef const UNICODE_STRING *PCUNICODE_STRING; /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */
diff --git a/include/winuser.h b/include/winuser.h index 4ed29e86616..c0736502a2e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1625,15 +1625,9 @@ typedef struct tagCURSORINFO /* this is the 6 byte accel struct used in Win32 when presented to the user */ typedef struct tagACCEL { -#ifdef WORDS_BIGENDIAN - WORD fVirt; - WORD key; - DWORD cmd; -#else BYTE fVirt; WORD key; WORD cmd; -#endif } ACCEL, *LPACCEL;
diff --git a/include/wtypes.idl b/include/wtypes.idl index d08148dc840..77a9f1c761a 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -646,13 +646,8 @@ cpp_quote("#ifndef _tagCY_DEFINED") cpp_quote("#define _tagCY_DEFINED") cpp_quote("typedef union tagCY {") cpp_quote(" struct {") -cpp_quote("#ifdef WORDS_BIGENDIAN") -cpp_quote(" LONG Hi;") -cpp_quote(" ULONG Lo;") -cpp_quote("#else") cpp_quote(" ULONG Lo;") cpp_quote(" LONG Hi;") -cpp_quote("#endif") cpp_quote(" } DUMMYSTRUCTNAME;") cpp_quote(" LONGLONG int64;") cpp_quote("} CY;") @@ -682,13 +677,8 @@ cpp_quote(" } DUMMYUNIONNAME;") cpp_quote(" ULONG Hi32;") cpp_quote(" union {") cpp_quote(" struct {") -cpp_quote("#ifdef WORDS_BIGENDIAN") -cpp_quote(" ULONG Mid32;") -cpp_quote(" ULONG Lo32;") -cpp_quote("#else") cpp_quote(" ULONG Lo32;") cpp_quote(" ULONG Mid32;") -cpp_quote("#endif") cpp_quote(" } DUMMYSTRUCTNAME1;") cpp_quote(" ULONGLONG Lo64;") cpp_quote(" } DUMMYUNIONNAME1;")