Commit Graph

5 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
Danny Smith edee465c9a 2004-01-05 Filip Navara <xnavara@volny.cz>
* include/prsht.h (LPCPROPSHEETPAGEW): Fix definition.
	* include/shlwapi.h (SHRegQueryInfoUSKey[AW]): Fix prototype.
	* include/cpl.h (CPL_STARTWPARMS[AW]): Correct.
	* include/shellapi.h (ABS_AUTOHIDE, ABS_ALWAYSONTOP,
	SEE_MASK_NO_CONSOLE, SEE_MASK_ASYNCOK, SEE_MASK_HMONITOR,
	FOF_NOCOPYSECURITYATTRIBS): Add defines.
	* include/shlobj.h (BFFM_SETOKTEXT, BFFM_SETEXPANDED,
	CSIDL_FLAG_DONT_VERIFY, CSIDL_FLAG_CREATE, CSIDL_FLAG_MASK,
	CFSTR_INETURL[AW], SHGDN_FOREDITING, SHGDN_FORADDRESSBAR,
	SSF_*): Add defines.
	(SHCNF_PATH[AW], SHCNF_PRINTER[AW], CFSTR_FILENAME[AW],
	CFSTR_FILENAMEMAP[AW], CFSTR_FILEDESCRIPTOR[AW], CFSTR_SHELLURL,
	CMDSTR_NEWFOLDER[AW], CMDSTR_VIEWLIST[AW], CMDSTR_VIEWDETAILS[AW]):
	Correct.
	(IEnumIDList): Add COBJMACROS.
	* include/winuser.h (MIM_*): Add define.
2004-01-04 21:35:32 +00:00
Danny Smith a52e274d12 2003-06-28 Steven Edwards <Steven_Ed4153@yahoo.com>
* include/shlwapi.h (UrlGetLocationA, UrlGetLocationW,
	PathFindSuffixArrayA, PathFindSuffixArrayW,
	PathFindExtensionA, PathFindExtensionW, StrStrW
	StrStrA): Change unicode-macro'd LP[C]TSTR return values to
	explicit type.
2003-06-28 05:34:47 +00:00
Danny Smith ccbb9a6490 * include/shlwapi.h (PathRelativePathTo[AW]): Correct
protototypes.
	Thanks to: John Dallaway  <jld@ecoscentric.com>.
2003-02-04 22:17:38 +00:00
Danny Smith 6b2ba9ad49 2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
* include/shlwapi.h: New file.
	Thanks to: Mattia Barbon  <mbarbon@dsi.unive.it> and
	Victor Porton  <porton@narod.ru> for contributions.
	* lib/shlwapi.def: New file.
	* lib/test.c: #include shlwapi.h.
2002-07-22 03:10:43 +00:00