From 714c1bca0d15a250d529176e5e1b558b4e72e996 Mon Sep 17 00:00:00 2001 From: ironhead Date: Wed, 7 Jun 2006 17:09:44 +0000 Subject: [PATCH] 2006-06-07 Chris Sutcliffe * lib/Makefile.in: Add oleacc-uuid oleidl-uuid ocidl-uuid as sources and objects. * lib/uuid.c (IID_IOleCache, IID_IOleCache2, IID_IOleCacheControl, IID_IViewObject, IID_IViewObject2, IID_IDropSource, IID_IDropTarget, IID_IOleAdviseHolder, IID_IOleInPlaceUIWindow, IID_IOleInPlaceObject, IID_IOleInPlaceActiveObject, IID_IOleInPlaceFrame, IID_IOleInPlaceSite, IID_IOleContainer, IID_IOleItemContainer, IID_IOleClientSite, IID_IOleObject, IID_IOleWindow, IID_IParseDisplayName, IID_IAccessible, LIBID_Accessibility, IID_IQuickActivate, IID_IOleUndoManager, IID_IOleParentUndoUnit, IID_IOleUndoUnit, IID_IEnumOleUndoUnits, IID_IPointerInactive, IID_IAdviseSinkEx, IID_IOleInPlaceSiteEx, IID_IOleControl, IID_IOleControlSite, IID_IPersistPropertyBag, IID_IPersistPropertyBag2, IID_IPersistStreamInit, IID_IPersistMemory, IID_IPropertyBag, IID_IPropertyBag2, IID_IPropertyNotifySink, IID_IPropertyPage, IID_IPropertyPage2, IID_IPropertyPageSite, IID_IFont, IID_IFontDisp, IID_IPicture, IID_IPictureDisp, IID_IProvideClassInfo, IID_IProvideClassInfo2, IID_IEnumConnectionPoints, IID_IEnumConnections, IID_IConnectionPoint, IID_IConnectionPointContainer, IID_IClassFactory2, IID_IErrorLog, IID_IObjectWithSite, IID_IPerPropertyBrowsing, IID_ISimpleFrameSite, IID_ISpecifyPropertyPages): Remove. Moved to new files. * lib/oleidl-uuid.c: New file. * lib/oleacc-uuid.c: New file. * lib/ocidl-uuid.c: New file. --- winsup/w32api/ChangeLog | 26 ++++++++++++++++++++++- winsup/w32api/lib/Makefile.in | 6 ++++-- winsup/w32api/lib/ocidl-uuid.c | 46 +++++++++++++++++++++++++++++++++++++++++ winsup/w32api/lib/oleacc-uuid.c | 11 ++++++++++ winsup/w32api/lib/oleidl-uuid.c | 27 ++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 winsup/w32api/lib/ocidl-uuid.c create mode 100644 winsup/w32api/lib/oleacc-uuid.c create mode 100644 winsup/w32api/lib/oleidl-uuid.c diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ab5d980f60..3004cb05b4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,28 @@ -2006-06-04 Chris Sutcliffe +2006-06-07 Chris Sutcliffe + + * lib/Makefile.in: Add oleacc-uuid oleidl-uuid ocidl-uuid as sources and + objects. + * lib/uuid.c (IID_IOleCache, IID_IOleCache2, IID_IOleCacheControl, IID_IViewObject, + IID_IViewObject2, IID_IDropSource, IID_IDropTarget, IID_IOleAdviseHolder, + IID_IOleInPlaceUIWindow, IID_IOleInPlaceObject, IID_IOleInPlaceActiveObject, + IID_IOleInPlaceFrame, IID_IOleInPlaceSite, IID_IOleContainer, IID_IOleItemContainer, + IID_IOleClientSite, IID_IOleObject, IID_IOleWindow, IID_IParseDisplayName, + IID_IAccessible, LIBID_Accessibility, IID_IQuickActivate, IID_IOleUndoManager, + IID_IOleParentUndoUnit, IID_IOleUndoUnit, IID_IEnumOleUndoUnits, IID_IPointerInactive, + IID_IAdviseSinkEx, IID_IOleInPlaceSiteEx, IID_IOleControl, IID_IOleControlSite, + IID_IPersistPropertyBag, IID_IPersistPropertyBag2, IID_IPersistStreamInit, + IID_IPersistMemory, IID_IPropertyBag, IID_IPropertyBag2, IID_IPropertyNotifySink, + IID_IPropertyPage, IID_IPropertyPage2, IID_IPropertyPageSite, IID_IFont, IID_IFontDisp, + IID_IPicture, IID_IPictureDisp, IID_IProvideClassInfo, IID_IProvideClassInfo2, + IID_IEnumConnectionPoints, IID_IEnumConnections, IID_IConnectionPoint, + IID_IConnectionPointContainer, IID_IClassFactory2, IID_IErrorLog, + IID_IObjectWithSite, IID_IPerPropertyBrowsing, IID_ISimpleFrameSite, + IID_ISpecifyPropertyPages): Remove. Moved to new files. + * lib/oleidl-uuid.c: New file. + * lib/oleacc-uuid.c: New file. + * lib/ocidl-uuid.c: New file. + +2006-06-04 Chris Sutcliffe * lib/Makefile.in: Add unknwn-uuid and servprov-uuid as sources and objects. diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 6830ca4b83..99470c1095 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -115,10 +115,12 @@ IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES))) MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES))) EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a liblargeint.a LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS) -UUID_OBJS = uuid.o mshtml-uuid.o msxml-uuid.o unknwn-uuid.o servprov-uuid.o +UUID_OBJS = uuid.o mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \ + servprov-uuid.o oleidl-uuid.o oleacc-uuid.o ocidl-uuid.o EXTRA_OBJS = shell32.o scrnsave.o scrnsavw.o largeint.o \ $(UUID_OBJS) kernel32.o ws2_32.o -UUID_SOURCES = uuid.c mshtml-uuid.c msxml-uuid.c unknwn-uuid.c servprov-uuid.c +UUID_SOURCES = uuid.c mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \ + servprov-uuid.c oleidl-uuid.c oleacc-uuid.c ocidl-uuid.c SOURCES = scrnsave.c shell32.c largeint.c $(UUID_SOURCES)\ res.rc test.c kernel32.c ws2_32.c diff --git a/winsup/w32api/lib/ocidl-uuid.c b/winsup/w32api/lib/ocidl-uuid.c new file mode 100644 index 0000000000..ea0db2d8e9 --- /dev/null +++ b/winsup/w32api/lib/ocidl-uuid.c @@ -0,0 +1,46 @@ +/* ocidl-uuid.c */ +/* Generate GUIDs for OCIDL interfaces */ + +/* All IIDs defined in this file were extracted from + * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ + +#define INITGUID +#include +DEFINE_GUID(IID_IQuickActivate,0xcf51ed10,0x62fe,0x11cf,0xbf,0x86,0,0xa0,0xc9,0x3,0x48,0x36); +DEFINE_GUID(IID_IOleUndoManager,0xd001f200,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1); +DEFINE_GUID(IID_IOleParentUndoUnit,0xa1faf330,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1); +DEFINE_GUID(IID_IOleUndoUnit,0x894ad3b0,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1); +DEFINE_GUID(IID_IEnumOleUndoUnits,0xb3e7c340,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1); +DEFINE_GUID(IID_IPointerInactive,0x55980ba0,0x35aa,0x11cf,0xb6,0x71,0,0xaa,0,0x4c,0xd6,0xd8); +DEFINE_GUID(IID_IAdviseSinkEx,0x3af24290,0xc96,0x11ce,0xa0,0xcf,0,0xaa,0,0x60,0xa,0xb8); +DEFINE_GUID(IID_IOleInPlaceSiteEx,0x9c2cad80,0x3424,0x11cf,0xb6,0x70,0,0xaa,0,0x4c,0xd6,0xd8); +DEFINE_GUID(IID_IOleControl,0xb196b288,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IOleControlSite,0xB196B289,0xBAB4,0x101A,0xB6,0x9C,0x00,0xAA,0x00,0x34,0x1D,0x07); +DEFINE_GUID(IID_IPersistPropertyBag,0x37d84f60,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IPersistPropertyBag2,0x22f55881,0x280b,0x11d0,0xa8,0xa9,0,0xa0,0xc9,0xc,0x20,4); +DEFINE_GUID(IID_IPersistStreamInit,0x7fd52380,0x4e07,0x101b,0xae,0x2d,0x8,0,0x2b,0x2e,0xc7,0x13); +DEFINE_GUID(IID_IPersistMemory,0xbd1ae5e0,0xa6ae,0x11ce,0xbd,0x37,0x50,0x42,0,0xc1,0,0); +DEFINE_GUID(IID_IPropertyBag,0x55272a00,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IPropertyBag2,0x22f55882,0x280b,0x11d0,0xa8,0xa9,0,0xa0,0xc9,0xc,0x20,0x4); +DEFINE_GUID(IID_IPropertyNotifySink,0x9bfbbc02,0xeff1,0x101a,0x84,0xed,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IPropertyPage,0xb196b28d,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IPropertyPage2,0x1e44665,0x24ac,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13); +DEFINE_GUID(IID_IPropertyPageSite,0xb196b28c,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IFont,0xbef6e002,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab); +// Font +DEFINE_GUID(IID_IFontDisp,0xbef6e003,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab); +DEFINE_GUID(IID_IPicture,0x7bf80980,0xbf32,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab); +// Picture +DEFINE_GUID(IID_IPictureDisp,0x7bf80981,0xbf32,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab); +DEFINE_GUID(IID_IProvideClassInfo,0xb196b283,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IProvideClassInfo2,0xa6bc3ac0,0xdbaa,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IEnumConnectionPoints,0xb196b285,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IEnumConnections,0xb196b287,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IConnectionPoint,0xb196b286,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IConnectionPointContainer,0xb196b284,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IClassFactory2,0xb196b28f,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); +DEFINE_GUID(IID_IErrorLog,0x3127ca40,0x446e,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IObjectWithSite,0xfc4801a3,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); +DEFINE_GUID(IID_IPerPropertyBrowsing,0x376bd3aa,0x3845,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13); +DEFINE_GUID(IID_ISimpleFrameSite,0x742b0e01,0x14e6,0x101b,0x91,0x4e,0,0xaa,0,0x30,0xc,0xab); +DEFINE_GUID(IID_ISpecifyPropertyPages,0xb196b28b,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); diff --git a/winsup/w32api/lib/oleacc-uuid.c b/winsup/w32api/lib/oleacc-uuid.c new file mode 100644 index 0000000000..4f53eb55f8 --- /dev/null +++ b/winsup/w32api/lib/oleacc-uuid.c @@ -0,0 +1,11 @@ +/* oleacc-uuid.c */ +/* Generate GUIDs for OLE Accessibility interfaces */ + +/* All IIDs defined in this file were extracted from + * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ + +#define INITGUID +#include +DEFINE_GUID(IID_IAccessible,0x618736e0,0x3c3d,0x11cf,0x81,0x0c,0x00,0xaa,0x00,0x38,0x9b,0x71); +// IAccessibleHandler TypeLib +DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); diff --git a/winsup/w32api/lib/oleidl-uuid.c b/winsup/w32api/lib/oleidl-uuid.c new file mode 100644 index 0000000000..929754e00f --- /dev/null +++ b/winsup/w32api/lib/oleidl-uuid.c @@ -0,0 +1,27 @@ +/* oleidl-uuid.c */ +/* Generate GUIDs for OLE IDL interfaces */ + +/* All IIDs defined in this file were extracted from + * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ + +#define INITGUID +#include +DEFINE_OLEGUID(IID_IOleCache,0x11e,0,0); +DEFINE_OLEGUID(IID_IOleCache2,0x128,0,0); +DEFINE_OLEGUID(IID_IOleCacheControl,0x129,0,0); +DEFINE_OLEGUID(IID_IViewObject,0x10d,0,0); +DEFINE_OLEGUID(IID_IViewObject2,0x127,0,0); +DEFINE_OLEGUID(IID_IDropSource,0x121,0,0); +DEFINE_OLEGUID(IID_IDropTarget,0x122,0,0); +DEFINE_OLEGUID(IID_IOleAdviseHolder,0x111,0,0); +DEFINE_OLEGUID(IID_IOleInPlaceUIWindow,0x115,0,0); +DEFINE_OLEGUID(IID_IOleInPlaceObject,0x113,0,0); +DEFINE_OLEGUID(IID_IOleInPlaceActiveObject,0x117,0,0); +DEFINE_OLEGUID(IID_IOleInPlaceFrame,0x116,0,0); +DEFINE_OLEGUID(IID_IOleInPlaceSite,0x119,0,0); +DEFINE_OLEGUID(IID_IOleContainer,0x11b,0,0); +DEFINE_OLEGUID(IID_IOleItemContainer,0x11c,0,0); +DEFINE_OLEGUID(IID_IOleClientSite,0x118,0,0); +DEFINE_OLEGUID(IID_IOleObject,0x112,0,0); +DEFINE_OLEGUID(IID_IOleWindow,0x114,0,0); +DEFINE_OLEGUID(IID_IParseDisplayName,0x11a,0,0); -- 2.11.0