diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-07-20 04:18:31 +0400 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-07-20 04:18:31 +0400 |
| commit | 2af268382aeb3fff60dfe52ef8d001f9a6bd0288 (patch) | |
| tree | 8f1e0b2b3de3d6f80c21829849e162b4b7cdb929 /winsup/w32api | |
| parent | 2693eddb3291848e0c2193f01d2ffb16639d08a8 (diff) | |
2010-07-17 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/winnt.h (HEAP_MAKE_TAG_FLAGS, VALID_INHERIT_FLAGS): Correct
definition.
* include/rpcndr.h (NdrUnMarshConfStringHdr, NdrUnMarshCCtxtHdl,
NdrMarshSCtxtHdl): Ditto.
* include/basetyps.h (REFGUID, REFIID, REFCLSID, REFFMTID): Remove macro
definition in favour of typedef definition.
Thank you to Yuta Tomino for reporting the issues.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 11 | ||||
| -rw-r--r-- | winsup/w32api/include/basetyps.h | 17 | ||||
| -rw-r--r-- | winsup/w32api/include/rpcndr.h | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 4 |
4 files changed, 16 insertions, 22 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 31f456468..159ec8321 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,14 @@ +2010-07-17 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + + * include/winnt.h (HEAP_MAKE_TAG_FLAGS, VALID_INHERIT_FLAGS): Correct + definition. + * include/rpcndr.h (NdrUnMarshConfStringHdr, NdrUnMarshCCtxtHdl, + NdrMarshSCtxtHdl): Ditto. + * include/basetyps.h (REFGUID, REFIID, REFCLSID, REFFMTID): Remove macro + definition in favour of typedef definition. + + Thank you to Yuta Tomino for reporting the issues. + 2010-07-08 Markus Koenig <basilo@users.sourceforge.net> * include/gdiplus.h: New file. diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h index b644bdf6f..d9c9a03a4 100644 --- a/winsup/w32api/include/basetyps.h +++ b/winsup/w32api/include/basetyps.h @@ -139,23 +139,6 @@ typedef unsigned long error_status_t; #define uuid_t UUID typedef unsigned long PROPID; -#ifndef _REFGUID_DEFINED -#if defined (__cplusplus) && !defined (CINTERFACE) -#define REFGUID const GUID& -#define REFIID const IID& -#define REFCLSID const CLSID& -#define REFFMTID const FMTID& -#else -#define REFGUID const GUID* const -#define REFIID const IID* const -#define REFCLSID const CLSID* const -#define REFFMTID const FMTID* const -#endif -#define _REFGUID_DEFINED -#define _REFIID_DEFINED -#define _REFCLSID_DEFINED -#define _REFFMTID_DEFINED -#endif #ifndef GUID_SECTION #define GUID_SECTION ".text" #endif diff --git a/winsup/w32api/include/rpcndr.h b/winsup/w32api/include/rpcndr.h index 95d188abc..7442def82 100644 --- a/winsup/w32api/include/rpcndr.h +++ b/winsup/w32api/include/rpcndr.h @@ -79,11 +79,11 @@ typedef unsigned char boolean; #define _midl_advmp( mp ) *(*(unsigned long **)&mp)++ #define _midl_unmarsh_up( p ) (*(*(unsigned long **)&p)++) #define NdrMarshConfStringHdr( p, s, l ) (_midl_ma4( p, unsigned long) = s, _midl_ma4( p, unsigned long) = 0, _midl_ma4( p, unsigned long) = l) -#define NdrUnMarshConfStringHdr(p, s, l) ((s=_midl_unma4(p,unsigned long), (_midl_addp(p,4)), (l=_midl_unma4(p,unsigned long)) +#define NdrUnMarshConfStringHdr(p, s, l) (s=_midl_unma4(p,unsigned long), (_midl_addp(p,4)), (l=_midl_unma4(p,unsigned long))) #define NdrMarshCCtxtHdl(pc,p) (NDRCContextMarshall( (NDR_CCONTEXT)pc, p ),p+20) -#define NdrUnMarshCCtxtHdl(pc,p,h,drep) (NDRCContextUnmarshall((NDR_CONTEXT)pc,h,p,drep), p+20) +#define NdrUnMarshCCtxtHdl(pc,p,h,drep) (NDRCContextUnmarshall((NDR_CCONTEXT)pc,h,p,drep), p+20) #define NdrUnMarshSCtxtHdl(pc, p,drep) (pc = NdrSContextUnMarshall(p,drep )) -#define NdrMarshSCtxtHdl(pc,p,rd) (NdrSContextMarshall((NDR_SCONTEXT)pc,p, (NDR_RUNDOWN)rd) +#define NdrMarshSCtxtHdl(pc,p,rd) (NdrSContextMarshall((NDR_SCONTEXT)pc,p, (NDR_RUNDOWN)rd)) #define NdrFieldOffset(s,f) (long)(& (((s *)0)->f)) #define NdrFieldPad(s,f,p,t) (NdrFieldOffset(s,f) - NdrFieldOffset(s,p) - sizeof(t)) #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8) diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 65a581d61..9f8197b08 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -216,7 +216,7 @@ typedef DWORD FLONG; #define INHERIT_ONLY_ACE 8 #define INHERITED_ACE 16 #define VALID_INHERIT_FLAGS \ - | OBJECT_INHERIT_ACE \ + OBJECT_INHERIT_ACE \ | CONTAINER_INHERIT_ACE \ | NO_PROPAGATE_INHERIT_ACE \ | INHERIT_ONLY_ACE \ @@ -992,7 +992,7 @@ typedef DWORD FLONG; #define HEAP_MAXIMUM_TAG 0xFFF #define HEAP_PSEUDO_TAG_FLAG 0x8000 #define HEAP_TAG_SHIFT 16 -#define HEAP_MAKE_TAG_FLAGS(b,o) ((DWORD)((b)+(o)<<16))) +#define HEAP_MAKE_TAG_FLAGS(b,o) ((DWORD)((b)+(o)<<16)) #define KEY_QUERY_VALUE 1 #define KEY_SET_VALUE 2 #define KEY_CREATE_SUB_KEY 4 |