From afc7f32e1bd6785a590c026790a3e00d05691e95 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 10 Jun 2006 11:45:41 +0000 Subject: [PATCH] 2006-06-10 Chris Sutcliffe * lib/Makefile.in: Added ativscp-uuid as source and object. * lib/uuid.c (IID_IActiveScript, IID_IActiveScriptError, IID_IActiveScriptParse, IID_IActiveScriptSite, IID_IActiveScriptSiteWindow): Remove. Moved to ativscp-uuid.c. * lib/ativscp-uuid.c: New file. --- winsup/w32api/ChangeLog | 8 ++++++++ winsup/w32api/lib/Makefile.in | 8 ++++---- winsup/w32api/lib/ativscp-uuid.c | 16 ++++++++++++++++ winsup/w32api/lib/uuid.c | 5 ----- 4 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 winsup/w32api/lib/ativscp-uuid.c diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 781c01d51..ddd89cba1 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2006-06-10 Chris Sutcliffe + + * lib/Makefile.in: Added ativscp-uuid as source and object. + * lib/uuid.c (IID_IActiveScript, IID_IActiveScriptError, + IID_IActiveScriptParse, IID_IActiveScriptSite, + IID_IActiveScriptSiteWindow): Remove. Moved to ativscp-uuid.c. + * lib/ativscp-uuid.c: New file. + 2006-06-09 Chris Sutcliffe * lib/uuid.c (IID_IClientSecurity, IID_IMallocSpy, IID_IServerSecurity): diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 82d56fbd0..8bd0b17d8 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -115,18 +115,18 @@ 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 \ +UUID_OBJS = mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \ servprov-uuid.o oleidl-uuid.o oleacc-uuid.o ocidl-uuid.o \ objsafe-uuid.o oaidl-uuid.o docobj-uuid.o comcat-uuid.o \ exdisp-uuid.o mlang-uuid.o objidl-uuid.o cguid-uuid.o \ - olectlid-uuid.o + olectlid-uuid.o ativscp-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 \ +UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \ servprov-uuid.c oleidl-uuid.c oleacc-uuid.c ocidl-uuid.c \ objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \ exdisp-uuid.c mlang-uuid.c objidl-uuid.c cguid-uuid.c \ - olectlid-uuid.o + olectlid-uuid.o ativscp-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/ativscp-uuid.c b/winsup/w32api/lib/ativscp-uuid.c new file mode 100644 index 000000000..4cfdc3e80 --- /dev/null +++ b/winsup/w32api/lib/ativscp-uuid.c @@ -0,0 +1,16 @@ +/* ativscp-uuid.c */ +/* Generate GUIDs for ActiveScript interfaces */ + +/* All IIDs defined in this file were extracted from + * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ + +/* All CLSIDs defined in this file were extracted from + * HKEY_CLASSES_ROOT\CLSID\ */ + +#define INITGUID +#include +DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); +DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); +DEFINE_GUID(IID_IActiveScriptParse,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); +DEFINE_GUID(IID_IActiveScriptSite,0xdb01a1e3,0xa42b,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); +DEFINE_GUID(IID_IActiveScriptSiteWindow,0xd10f6761,0x83e9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c index 395965b73..cf4578ba4 100644 --- a/winsup/w32api/lib/uuid.c +++ b/winsup/w32api/lib/uuid.c @@ -103,11 +103,6 @@ DEFINE_GUID(IID_IStubManager,0x6,0,0,0xc0,0,0,0,0,0,0,0x46); * DEFINE_GUID(FLAGID_Internet,0x96300da0,0x2bab,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); * DEFINE_GUID(GUID_HasPathProperties,0x2de81,0,0,0xc0,0,0,0,0,0,0,0x46); * DEFINE_GUID(GUID_PathProperty,0x2de80,0,0,0xc0,0,0,0,0,0,0,0x46); -* DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); -* DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); -* DEFINE_GUID(IID_IActiveScriptParse,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); -* DEFINE_GUID(IID_IActiveScriptSite,0xdb01a1e3,0xa42b,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); -* DEFINE_GUID(IID_IActiveScriptSiteWindow,0xd10f6761,0x83e9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64); * DEFINE_GUID(IID_IAsyncMoniker,0x79eac9d3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(IID_IAuthenticate,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(IID_IBindHost,0xfc4801a1,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); -- 2.43.5