Commit afddcfdb authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Added various type and macro definitions that are needed to compile

the latest MFC.
parent 96d920fd
...@@ -3091,12 +3091,15 @@ typedef struct tagTCITEMW ...@@ -3091,12 +3091,15 @@ typedef struct tagTCITEMW
#define CBEM_SETITEMA (WM_USER+5) #define CBEM_SETITEMA (WM_USER+5)
#define CBEM_SETITEMW (WM_USER+12) #define CBEM_SETITEMW (WM_USER+12)
#define CBEM_SETITEM WINELIB_NAME_AW(CBEM_SETITEM) #define CBEM_SETITEM WINELIB_NAME_AW(CBEM_SETITEM)
#define CBEM_DELETEITEM CB_DELETESTRING
#define CBEM_GETCOMBOCONTROL (WM_USER+6) #define CBEM_GETCOMBOCONTROL (WM_USER+6)
#define CBEM_GETEDITCONTROL (WM_USER+7) #define CBEM_GETEDITCONTROL (WM_USER+7)
#define CBEM_SETEXSTYLE (WM_USER+8) #define CBEM_SETEXSTYLE (WM_USER+8)
#define CBEM_GETEXSTYLE (WM_USER+9) #define CBEM_GETEXSTYLE (WM_USER+9)
#define CBEM_GETEXTENDEDSTYLE (WM_USER+9) #define CBEM_GETEXTENDEDSTYLE (WM_USER+9)
#define CBEM_SETEXTENDEDSTYLE (WM_USER+14) #define CBEM_SETEXTENDEDSTYLE (WM_USER+14)
#define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
#define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
#define CBEM_HASEDITCHANGED (WM_USER+10) #define CBEM_HASEDITCHANGED (WM_USER+10)
#define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
#define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
......
...@@ -34,6 +34,8 @@ extern "C" { ...@@ -34,6 +34,8 @@ extern "C" {
#define OFN_EXPLORER 0x00080000 #define OFN_EXPLORER 0x00080000
#define OFN_NODEREFERENCELINKS 0x00100000 #define OFN_NODEREFERENCELINKS 0x00100000
#define OFN_LONGNAMES 0x00200000 #define OFN_LONGNAMES 0x00200000
#define OFN_ENABLEINCLUDENOTIFY 0x00400000
#define OFN_ENABLESIZING 0x00800000
/* WINE internal flags */ /* WINE internal flags */
#define OFN_UNICODE 0x40000000 /*to differ between 32W/A hook*/ #define OFN_UNICODE 0x40000000 /*to differ between 32W/A hook*/
......
...@@ -526,5 +526,9 @@ HRESULT WINAPI DispCallFunc(void* pvInstance, ULONG oVft, CALLCONV cc, ...@@ -526,5 +526,9 @@ HRESULT WINAPI DispCallFunc(void* pvInstance, ULONG oVft, CALLCONV cc,
VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt,
VARIANTARG** prgpvarg, VARIANT* pvargResult); VARIANTARG** prgpvarg, VARIANT* pvargResult);
#define VARCMP_LT 0
#define VARCMP_EQ 1
#define VARCMP_GT 2
#define VARCMP_NULL 3
#endif /*__WINE_OLEAUTO_H*/ #endif /*__WINE_OLEAUTO_H*/
...@@ -432,6 +432,9 @@ typedef struct ...@@ -432,6 +432,9 @@ typedef struct
#define LPTR (LMEM_FIXED | LMEM_ZEROINIT) #define LPTR (LMEM_FIXED | LMEM_ZEROINIT)
#define LHND (LMEM_MOVEABLE | LMEM_ZEROINIT) #define LHND (LMEM_MOVEABLE | LMEM_ZEROINIT)
#define NONZEROLHND (LMEM_MOVEABLE)
#define NONZEROLPTR (LMEM_FIXED)
#define GMEM_FIXED 0x0000 #define GMEM_FIXED 0x0000
#define GMEM_MOVEABLE 0x0002 #define GMEM_MOVEABLE 0x0002
#define GMEM_NOCOMPACT 0x0010 #define GMEM_NOCOMPACT 0x0010
......
...@@ -32,6 +32,10 @@ extern int WIN32_LastError; ...@@ -32,6 +32,10 @@ extern int WIN32_LastError;
#define HRESULT_FACILITY(hr) (((hr) >> 16) & 0x1FFF) #define HRESULT_FACILITY(hr) (((hr) >> 16) & 0x1FFF)
#define SCODE_FACILITY(sc) (((sc) >> 16) & 0x1FFF) #define SCODE_FACILITY(sc) (((sc) >> 16) & 0x1FFF)
#define FACILITY_NT_BIT 0x10000000
#define HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 )
#define HRESULT_FROM_NT(x) ((HRESULT) ((x) | FACILITY_NT_BIT))
/* SCODE <-> HRESULT functions */ /* SCODE <-> HRESULT functions */
/* This macros is obsolete and should not be used in new apps. */ /* This macros is obsolete and should not be used in new apps. */
#define GetScode(hr) ((SCODE)(hr)) #define GetScode(hr) ((SCODE)(hr))
......
...@@ -102,13 +102,30 @@ typedef enum tagCLSCTX ...@@ -102,13 +102,30 @@ typedef enum tagCLSCTX
CLSCTX_REMOTE_SERVER = 0x10, CLSCTX_REMOTE_SERVER = 0x10,
CLSCTX_INPROC_HANDLER16 = 0x20, CLSCTX_INPROC_HANDLER16 = 0x20,
CLSCTX_INPROC_SERVERX86 = 0x40, CLSCTX_INPROC_SERVERX86 = 0x40,
CLSCTX_INPROC_HANDLERX86 = 0x80 CLSCTX_INPROC_HANDLERX86 = 0x80,
CLSCTX_ESERVER_HANDLER = 0x100
} CLSCTX; } CLSCTX;
#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER) #define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER)
#define CLSCTX_ALL (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER) #define CLSCTX_ALL (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
#define CLSCTX_SERVER (CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER) #define CLSCTX_SERVER (CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
typedef enum tagMSHLFLAGS
{
MSHLFLAGS_NORMAL = 0,
MSHLFLAGS_TABLESTRONG = 1,
MSHLFLAGS_TABLEWEAK = 2,
MSHLFLAGS_NOPING = 4
} MSHLFLAGS;
typedef enum tagMSHCTX
{
MSHCTX_LOCAL = 0,
MSHCTX_NOSHAREDMEM = 1,
MSHCTX_DIFFERENTMACHINE = 2,
MSHCTX_INPROC = 3
} MSHCTX;
typedef unsigned short VARTYPE; typedef unsigned short VARTYPE;
typedef ULONG PROPID; typedef ULONG PROPID;
......
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