Skip to content

W
wine-winehq
Commit ad0f8b6b authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

include: Make some more "long" numeric constants LP64/LLP64 proof.

parent 1836ca36
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 95 deletions
include/commdlg.h
View file @ ad0f8b6b
......@@ -312,31 +312,31 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
#define CF_SCREENFONTS 0x00000001
#define CF_PRINTERFONTS 0x00000002
#define CF_BOTH (CF_SCREENFONTS | CF_PRINTERFONTS)
#define CF_SHOWHELP 0x00000004L
#define CF_ENABLEHOOK 0x00000008L
#define CF_ENABLETEMPLATE 0x00000010L
#define CF_ENABLETEMPLATEHANDLE 0x00000020L
#define CF_INITTOLOGFONTSTRUCT 0x00000040L
#define CF_USESTYLE 0x00000080L
#define CF_EFFECTS 0x00000100L
#define CF_APPLY 0x00000200L
#define CF_ANSIONLY 0x00000400L
#define CF_SHOWHELP __MSABI_LONG(0x00000004)
#define CF_ENABLEHOOK __MSABI_LONG(0x00000008)
#define CF_ENABLETEMPLATE __MSABI_LONG(0x00000010)
#define CF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x00000020)
#define CF_INITTOLOGFONTSTRUCT __MSABI_LONG(0x00000040)
#define CF_USESTYLE __MSABI_LONG(0x00000080)
#define CF_EFFECTS __MSABI_LONG(0x00000100)
#define CF_APPLY __MSABI_LONG(0x00000200)
#define CF_ANSIONLY __MSABI_LONG(0x00000400)
#define CF_SCRIPTSONLY CF_ANSIONLY
#define CF_NOVECTORFONTS 0x00000800L
#define CF_NOVECTORFONTS __MSABI_LONG(0x00000800)
#define CF_NOOEMFONTS CF_NOVECTORFONTS
#define CF_NOSIMULATIONS 0x00001000L
#define CF_LIMITSIZE 0x00002000L
#define CF_FIXEDPITCHONLY 0x00004000L
#define CF_WYSIWYG 0x00008000L /* use with CF_SCREENFONTS & CF_PRINTERFONTS */
#define CF_FORCEFONTEXIST 0x00010000L
#define CF_SCALABLEONLY 0x00020000L
#define CF_TTONLY 0x00040000L
#define CF_NOFACESEL 0x00080000L
#define CF_NOSTYLESEL 0x00100000L
#define CF_NOSIZESEL 0x00200000L
#define CF_SELECTSCRIPT 0x00400000L
#define CF_NOSCRIPTSEL 0x00800000L
#define CF_NOVERTFONTS 0x01000000L
#define CF_NOSIMULATIONS __MSABI_LONG(0x00001000)
#define CF_LIMITSIZE __MSABI_LONG(0x00002000)
#define CF_FIXEDPITCHONLY __MSABI_LONG(0x00004000)
#define CF_WYSIWYG __MSABI_LONG(0x00008000) /* use with CF_SCREENFONTS & CF_PRINTERFONTS */
#define CF_FORCEFONTEXIST __MSABI_LONG(0x00010000)
#define CF_SCALABLEONLY __MSABI_LONG(0x00020000)
#define CF_TTONLY __MSABI_LONG(0x00040000)
#define CF_NOFACESEL __MSABI_LONG(0x00080000)
#define CF_NOSTYLESEL __MSABI_LONG(0x00100000)
#define CF_NOSIZESEL __MSABI_LONG(0x00200000)
#define CF_SELECTSCRIPT __MSABI_LONG(0x00400000)
#define CF_NOSCRIPTSEL __MSABI_LONG(0x00800000)
#define CF_NOVERTFONTS __MSABI_LONG(0x01000000)
#define SIMULATED_FONTTYPE 0x8000
#define PRINTER_FONTTYPE 0x4000
......
include/ddraw.h
View file @ ad0f8b6b
......@@ -252,12 +252,12 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
#define DDGBS_ISBLTDONE 0x00000002
/* dwFlags for IDirectDrawSurface7::GetFlipStatus */
#define DDGFS_CANFLIP 1L
#define DDGFS_ISFLIPDONE 2L
#define DDGFS_CANFLIP __MSABI_LONG(1)
#define DDGFS_ISFLIPDONE __MSABI_LONG(2)
/* dwFlags for IDirectDrawSurface7::SetPrivateData */
#define DDSPD_IUNKNOWNPOINTER 1L
#define DDSPD_VOLATILE 2L
#define DDSPD_IUNKNOWNPOINTER __MSABI_LONG(1)
#define DDSPD_VOLATILE __MSABI_LONG(2)
/* DDSCAPS.dwCaps */
/* reserved1, was 3d capable */
......@@ -1086,8 +1086,8 @@ DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX)
#define DDENUM_NONDISPLAYDEVICES 0x00000004
/* flags for DirectDrawCreate or IDirectDraw::Initialize */
#define DDCREATE_HARDWAREONLY 1L
#define DDCREATE_EMULATIONONLY 2L
#define DDCREATE_HARDWAREONLY __MSABI_LONG(1)
#define DDCREATE_EMULATIONONLY __MSABI_LONG(2)
typedef struct _DDBLTFX
{
......
include/dxerr8.h
View file @ ad0f8b6b
......@@ -40,7 +40,7 @@ HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTRACE_ERR(str,hr) DXTrace(__FILE__, (DWORD)__LINE__, hr, str, TRUE)
#define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace(__FILE__, (DWORD)__LINE__, hr, str, FALSE)
#else
#define DXTRACE_MSG(str) (0L)
#define DXTRACE_MSG(str) __MSABI_LONG(0)
#define DXTRACE_ERR(str,hr) (hr)
#define DXTRACE_ERR_NOMSGBOX(str,hr) (hr)
#endif
......
include/dxerr9.h
View file @ ad0f8b6b
......@@ -40,7 +40,7 @@ HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCH
#define DXTRACE_ERR(str,hr) DXTrace(__FILE__, (DWORD)__LINE__, hr, str, TRUE)
#define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace(__FILE__, (DWORD)__LINE__, hr, str, FALSE)
#else
#define DXTRACE_MSG(str) (0L)
#define DXTRACE_MSG(str) __MSABI_LONG(0)
#define DXTRACE_ERR(str,hr) (hr)
#define DXTRACE_ERR_NOMSGBOX(str,hr) (hr)
#endif
......
include/dxfile.h
View file @ ad0f8b6b
......@@ -34,11 +34,11 @@ typedef DWORD DXFILEFORMAT;
typedef DWORD DXFILELOADOPTIONS;
#define DXFILELOAD_FROMFILE 0x00L
#define DXFILELOAD_FROMRESOURCE 0x01L
#define DXFILELOAD_FROMMEMORY 0x02L
#define DXFILELOAD_FROMSTREAM 0x04L
#define DXFILELOAD_FROMURL 0x08L
#define DXFILELOAD_FROMFILE __MSABI_LONG(0x00)
#define DXFILELOAD_FROMRESOURCE __MSABI_LONG(0x01)
#define DXFILELOAD_FROMMEMORY __MSABI_LONG(0x02)
#define DXFILELOAD_FROMSTREAM __MSABI_LONG(0x04)
#define DXFILELOAD_FROMURL __MSABI_LONG(0x08)
typedef struct _DXFILELOADRESOURCE {
HMODULE hModule;
......
include/fci.h
View file @ ad0f8b6b
......@@ -50,7 +50,7 @@ typedef struct {
/**********************************************************************/
#define CB_MAX_CHUNK 32768U
#define CB_MAX_DISK 0x7fffffffL
#define CB_MAX_DISK __MSABI_LONG(0x7fffffff)
#define CB_MAX_FILENAME 256
#define CB_MAX_CABINET_NAME 256
#define CB_MAX_CAB_PATH 256
......
include/fdi.h
View file @ ad0f8b6b
......@@ -48,7 +48,7 @@ typedef struct {
/**********************************************************************/
#define CB_MAX_CHUNK 32768U
#define CB_MAX_DISK 0x7fffffffL
#define CB_MAX_DISK __MSABI_LONG(0x7fffffff)
#define CB_MAX_FILENAME 256
#define CB_MAX_CABINET_NAME 256
#define CB_MAX_CAB_PATH 256
......
include/mciavi.h
View file @ ad0f8b6b
......@@ -16,21 +16,21 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define MCI_MCIAVI_PLAY_WINDOW 0x01000000L
#define MCI_MCIAVI_PLAY_FULLSCREEN 0x02000000L
#define MCI_MCIAVI_PLAY_FULLBY2 0x04000000L
#define MCI_MCIAVI_PLAY_WINDOW __MSABI_LONG(0x01000000)
#define MCI_MCIAVI_PLAY_FULLSCREEN __MSABI_LONG(0x02000000)
#define MCI_MCIAVI_PLAY_FULLBY2 __MSABI_LONG(0x04000000)
#define MCI_AVI_STATUS_FRAMES_SKIPPED 0x8001L
#define MCI_AVI_STATUS_FRAMES_SKIPPED __MSABI_LONG(0x8001)
#define MCI_AVI_STATUS_LAST_PLAY_SPEED 0x8002L
#define MCI_AVI_STATUS_LAST_PLAY_SPEED __MSABI_LONG(0x8002)
#define MCI_AVI_STATUS_AUDIO_BREAKS 0x8003L
#define MCI_AVI_STATUS_AUDIO_BREAKS __MSABI_LONG(0x8003)
#define MCI_AVI_SETVIDEO_DRAW_PROCEDURE 0x8000L
#define MCI_AVI_SETVIDEO_DRAW_PROCEDURE __MSABI_LONG(0x8000)
#define MCI_AVI_SETVIDEO_PALETTE_COLOR 0x8100L
#define MCI_AVI_SETVIDEO_PALETTE_COLOR __MSABI_LONG(0x8100)
#define MCI_AVI_SETVIDEO_PALETTE_HALFTONE 0x0000FFFFL
#define MCI_AVI_SETVIDEO_PALETTE_HALFTONE __MSABI_LONG(0x0000FFFF)
#define MCIERR_AVI_OLDAVIFORMAT (MCIERR_CUSTOM_DRIVER_BASE + 100)
#define MCIERR_AVI_NOTINTERLEAVED (MCIERR_CUSTOM_DRIVER_BASE + 101)
......
include/msi.h
View file @ ad0f8b6b
......@@ -195,16 +195,16 @@ typedef enum tagMSIINSTALLCONTEXT
typedef enum tagMSISOURCETYPE
{
MSISOURCETYPE_UNKNOWN = 0x00000000L,
MSISOURCETYPE_NETWORK = 0x00000001L,
MSISOURCETYPE_URL = 0x00000002L,
MSISOURCETYPE_MEDIA = 0x00000004
MSISOURCETYPE_UNKNOWN = __MSABI_LONG(0x00000000),
MSISOURCETYPE_NETWORK = __MSABI_LONG(0x00000001),
MSISOURCETYPE_URL = __MSABI_LONG(0x00000002),
MSISOURCETYPE_MEDIA = __MSABI_LONG(0x00000004)
} MSISOURCETYPE;
typedef enum tagMSICODE
{
MSICODE_PRODUCT = 0x00000000L,
MSICODE_PATCH = 0x40000000L
MSICODE_PRODUCT = __MSABI_LONG(0x00000000),
MSICODE_PATCH = __MSABI_LONG(0x40000000)
} MSICODE;
typedef enum tagINSTALLFEATUREATTRIBUTE
......
include/ntddstor.h
View file @ ad0f8b6b
......@@ -107,9 +107,9 @@ typedef struct _TAPE_GET_STATISTICS {
ULONG Operation;
} TAPE_GET_STATISTICS, *PTAPE_GET_STATISTICS;
#define TAPE_RETURN_STATISTICS 0L
#define TAPE_RETURN_ENV_INFO 1L
#define TAPE_RESET_STATISTICS 2L
#define TAPE_RETURN_STATISTICS __MSABI_LONG(0)
#define TAPE_RETURN_ENV_INFO __MSABI_LONG(1)
#define TAPE_RESET_STATISTICS __MSABI_LONG(2)
typedef enum _STORAGE_MEDIA_TYPE {
/* see also defines in ntdddisk.h */
......
include/ntsecapi.h
View file @ ad0f8b6b
......@@ -24,19 +24,19 @@ extern "C" {
#endif /* defined(__cplusplus) */
/* Policy access rights */
#define POLICY_VIEW_LOCAL_INFORMATION 0x00000001L
#define POLICY_VIEW_AUDIT_INFORMATION 0x00000002L
#define POLICY_GET_PRIVATE_INFORMATION 0x00000004L
#define POLICY_TRUST_ADMIN 0x00000008L
#define POLICY_CREATE_ACCOUNT 0x00000010L
#define POLICY_CREATE_SECRET 0x00000020L
#define POLICY_CREATE_PRIVILEGE 0x00000040L
#define POLICY_SET_DEFAULT_QUOTA_LIMITS 0x00000080L
#define POLICY_SET_AUDIT_REQUIREMENTS 0x00000100L
#define POLICY_AUDIT_LOG_ADMIN 0x00000200L
#define POLICY_SERVER_ADMIN 0x00000400L
#define POLICY_LOOKUP_NAMES 0x00000800L
#define POLICY_NOTIFICATION 0x00001000L
#define POLICY_VIEW_LOCAL_INFORMATION __MSABI_LONG(0x00000001)
#define POLICY_VIEW_AUDIT_INFORMATION __MSABI_LONG(0x00000002)
#define POLICY_GET_PRIVATE_INFORMATION __MSABI_LONG(0x00000004)
#define POLICY_TRUST_ADMIN __MSABI_LONG(0x00000008)
#define POLICY_CREATE_ACCOUNT __MSABI_LONG(0x00000010)
#define POLICY_CREATE_SECRET __MSABI_LONG(0x00000020)
#define POLICY_CREATE_PRIVILEGE __MSABI_LONG(0x00000040)
#define POLICY_SET_DEFAULT_QUOTA_LIMITS __MSABI_LONG(0x00000080)
#define POLICY_SET_AUDIT_REQUIREMENTS __MSABI_LONG(0x00000100)
#define POLICY_AUDIT_LOG_ADMIN __MSABI_LONG(0x00000200)
#define POLICY_SERVER_ADMIN __MSABI_LONG(0x00000400)
#define POLICY_LOOKUP_NAMES __MSABI_LONG(0x00000800)
#define POLICY_NOTIFICATION __MSABI_LONG(0x00001000)
#define POLICY_ALL_ACCESS ( \
STANDARD_RIGHTS_REQUIRED | \
......@@ -75,10 +75,10 @@ extern "C" {
POLICY_VIEW_LOCAL_INFORMATION | \
POLICY_LOOKUP_NAMES)
#define POLICY_AUDIT_EVENT_UNCHANGED 0x00000000L
#define POLICY_AUDIT_EVENT_SUCCESS 0x00000001L
#define POLICY_AUDIT_EVENT_FAILURE 0x00000002L
#define POLICY_AUDIT_EVENT_NONE 0x00000004L
#define POLICY_AUDIT_EVENT_UNCHANGED __MSABI_LONG(0x00000000)
#define POLICY_AUDIT_EVENT_SUCCESS __MSABI_LONG(0x00000001)
#define POLICY_AUDIT_EVENT_FAILURE __MSABI_LONG(0x00000002)
#define POLICY_AUDIT_EVENT_NONE __MSABI_LONG(0x00000004)
#define POLICY_AUDIT_EVENT_MASK (POLICY_AUDIT_EVENT_SUCCESS | \
POLICY_AUDIT_EVENT_FAILURE | \
......
include/ole2.h
View file @ ad0f8b6b
......@@ -35,14 +35,14 @@ extern "C" {
#define E_DRAW VIEW_E_DRAW
#define DATA_E_FORMATETC DV_E_FORMATETC
#define OLEIVERB_PRIMARY (0L)
#define OLEIVERB_SHOW (-1L)
#define OLEIVERB_OPEN (-2L)
#define OLEIVERB_HIDE (-3L)
#define OLEIVERB_UIACTIVATE (-4L)
#define OLEIVERB_INPLACEACTIVATE (-5L)
#define OLEIVERB_DISCARDUNDOSTATE (-6L)
#define OLEIVERB_PROPERTIES (-7L)
#define OLEIVERB_PRIMARY (__MSABI_LONG(0))
#define OLEIVERB_SHOW (__MSABI_LONG(-1))
#define OLEIVERB_OPEN (__MSABI_LONG(-2))
#define OLEIVERB_HIDE (__MSABI_LONG(-3))
#define OLEIVERB_UIACTIVATE (__MSABI_LONG(-4))
#define OLEIVERB_INPLACEACTIVATE (__MSABI_LONG(-5))
#define OLEIVERB_DISCARDUNDOSTATE (__MSABI_LONG(-6))
#define OLEIVERB_PROPERTIES (__MSABI_LONG(-7))
#define EMBDHLP_INPROC_HANDLER 0x00000000
#define EMBDHLP_INPROC_SERVER 0x00000001
......
include/olectl.h
View file @ ad0f8b6b
......@@ -328,7 +328,7 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
#define VT_VERBOSE_ENUM 76
#ifndef OLEIVERB_PROPERTIES
#define OLEIVERB_PROPERTIES (-7L)
#define OLEIVERB_PROPERTIES (__MSABI_LONG(-7))
#endif
#define PERPROP_E_FIRST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x0200)
......
include/shlobj.h
View file @ ad0f8b6b
......@@ -95,9 +95,9 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*);
#define KF_FLAG_DONT_VERIFY 0x00004000
#define KF_FLAG_CREATE 0x00008000
#define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */
#define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */
#define SHFMT_NOFORMAT 0xFFFFFFFDL /* Drive is not formattable */
#define SHFMT_ERROR __MSABI_LONG(0xFFFFFFFF) /* Error on last format, drive may be formattable */
#define SHFMT_CANCEL __MSABI_LONG(0xFFFFFFFE) /* Last format was cancelled */
#define SHFMT_NOFORMAT __MSABI_LONG(0xFFFFFFFD) /* Drive is not formattable */
/* SHFormatDrive flags */
#define SHFMT_ID_DEFAULT 0xFFFF
......@@ -705,9 +705,9 @@ DECLARE_INTERFACE_(IProgressDialog,IUnknown)
/****************************************************************************
* SHAddToRecentDocs API
*/
#define SHARD_PIDL 0x00000001L
#define SHARD_PATHA 0x00000002L
#define SHARD_PATHW 0x00000003L
#define SHARD_PIDL __MSABI_LONG(0x00000001)
#define SHARD_PATHA __MSABI_LONG(0x00000002)
#define SHARD_PATHW __MSABI_LONG(0x00000003)
#define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH)
void WINAPI SHAddToRecentDocs(UINT,LPCVOID);
......@@ -1302,9 +1302,9 @@ typedef struct _SHChangeNotifyEntry
#define SHCNE_ALLEVENTS 0x7FFFFFFF
#define SHCNE_INTERRUPT 0x80000000
#define SHCNEE_ORDERCHANGED 0x0002L
#define SHCNEE_MSI_CHANGE 0x0004L
#define SHCNEE_MSI_UNINSTALL 0x0005L
#define SHCNEE_ORDERCHANGED __MSABI_LONG(0x0002)
#define SHCNEE_MSI_CHANGE __MSABI_LONG(0x0004)
#define SHCNEE_MSI_UNINSTALL __MSABI_LONG(0x0005)
#define SHCNF_IDLIST 0x0000
#define SHCNF_PATHA 0x0001
......
include/t2embapi.h
View file @ ad0f8b6b
......@@ -24,8 +24,8 @@ extern "C" {
#endif
/* Possible return values. */
#define E_NONE 0x0000L
#define E_API_NOTIMPL 0x0001L
#define E_NONE __MSABI_LONG(0x0000)
#define E_API_NOTIMPL __MSABI_LONG(0x0001)
typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG);
typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG);
......
include/wincrypt.h
View file @ ad0f8b6b
......@@ -526,7 +526,7 @@ typedef struct _CRL_DIST_POINTS_INFO {
#define GET_CRL_DIST_POINT_ERR_INDEX(x) \
(((x) >> CRL_DIST_POINT_ERR_INDEX_SHIFT) & CRL_DIST_POINT_ERR_INDEX_MASK)
#define CRL_DIST_POINT_ERR_CRL_ISSUER_BIT 0x80000000L
#define CRL_DIST_POINT_ERR_CRL_ISSUER_BIT __MSABI_LONG(0x80000000)
#define IS_CRL_DIST_POINT_ERR_CRL_ISSUER(x) \
((x) & CRL_DIST_POINT_ERR_CRL_ISSUER_BIT)
......@@ -569,7 +569,7 @@ typedef struct _CERT_NAME_CONSTRAINTS_INFO {
PCERT_GENERAL_SUBTREE rgExcludedSubtree;
} CERT_NAME_CONSTRAINTS_INFO, *PCERT_NAME_CONSTRAINTS_INFO;
#define CERT_EXCLUDED_SUBTREE_BIT 0x80000000L
#define CERT_EXCLUDED_SUBTREE_BIT __MSABI_LONG(0x80000000)
#define IS_CERT_EXCLUDED_SUBTREE(x) ((x) & CERT_EXCLUDED_SUBTREE_BIT)
typedef struct _CRYPT_ATTRIBUTE {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment