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

2003-08-24 Danny Smith <dannysmith@users.sourceforge.net>

Browse Source 
* include/objidl.h (COBJMACROS): Define macros only
	if using C interace.
	* include/unknwn.h: Ditto.
	* include/comcat.h: Ditto.

2003-08-24  Filip Navara  <xnavara@volny.cz>

	* include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE,
	PSH_NOCONTEXTHELP): Define.
	(PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500.
	* include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define.
	(LPDLGTEMPLATE[AW]): Add typedefs.
This commit is contained in:
Danny Smith
2003-08-24 23:04:57 +00:00
parent c94e99621d
commit 110af2d2db
6 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/w32api/ChangeLog
View File

@@ -1,3 +1,18 @@
2003-08-24 Danny Smith <dannysmith@users.sourceforge.net>
* include/objidl.h (COBJMACROS): Define macros only
if using C interace.
* include/unknwn.h: Ditto.
* include/comcat.h: Ditto.
2003-08-24 Filip Navara <xnavara@volny.cz>
* include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE,
PSH_NOCONTEXTHELP): Define.
(PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500.
* include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define.
(LPDLGTEMPLATE[AW]): Add typedefs.
2003-08-22 Filip Navara <xnavara@volny.cz>
* include/aclapi.h (BuildImpersonateExplicitAccessWithName[AW]):

12
winsup/w32api/include/comcat.h
View File

@@ -31,7 +31,8 @@ DECLARE_INTERFACE_(IEnumGUID,IUnknown)
STDMETHOD(Clone)(THIS_ LPENUMGUID*) PURE;
};
#undef INTERFACE
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IEnumGUID_Release(p) (p)->lpVtbl->Release(p)
@@ -103,7 +104,8 @@ DECLARE_INTERFACE_(ICatInformation,IUnknown)
STDMETHOD(EnumReqCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE;
};
#undef INTERFACE
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p)
#define ICatInformation_Release(p) (p)->lpVtbl->Release(p)
@@ -129,7 +131,8 @@ DECLARE_INTERFACE_(ICatRegister,IUnknown)
STDMETHOD(UnRegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE;
};
#undef INTERFACE
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p)
#define ICatRegister_Release(p) (p)->lpVtbl->Release(p)
@@ -155,7 +158,8 @@ DECLARE_INTERFACE_(IEnumCATEGORYINFO,IUnknown)
STDMETHOD(Clone)(THIS_ LPENUMCATEGORYINFO*) PURE;
};
#undef INTERFACE
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IEnumCATEGORYINFO_Release(p) (p)->lpVtbl->Release(p)

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

@@ -1410,7 +1410,9 @@ HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Proxy(ILockBytes*,ULARGE_INTEGER,voi
HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,const void*,ULONG,ULONG*);
HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define IMarshal_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
#define IMarshal_AddRef(This) (This)->lpVtbl->AddRef(This)
#define IMarshal_Release(This) (This)->lpVtbl->Release(This)

11
winsup/w32api/include/prsht.h
View File

@@ -31,6 +31,7 @@ extern "C" {
#define PSH_USEHICON 2
#define PSH_USEICONID 4
#define PSH_PROPSHEETPAGE 8
#define PSH_WIZARDHASFINISH 16
#define PSH_WIZARD 32
#define PSH_USEPSTARTPAGE 64
#define PSH_NOAPPLYNOW 128
@@ -40,7 +41,6 @@ extern "C" {
#define PSH_RTLREADING 2048
#define PSH_WIZARDCONTEXTHELP 4096
#if (_WIN32_IE >= 0x0400)
#define PSH_WIZARD97 8192
#define PSH_WATERMARK 32768
#define PSH_USEHBMWATERMARK 65536
#define PSH_USEHPLWATERMARK 131072
@@ -48,6 +48,15 @@ extern "C" {
#define PSH_HEADER 524288
#define PSH_USEHBMHEADER 1048576
#define PSH_USEPAGELANG 2097152
#if (_WIN32_IE < 0x0500)
#define PSH_WIZARD97 0x00002000
#else
#define PSH_WIZARD97 0x01000000
#endif
#endif /* _WIN32_IE >= 0x0400 */
#if (_WIN32_IE >= 0x0500)
#define PSH_WIZARD_LITE 0x400000
#define PSH_NOCONTEXTHELP 0x2000000
#endif
#define PSCB_INITIALIZED 1
#define PSCB_PRECREATE 2

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

@@ -58,7 +58,9 @@ HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Proxy(IClassFactory*,IUnk
HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Stub(IClassFactory*,REFIID,IUnknown**);
HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Proxy(IClassFactory*,BOOL);
HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Stub(IClassFactory*,BOOL);
#ifdef COBJMACROS
#if (!defined (__cplusplus) || defined (CINTERFACE)) \
&& defined (COBJMACROS)
#define IUnknown_QueryInterface(T,r,O) (T)->lpVtbl->QueryInterface(T,r,O)
#define IUnknown_AddRef(T) (T)->lpVtbl->AddRef(T)
#define IUnknown_Release(T) (T)->lpVtbl->Release(T)
@@ -67,7 +69,7 @@ HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Stub(IClassFactory*,BOOL);
#define IClassFactory_Release(T) (T)->lpVtbl->Release(T)
#define IClassFactory_CreateInstance(T,p,r,O) (T)->lpVtbl->CreateInstance(T,p,r,O)
#define IClassFactory_LockServer(T,f) (T)->lpVtbl->LockServer(T,f)
#endif
#endif /* COBJMACROS */
#ifdef __cplusplus
}
#endif

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

@@ -451,6 +451,10 @@ extern "C" {
#define DFCS_INACTIVE 256
#define DFCS_PUSHED 512
#define DFCS_CHECKED 1024
#if (WINVER >= _W2K)
#define DFCS_TRANSPARENT 0x800
#define DFCS_HOT 0x1000
#endif /* WINVER >= _W2K */
#define DFCS_ADJUSTRECT 0x2000
#define DFCS_FLAT 0x4000
#define DFCS_MONO 0x8000
@@ -2176,7 +2180,7 @@ typedef struct {
short y;
short cx;
short cy;
} DLGTEMPLATE,*LPDLGTEMPLATE;
} DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW;
typedef const DLGTEMPLATE *LPCDLGTEMPLATE;
#pragma pack(pop)
typedef struct tagDRAWITEMSTRUCT {