Module: wine Branch: master Commit: cb72e666ba351f894c383e0caeb6b8bb680eefe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb72e666ba351f894c383e0cae...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Nov 3 23:58:54 2011 +0100
include: Make "long" numeric constants LP64/LLP64 proof (winver.h).
---
include/winver.h | 124 +++++++++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/include/winver.h b/include/winver.h index f7e887b..2de105b 100644 --- a/include/winver.h +++ b/include/winver.h @@ -29,33 +29,33 @@ extern "C" { #define VS_VERSION_INFO 1 #define VS_USER_DEFINED 100
-#define VS_FFI_SIGNATURE 0xfeef04bdL /* FileInfo Magic */ -#define VS_FFI_STRUCVERSION 0x00010000L /* struc version 1.0 */ -#define VS_FFI_FILEFLAGSMASK 0x0000003fL /* valid flags */ +#define VS_FFI_SIGNATURE __MSABI_LONG(0xfeef04bd) /* FileInfo Magic */ +#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000) /* struc version 1.0 */ +#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003f) /* valid flags */
/* VS_VERSION.dwFileFlags */ -#define VS_FF_DEBUG 0x01L -#define VS_FF_PRERELEASE 0x02L -#define VS_FF_PATCHED 0x04L -#define VS_FF_PRIVATEBUILD 0x08L -#define VS_FF_INFOINFERRED 0x10L -#define VS_FF_SPECIALBUILD 0x20L +#define VS_FF_DEBUG __MSABI_LONG(0x01) +#define VS_FF_PRERELEASE __MSABI_LONG(0x02) +#define VS_FF_PATCHED __MSABI_LONG(0x04) +#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x08) +#define VS_FF_INFOINFERRED __MSABI_LONG(0x10) +#define VS_FF_SPECIALBUILD __MSABI_LONG(0x20)
/* VS_VERSION.dwFileOS */
/* major os version */ -#define VOS_UNKNOWN 0x00000000L -#define VOS_DOS 0x00010000L -#define VOS_OS216 0x00020000L -#define VOS_OS232 0x00030000L -#define VOS_NT 0x00040000L +#define VOS_UNKNOWN __MSABI_LONG(0x00000000) +#define VOS_DOS __MSABI_LONG(0x00010000) +#define VOS_OS216 __MSABI_LONG(0x00020000) +#define VOS_OS232 __MSABI_LONG(0x00030000) +#define VOS_NT __MSABI_LONG(0x00040000)
/* minor os version */ -#define VOS__BASE 0x00000000L -#define VOS__WINDOWS16 0x00000001L -#define VOS__PM16 0x00000002L -#define VOS__PM32 0x00000003L -#define VOS__WINDOWS32 0x00000004L +#define VOS__BASE __MSABI_LONG(0x00000000) +#define VOS__WINDOWS16 __MSABI_LONG(0x00000001) +#define VOS__PM16 __MSABI_LONG(0x00000002) +#define VOS__PM32 __MSABI_LONG(0x00000003) +#define VOS__WINDOWS32 __MSABI_LONG(0x00000004)
/* possible versions */ #define VOS_DOS_WINDOWS16 (VOS_DOS|VOS__WINDOWS16) @@ -65,34 +65,34 @@ extern "C" { #define VOS_NT_WINDOWS32 (VOS_NT|VOS__WINDOWS32)
/* VS_VERSION.dwFileType */ -#define VFT_UNKNOWN 0x00000000L -#define VFT_APP 0x00000001L -#define VFT_DLL 0x00000002L -#define VFT_DRV 0x00000003L -#define VFT_FONT 0x00000004L -#define VFT_VXD 0x00000005L -/* ??one type missing?? 0x00000006L -Marcus */ -#define VFT_STATIC_LIB 0x00000007L +#define VFT_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT_APP __MSABI_LONG(0x00000001) +#define VFT_DLL __MSABI_LONG(0x00000002) +#define VFT_DRV __MSABI_LONG(0x00000003) +#define VFT_FONT __MSABI_LONG(0x00000004) +#define VFT_VXD __MSABI_LONG(0x00000005) +/* ??one type missing?? __MSABI_LONG(0x00000006) -Marcus */ +#define VFT_STATIC_LIB __MSABI_LONG(0x00000007)
/* VS_VERSION.dwFileSubtype for VFT_DRV */ -#define VFT2_UNKNOWN 0x00000000L -#define VFT2_DRV_PRINTER 0x00000001L -#define VFT2_DRV_KEYBOARD 0x00000002L -#define VFT2_DRV_LANGUAGE 0x00000003L -#define VFT2_DRV_DISPLAY 0x00000004L -#define VFT2_DRV_MOUSE 0x00000005L -#define VFT2_DRV_NETWORK 0x00000006L -#define VFT2_DRV_SYSTEM 0x00000007L -#define VFT2_DRV_INSTALLABLE 0x00000008L -#define VFT2_DRV_SOUND 0x00000009L -#define VFT2_DRV_COMM 0x0000000aL -#define VFT2_DRV_INPUTMETHOD 0x0000000bL -#define VFT2_DRV_VERSIONED_PRINTER 0x0000000cL +#define VFT2_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001) +#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002) +#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003) +#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004) +#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005) +#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006) +#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007) +#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008) +#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009) +#define VFT2_DRV_COMM __MSABI_LONG(0x0000000a) +#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000b) +#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000c)
/* VS_VERSION.dwFileSubtype for VFT_FONT */ -#define VFT2_FONT_RASTER 0x00000001L -#define VFT2_FONT_VECTOR 0x00000002L -#define VFT2_FONT_TRUETYPE 0x00000003L +#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001) +#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002) +#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003)
/* VerFindFile Flags */ /* input */ @@ -109,25 +109,25 @@ extern "C" { #define VIFF_DONTDELETEOLD 0x0002
/* output (return) */ -#define VIF_TEMPFILE 0x00000001L -#define VIF_MISMATCH 0x00000002L -#define VIF_SRCOLD 0x00000004L -#define VIF_DIFFLANG 0x00000008L -#define VIF_DIFFCODEPG 0x00000010L -#define VIF_DIFFTYPE 0x00000020L -#define VIF_WRITEPROT 0x00000040L -#define VIF_FILEINUSE 0x00000080L -#define VIF_OUTOFSPACE 0x00000100L -#define VIF_ACCESSVIOLATION 0x00000200L -#define VIF_SHARINGVIOLATION 0x00000400L -#define VIF_CANNOTCREATE 0x00000800L -#define VIF_CANNOTDELETE 0x00001000L -#define VIF_CANNOTRENAME 0x00002000L -#define VIF_CANNOTDELETECUR 0x00004000L -#define VIF_OUTOFMEMORY 0x00008000L -#define VIF_CANNOTREADSRC 0x00010000L -#define VIF_CANNOTREADDST 0x00020000L -#define VIF_BUFFTOOSMALL 0x00040000L +#define VIF_TEMPFILE __MSABI_LONG(0x00000001) +#define VIF_MISMATCH __MSABI_LONG(0x00000002) +#define VIF_SRCOLD __MSABI_LONG(0x00000004) +#define VIF_DIFFLANG __MSABI_LONG(0x00000008) +#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010) +#define VIF_DIFFTYPE __MSABI_LONG(0x00000020) +#define VIF_WRITEPROT __MSABI_LONG(0x00000040) +#define VIF_FILEINUSE __MSABI_LONG(0x00000080) +#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100) +#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200) +#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400) +#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800) +#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000) +#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000) +#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000) +#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000) +#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) +#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) +#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000)
typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature;