Commit Graph

21 Commits

Author SHA1 Message Date
Danny Smith d2d223b580 * include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/basetyps.h:  Likewise.
 	(_COM_interface): New define.
	(interface): Define to _COM_interface, conditional on !__OBJC__.
	Replace 'interface' with '_COM_interface', throughout.
  	* include/comcat.h: Replace 'interface' with '_COM_interface', throughout.
	* include/commdlg.h: Replace __OBJC__ guard with _OBJC_NO_COM.
	* include/docobj.h: Replace 'interface' with '_COM_interface', throughout.
	* include/mshtml.h: Likewise.
	* include/oaidl.h: Likewise.
	* include/objfwd.h: Likewise.
	* include/objidl.h: Likewise.
	* include/ocidl.h: Likwise.
	* include/olectl.h: Likewise.
	* include/oleidl.h: Likewise.
	* include/shlobj.h: Likewise.
	* include/shlwapi.h: Replace __OBJC__ guard with _OBJC_NO_COM.
	* include/vfw.h: Likewise.
	* include/windows.h. Likewise. Add comment.
	* include/directx/d3d9.h: Replace 'interface' with '_COM_interface',
	throughout.

	* lib/test.c: Replace __OBJC__ guard with _OBJC_NO_COM.
	Add test for conflict with '@interface'
2006-07-25 00:22:19 +00:00
Chris Sutcliffe 076887efab 2006-04-11 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/comcat.h: INTERFACE should not remain defined
    at the end of the header.
    * include/docobj.h: Ditto.
    * include/exdisp.h: Ditto.
    * include/intshcut.h: Ditto.
    * include/mlang.h: Ditto.
    * include/mshtml.h: Ditto.
    * include/oaidl.h: Ditto.
2006-04-11 22:56:08 +00:00
Dimitri Papadopoulos d5ad5abfc2 * include/objidl.h (PIDSI_*): Define.
(PRSPEC_*): Define.
	Thanks to:    Oliver Stoeneberg <kidkat at users dot sf dot net>
2006-04-05 14:16:17 +00:00
Luke Dunstan 08ed58a023 Merge numerous changes from ReactOS. Submitted by Filip Navara. 2004-04-18 07:07:57 +00:00
Danny Smith b01201ec32 2004-01-03 Filip Navara <xnavara@volny.cz>
* include/cguid.h (CLSID_StdGlobalInterfaceTable): Declare IID.
	* include/oaidl.h (ITypeLib2, ITypeInfo2): Define interfaces,
	declare IID's.
	(IErrorInfo): Add COBJMACROS.
	* include/objbase.h (STGM_NOSNAPSHOT): Add define.
	(CoGetPSClsid): Add protototype,
	(CoRegisterPSClsid): Likewise.
	* include/objidl.h (IMarshal): Correct methods.
	(IMallocSpy): Likewise,
	(LPPSFACTORYBUFFER): Add typedef.
	(IGlobalInterfaceTable): Define interface and COBJMACROS. Declare
	IID.
	(IStorage_CreateStorage, IRpcStubBuffer_Invoke): Fix macros.
	* include/ocidl.h (PROPBAG2_TYPE): Define enum.
	(PROPBAG2, QACONTAINERFLAGS, QACONTAINER, QACONTROL): Define
	structures.
	(IPropertyBag2, IPersistPropertyBag2,IAdviseSinkEx, IPointerInactive,
	IOleUndoUnit, IOleParentUndoUnit, IEnumOleUndoUnits, IOleUndoManager,
	IQuickActivate): Define interfaces. Declare IID's.
	(IPersistPropertyBag2): Add COBJMACROS.
	(LPOLEUNDOMANAGER): Add typedef.
	(LPPROPERTYBAG2): Likewise.
	* include/oleidl.h (LPPARSEDISPLAYNAME): Fix definiton.
	(BINDSPEED): Add definition.
	(IParseDisplayName, IOleItemContainer, IOleObject, IDropSource,
	IDropTarget): Add COBJMACROS.
	* include/wtypes.h (MEMCTX, MSHCTX): Fix enums.
	* include/winerror.h (CO_S_NOTALLINTERFACES): Add define.
	* lib/uuid.c (IID_IGlobalInterfaceTable, IID_IOleUndoManager,
	IID_IPersistPropertyBag2, IID_IPropertyBag2, IID_IRpcProxyBuffer):
	Add definitions.
2004-01-03 22:12:35 +00:00
Danny Smith c8b0d378a7 2004-01-01 Filip Navara <xnavara@volny.cz>
* include/objbase.h:  Don't care about value of DBG define.
	* include/objidl.h: Add some COBJMACROS.
	* include/ocidl.h: Ditto.
	* include/oleidl.h: Ditto.
	* include/servprov.h: Ditto.
	* include/shlobj.h: Ditto.
	* include/shlobj.h (IContextMenu2): Correct parent in
	DECLARE_INTERFACE.
	* include/oleidl.h (IOleCache, IOleCache2, IOleCacheControl):
	Define interfaces.
	* include/setupapi.h (SetupGetLineTextA): Correct prototype.
	Add new constants for _SETUPAPI_VER >= 0x501.
2004-01-01 22:34:20 +00:00
Danny Smith 110af2d2db 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-24 23:04:57 +00:00
Danny Smith 5ca7a646d5 2003-08-17 Martin Fuchs <Martin-Fuchs@gmx.net>
* include/commctrl.h (TreeView_GetScrollTime,
	TreeView_SetScrollTime): Define macros.
	* include/winuser.h (GetShellWindow): Add prototype.
	* include/objidl.h (STGMEDIUM): Correct lpszFileName type.
2003-08-17 08:47:37 +00:00
Danny Smith ffe3e7ef4f 2003-07-26 Eric R. Krause <ekrause_98@users.sourceforge.net>
* include/onjidl.h (IMalloc): Fix typo.
2003-07-26 01:01:03 +00:00
Danny Smith b57a74b210 * include/objidl.h (PropVariant): Add CHAR cVal field
to union.
	(FMTID_SummaryInformation, FMTID_DocSummaryInformation,
	FMTID_UserDefinedProperties): Declare.
2003-07-22 22:48:00 +00:00
Danny Smith a814828d06 * include/objidl.h (IEnumMoniker): Put 'interface' back. 2002-08-11 21:16:30 +00:00
Danny Smith 2324fd5b91 * include/objidl.h (IEnumMoniker): Correct declaration. 2002-08-11 07:36:43 +00:00
Danny Smith 15cc7bc14d 2002-07-26 Mattia Barbon <mbarbon@dsi.unive.it>
* include/exdisp.h: New file.
	* include/exdispid.h: New file.
	* include/mshtml.h: New file.
	* lib/test.c: #include exdisp.h and mshtml.h
	* lib/uuid.c (CLSID_WebBrowser, DIID_DWebBrowserEvents,
	DIID_DWebBrowserEvents2, IID_IHTMLDocument, IID_IHTMLDocument2,
	IID_IHTMLElement, IID_IHTMLSelectionObject, IID_IHTMLTxtRange,
	IID_IWebBrowser, IID_IWebBrowser2, IID_IWebBrowserApp):
	New GUIDs.

	* include/docobj.h: New file.
	* include/idispids.h: New file.
	* include/objidl.h (IID_IMoniker): Declare.
	* include/ocidl.h (READYSTATE): New enum.
	(IOleInPlaceSiteEx): New interface.
	* include/olectlid.h (IID_IEnumSTATSTG): New interface
	identifier.
	* include/oleidl.h (IOleItemContainer, IOleInPlaceObject,
	IOleInPlaceSite): New interfaces.
	* lib/test.c: #include docobj.h,idispids.h,
2002-07-26 04:26:26 +00:00
Danny Smith f8f2ad211f * include/objidl.h (struct tagPROPVARIANT): Kill obsolete
union member _VARIANT_BOOL bool.
2002-06-24 04:51:34 +00:00
Danny Smith e432b38efe * include/objidl.h (IRunningObjectTable.Register): Correct
prototype.
	* include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE,
	ROTFLAGS_ALLOWANYCLIENT): Add defines.
	* include/wtypes.h (enum tagCLSCTX): Change formatting.
