JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Chris Sutcliffe 2010-07-20 00:18:31 +00:00
parent 2693eddb32
commit 2af268382a
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/w32api/ChangeLog
View File

@ -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> 2010-07-08 Markus Koenig <basilo@users.sourceforge.net>
* include/gdiplus.h: New file. * include/gdiplus.h: New file.

17
winsup/w32api/include/basetyps.h
View File

@ -139,23 +139,6 @@ typedef unsigned long error_status_t;
#define uuid_t UUID #define uuid_t UUID
typedef unsigned long PROPID; 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 #ifndef GUID_SECTION
#define GUID_SECTION ".text" #define GUID_SECTION ".text"
#endif #endif

6
winsup/w32api/include/rpcndr.h
View File

@ -79,11 +79,11 @@ typedef unsigned char boolean;
#define _midl_advmp( mp ) *(*(unsigned long **)&mp)++ #define _midl_advmp( mp ) *(*(unsigned long **)&mp)++
#define _midl_unmarsh_up( p ) (*(*(unsigned long **)&p)++) #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 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 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 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 NdrFieldOffset(s,f) (long)(& (((s *)0)->f))
#define NdrFieldPad(s,f,p,t) (NdrFieldOffset(s,f) - NdrFieldOffset(s,p) - sizeof(t)) #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) #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8)

4
winsup/w32api/include/winnt.h
View File

@ -216,7 +216,7 @@ typedef DWORD FLONG;
#define INHERIT_ONLY_ACE 8 #define INHERIT_ONLY_ACE 8
#define INHERITED_ACE 16 #define INHERITED_ACE 16
#define VALID_INHERIT_FLAGS \ #define VALID_INHERIT_FLAGS \
| OBJECT_INHERIT_ACE \ OBJECT_INHERIT_ACE \
| CONTAINER_INHERIT_ACE \ | CONTAINER_INHERIT_ACE \
| NO_PROPAGATE_INHERIT_ACE \ | NO_PROPAGATE_INHERIT_ACE \
| INHERIT_ONLY_ACE \ | INHERIT_ONLY_ACE \
@ -992,7 +992,7 @@ typedef DWORD FLONG;
#define HEAP_MAXIMUM_TAG 0xFFF #define HEAP_MAXIMUM_TAG 0xFFF
#define HEAP_PSEUDO_TAG_FLAG 0x8000 #define HEAP_PSEUDO_TAG_FLAG 0x8000
#define HEAP_TAG_SHIFT 16 #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_QUERY_VALUE 1
#define KEY_SET_VALUE 2 #define KEY_SET_VALUE 2
#define KEY_CREATE_SUB_KEY 4 #define KEY_CREATE_SUB_KEY 4