Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (oledlg.h).
Alexandre Julliard
julliard at winehq.org
Fri Nov 4 12:17:34 CDT 2011
Module: wine
Branch: master
Commit: 232bf4cf318fe417e66fa639c2ea0c990eae136e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=232bf4cf318fe417e66fa639c2ea0c990eae136e
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Nov 3 23:59:47 2011 +0100
include: Make "long" numeric constants LP64/LLP64 proof (oledlg.h).
---
include/oledlg.h | 112 +++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/include/oledlg.h b/include/oledlg.h
index 29fff5a..29f842f 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -197,20 +197,20 @@ DECL_WINELIB_TYPE_AW(OLEUIINSERTOBJECT)
DECL_WINELIB_TYPE_AW(POLEUIINSERTOBJECT)
DECL_WINELIB_TYPE_AW(LPOLEUIINSERTOBJECT)
-#define IOF_SHOWHELP 0x00000001L
-#define IOF_SELECTCREATENEW 0x00000002L
-#define IOF_SELECTCREATEFROMFILE 0x00000004L
-#define IOF_CHECKLINK 0x00000008L
-#define IOF_CHECKDISPLAYASICON 0x00000010L
-#define IOF_CREATENEWOBJECT 0x00000020L
-#define IOF_CREATEFILEOBJECT 0x00000040L
-#define IOF_CREATELINKOBJECT 0x00000080L
-#define IOF_DISABLELINK 0x00000100L
-#define IOF_VERIFYSERVERSEXIST 0x00000200L
-#define IOF_DISABLEDISPLAYASICON 0x00000400L
-#define IOF_HIDECHANGEICON 0x00000800L
-#define IOF_SHOWINSERTCONTROL 0x00001000L
-#define IOF_SELECTCREATECONTROL 0x00002000L
+#define IOF_SHOWHELP __MSABI_LONG(0x00000001)
+#define IOF_SELECTCREATENEW __MSABI_LONG(0x00000002)
+#define IOF_SELECTCREATEFROMFILE __MSABI_LONG(0x00000004)
+#define IOF_CHECKLINK __MSABI_LONG(0x00000008)
+#define IOF_CHECKDISPLAYASICON __MSABI_LONG(0x00000010)
+#define IOF_CREATENEWOBJECT __MSABI_LONG(0x00000020)
+#define IOF_CREATEFILEOBJECT __MSABI_LONG(0x00000040)
+#define IOF_CREATELINKOBJECT __MSABI_LONG(0x00000080)
+#define IOF_DISABLELINK __MSABI_LONG(0x00000100)
+#define IOF_VERIFYSERVERSEXIST __MSABI_LONG(0x00000200)
+#define IOF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000400)
+#define IOF_HIDECHANGEICON __MSABI_LONG(0x00000800)
+#define IOF_SHOWINSERTCONTROL __MSABI_LONG(0x00001000)
+#define IOF_SELECTCREATECONTROL __MSABI_LONG(0x00002000)
/*****************************************************************************
* CONVERT DIALOG
@@ -271,15 +271,15 @@ DECL_WINELIB_TYPE_AW(OLEUICONVERT)
DECL_WINELIB_TYPE_AW(POLEUICONVERT)
DECL_WINELIB_TYPE_AW(LPOLEUICONVERT)
-#define CF_SHOWHELPBUTTON 0x00000001L
-#define CF_SETCONVERTDEFAULT 0x00000002L
-#define CF_SETACTIVATEDEFAULT 0x00000004L
-#define CF_SELECTCONVERTTO 0x00000008L
-#define CF_SELECTACTIVATEAS 0x00000010L
-#define CF_DISABLEDISPLAYASICON 0x00000020L
-#define CF_DISABLEACTIVATEAS 0x00000040L
-#define CF_HIDECHANGEICON 0x00000080L
-#define CF_CONVERTONLY 0x00000100L
+#define CF_SHOWHELPBUTTON __MSABI_LONG(0x00000001)
+#define CF_SETCONVERTDEFAULT __MSABI_LONG(0x00000002)
+#define CF_SETACTIVATEDEFAULT __MSABI_LONG(0x00000004)
+#define CF_SELECTCONVERTTO __MSABI_LONG(0x00000008)
+#define CF_SELECTACTIVATEAS __MSABI_LONG(0x00000010)
+#define CF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000020)
+#define CF_DISABLEACTIVATEAS __MSABI_LONG(0x00000040)
+#define CF_HIDECHANGEICON __MSABI_LONG(0x00000080)
+#define CF_CONVERTONLY __MSABI_LONG(0x00000100)
/*****************************************************************************
* CHANGE ICON DIALOG
@@ -323,11 +323,11 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGEICON)
DECL_WINELIB_TYPE_AW(LPOLEUICHANGEICON)
-#define CIF_SHOWHELP 0x00000001L
-#define CIF_SELECTCURRENT 0x00000002L
-#define CIF_SELECTDEFAULT 0x00000004L
-#define CIF_SELECTFROMFILE 0x00000008L
-#define CIF_USEICONEXE 0x00000010L
+#define CIF_SHOWHELP __MSABI_LONG(0x00000001)
+#define CIF_SELECTCURRENT __MSABI_LONG(0x00000002)
+#define CIF_SELECTDEFAULT __MSABI_LONG(0x00000004)
+#define CIF_SELECTFROMFILE __MSABI_LONG(0x00000008)
+#define CIF_USEICONEXE __MSABI_LONG(0x00000010)
/*****************************************************************************
* PASTE SPECIAL DIALOG
@@ -425,15 +425,15 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL)
#define PS_MAXLINKTYPES 8
-#define PSF_SHOWHELP 0x00000001L
-#define PSF_SELECTPASTE 0x00000002L
-#define PSF_SELECTPASTELINK 0x00000004L
+#define PSF_SHOWHELP __MSABI_LONG(0x00000001)
+#define PSF_SELECTPASTE __MSABI_LONG(0x00000002)
+#define PSF_SELECTPASTELINK __MSABI_LONG(0x00000004)
-#define PSF_CHECKDISPLAYASICON 0x00000008L
-#define PSF_DISABLEDISPLAYASICON 0x00000010L
-#define PSF_HIDECHANGEICON 0x00000020L
-#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L
-#define PSF_NOREFRESHDATAOBJECT 0x00000080L
+#define PSF_CHECKDISPLAYASICON __MSABI_LONG(0x00000008)
+#define PSF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000010)
+#define PSF_HIDECHANGEICON __MSABI_LONG(0x00000020)
+#define PSF_STAYONCLIPBOARDCHANGE __MSABI_LONG(0x00000040)
+#define PSF_NOREFRESHDATAOBJECT __MSABI_LONG(0x00000080)
#define OLEUI_IOERR_SRCDATAOBJECTINVALID (OLEUI_ERR_STANDARDMAX+0)
#define OLEUI_IOERR_ARRPASTEENTRIESINVALID (OLEUI_ERR_STANDARDMAX+1)
@@ -462,11 +462,11 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL)
* EDIT LINKS DIALOG
*/
-#define ELF_SHOWHELP 0x00000001L
-#define ELF_DISABLEUPDATENOW 0x00000002L
-#define ELF_DISABLEOPENSOURCE 0x00000004L
-#define ELF_DISABLECHANGESOURCE 0x00000008L
-#define ELF_DISABLECANCELLINK 0x00000010L
+#define ELF_SHOWHELP __MSABI_LONG(0x00000001)
+#define ELF_DISABLEUPDATENOW __MSABI_LONG(0x00000002)
+#define ELF_DISABLEOPENSOURCE __MSABI_LONG(0x00000004)
+#define ELF_DISABLECHANGESOURCE __MSABI_LONG(0x00000008)
+#define ELF_DISABLECANCELLINK __MSABI_LONG(0x00000010)
typedef struct tagOLEUIEDITLINKSW
{
@@ -539,10 +539,10 @@ DECL_WINELIB_TYPE_AW(POLEUIBUSY)
DECL_WINELIB_TYPE_AW(LPOLEUIBUSY)
-#define BZ_DISABLECANCELBUTTON 0x00000001L
-#define BZ_DISABLESWITCHTOBUTTON 0x00000002L
-#define BZ_DISABLERETRYBUTTON 0x00000004L
-#define BZ_NOTRESPONDINGDIALOG 0x00000008L
+#define BZ_DISABLECANCELBUTTON __MSABI_LONG(0x00000001)
+#define BZ_DISABLESWITCHTOBUTTON __MSABI_LONG(0x00000002)
+#define BZ_DISABLERETRYBUTTON __MSABI_LONG(0x00000004)
+#define BZ_NOTRESPONDINGDIALOG __MSABI_LONG(0x00000008)
/***********************************************************************************
* OBJECT PROPERTIES DIALOG
@@ -609,9 +609,9 @@ DECL_WINELIB_TYPE_AW(POLEUIVIEWPROPS)
DECL_WINELIB_TYPE_AW(LPOLEUIVIEWPROPS)
-#define VPF_SELECTRELATIVE 0x00000001L
-#define VPF_DISABLERELATIVE 0x00000002L
-#define VPF_DISABLESCALE 0x00000004L
+#define VPF_SELECTRELATIVE __MSABI_LONG(0x00000001)
+#define VPF_DISABLERELATIVE __MSABI_LONG(0x00000002)
+#define VPF_DISABLESCALE __MSABI_LONG(0x00000004)
typedef struct tagOLEUILINKPROPSA
{
@@ -671,10 +671,10 @@ DECL_WINELIB_TYPE_AW(OLEUIOBJECTPROPS)
DECL_WINELIB_TYPE_AW(POLEUIOBJECTPROPS)
DECL_WINELIB_TYPE_AW(LPOLEUIOBJECTPROPS)
-#define OPF_OBJECTISLINK 0x00000001L
-#define OPF_NOFILLDEFAULT 0x00000002L
-#define OPF_SHOWHELP 0x00000004L
-#define OPF_DISABLECONVERT 0x00000008L
+#define OPF_OBJECTISLINK __MSABI_LONG(0x00000001)
+#define OPF_NOFILLDEFAULT __MSABI_LONG(0x00000002)
+#define OPF_SHOWHELP __MSABI_LONG(0x00000004)
+#define OPF_DISABLECONVERT __MSABI_LONG(0x00000008)
/************************************************************************************
@@ -731,10 +731,10 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGESOURCE)
DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE)
/* Change Source Dialog flags */
-#define CSF_SHOWHELP 0x00000001L
-#define CSF_VALIDSOURCE 0x00000002L
-#define CSF_ONLYGETSOURCE 0x00000004L
-#define CSF_EXPLORER 0x00000008L
+#define CSF_SHOWHELP __MSABI_LONG(0x00000001)
+#define CSF_VALIDSOURCE __MSABI_LONG(0x00000002)
+#define CSF_ONLYGETSOURCE __MSABI_LONG(0x00000004)
+#define CSF_EXPLORER __MSABI_LONG(0x00000008)
/*****************************************************************************
More information about the wine-cvs
mailing list