2002-04-02 09:00:14 +00:00
Danny Smith cf62424b92 * include/accctrl.h, aclapi.h, basetsd.h, basetyps.h, cderr.h,
cguid.h, commctrl.h, commdlg.h, cpl.h, cplext.h, custcntl.h,
	dbt.h, dde.h, ddeml.h, dlgs.h, excpt.h, httpext.h, imagehlp.h,
	imm.h, initguid.h, intshcut.h, ipexport.h, iphlpapi.h,
	ipifcons.h, iprtrmib.h, iptypes.h, isguids.h, largeint.h, lm.h,
	lmaccess.h, lmalert.h, lmapibuf.h, lmat.h, lmaudit.h,
	lmbrowsr.h, lmchdev.h, lmconfig.h, lmcons.h, lmerr.h,
	lmerrlog.h, lmmsg.h, lmremutl.h, lmrepl.h, lmserver.h,
	lmshare.h, lmsname.h, lmstats.h, lmsvc.h, lmuse.h, lmuseflg.h,
	lmwksta.h, lzexpand.h, mapi.h, mciavi.h, mcx.h, mmsystem.h,
	mswsock.h, nb30.h, nddeapi.h, nspapi.h, ntdef.h, ntsecapi.h,
	ntsecpkg.h, oaidl.h, objbase.h, objfwd.h, objidl.h, odbcinst.h,
	ole.h, ole2.h, ole2ver.h, oleauto.h, olectl.h, olectlid.h,
	oledlg.h, oleidl.h, pbt.h, prsht.h, psapi.h, rapi.h, ras.h,
	raserror.h, rassapi.h, regstr.h, richedit.h, richole.h, rpc.h,
	rpcdce.h, rpcdce2.h, rpcdcep.h, rpcndr.h, rpcnsi.h, rpcnsip.h,
	rpcnterr.h, rpcproxy.h, schannel.h, schnlsp.h, scrnsave.h,
	security.h, setupapi.h, shellapi.h, shlguid.h, shlobj.h, sql.h,
	sqlext.h, sqltypes.h, sqlucode.h, sspi.h, subauth.h,
	tlhelp32.h, unknwn.h, userenv.h, w32api.h, winbase.h, wincon.h,
	wincrypt.h, windef.h, windows.h, windowsx.h, winerror.h,
	wingdi.h, wininet.h, winioctl.h, winnetwk.h, winnls.h, winnt.h,
	winperf.h, winreg.h, winresrc.h, winsock.h, winsock2.h,
	winspool.h, winsvc.h, winuser.h, winver.h, ws2tcpip.h,
	wsnetbs.h, wtypes.h, zmouse.h:	Add #pragma GCC system_header
	if __GNUC__ >= 3.
	* include/mapi.h: Change header guard name to _MAPI_H  for
	consistency.
2002-03-09 09:04:10 +00:00
Earnie Boyd 66a7fbe263 * objidl.h (IMalloc::ReAlloc()): Correct declaration.
(IMalloc::Free()): Ditto.
2001-06-11 20:06:54 +00:00
Earnie Boyd 91874e20bf * include/windows.h: Define _ANONYMOUS_STRUCT and _ANONYMOUS_UNION
as __extenstion__ when appropriate.
	* include/mmsystem.h: Mark anonymous structs and unions as
	__extension__ to prevent compiler warning when invoked with
	-pedantic
	* include/oaidl.h: Ditto.
	* include/objidl.h: Ditto.
	* include/olectl.h: Ditto.
	* include/prsht.h: Ditto.
	* include/shlobj.h: Ditto.
	* include/winbase.h: Ditto.
	* include/winnt.h: Ditto.
	* include/wtypes.h: Ditto.
2001-04-17 12:58:06 +00:00
Earnie Boyd bac9524c30 * objidl.h: (GetClassID): Argument needs to be a pointer.
(GetUnmarshalClass): CLSID argument needs to be a pointer.
	Thanks To: <bge@users.sourceforge.net>
2001-01-30 13:34:50 +00:00
Earnie Boyd 7646d1a111 * Apply Danny Smith patch 102275
2000-11-05  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
	* include/objbase.h: (COM_RIGHTS): Add definition.
	(tagSTDMSHLFLAGS): add enumeration.
	(CoInitializeEx): Add prototypes.
	(CoGetStdMarshalEx): ditto.
	(CoCreateInstanceEx): ditto.
	(CoInitializeSecurity): ditto.
	(CoGetCallContext): ditto.
	(CoQueryProxyBlanket): ditto.
	(CoSetProxyBlanket): ditto.
	(CoCopyProxy): ditto.
	(CoQueryClientBlanket): ditto.
	(CoImpersonateClient): ditto.
	(CoRevertToSelf): ditto.
	(CoQueryAuthenticationServices): ditto.
	(CoSwitchCallContext): ditto.
	(CoGetInstanceFromFile): ditto.
	(CoGetInstanceFromIStorage): ditto.
	* include/objidl.h: (SOLE_AUTHENTICATION_SERVICE): Add structure.
	(SOLE_AUTHENTICATION_INFO): ditto.
	(EOLE_AUTHENTICATION_CAPABILITIES): Add enumeration.
	(COLE_DEFAULT_PRINCIPAL): Add definition.
	(COLE_DEFAULT_AUTHINFO): Ditto.
	* include/rpcdce.h: (RPC_C_AUTHZ_DEFAULT): Add definition.
	(RPC_PROTSEQ_VECTOR) Fix typo.
	(RpcRaiseException): add DECLSPEC_NORETURN attribute.
	* include/winbase.h: (FreeLibraryAndExitThread): add DECLSPEC_NORETURN
	attribute.
2001-01-26 21:05:20 +00:00
Christopher Faylor 1fd5e000ac import winsup-2000-02-17 snapshot 2000-02-17 19:38:33 +00:00