2006-06-04 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

        * lib/Makefile.in: Add unknwn-uuid and servprov-uuid as sources and
        objects.
        * lib/uuid.c (IID_IUnknown, IID_IClassFactory, IID_IServiceProvider):
        Remove.  Moved to unknwn-uuid and servprov-uuid.
        * lib/unknwn-uuid.c: New file.
        * lib/servprov-uuid.c: New file.

5 files changed, 30 insertions, 5 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8a051c7..429c3a8 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-04	Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+
+	* lib/Makefile.in: Add unknwn-uuid and servprov-uuid as sources and
+	objects.
+	* lib/uuid.c (IID_IUnknown, IID_IClassFactory, IID_IServiceProvider):
+	Remove.  Moved to unknwn-uuid and servprov-uuid.
+	* lib/unknwn-uuid.c: New file.
+	* lib/servprov-uuid.c: New file.
+
 2006-06-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/strmif.h (VMRDeinterlaceTech): Correct typedef for DeinterlaceTech_*
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index efe7d7b..6830ca4 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -115,10 +115,10 @@ 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
+UUID_OBJS = uuid.o mshtml-uuid.o msxml-uuid.o unknwn-uuid.o servprov-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
+UUID_SOURCES = uuid.c mshtml-uuid.c msxml-uuid.c unknwn-uuid.c servprov-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/servprov-uuid.c b/winsup/w32api/lib/servprov-uuid.c
new file mode 100644
index 0000000..049de3b
--- /dev/null
+++ b/winsup/w32api/lib/servprov-uuid.c
@@ -0,0 +1,9 @@
+/* servprov-uuid.c */
+/* Generate GUIDs for ServiceProvider interfaces */
+
+/* All IIDs defined in this file were extracted from
+ * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */
+
+#define INITGUID
+#include <basetyps.h>
+DEFINE_GUID(IID_IServiceProvider,0x6d5140c1,0x7436,0x11ce,0x80,0x34,0,0xaa,0,0x60,0x9,0xfa);
diff --git a/winsup/w32api/lib/unknwn-uuid.c b/winsup/w32api/lib/unknwn-uuid.c
new file mode 100644
index 0000000..b301ea2
--- /dev/null
+++ b/winsup/w32api/lib/unknwn-uuid.c
@@ -0,0 +1,10 @@
+/* unknwn-uuid.c */
+/* Generate GUIDs for Unknown interfaces */
+
+/* All IIDs defined in this file were extracted from
+ * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */
+
+#define INITGUID
+#include <basetyps.h>
+DEFINE_OLEGUID(IID_IUnknown,0,0,0);
+DEFINE_OLEGUID(IID_IClassFactory,0x1,0,0);
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index f47bf45..25fc139 100644
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -123,7 +123,6 @@ DEFINE_GUID(IID_ICatInformation,0x2e013,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_ICatRegister,0x2e012,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IChannelHook,0x1008c4a0,0x7613,0x11cf,0x9a,0xf1,0,0x20,0xaf,0x6e,0x72,0xf4);
 DEFINE_GUID(IID_IClassActivator,0x140,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IClassFactory,0x1,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IClassFactory2,0xb196b28f,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
 DEFINE_GUID(IID_IClientSecurity,0x13D,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IClientSiteHandler,0xf4f569d1,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
@@ -276,7 +275,6 @@ DEFINE_GUID(IID_IRunningObjectTable,0x10,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_ISequentialStream,0xc733a30,0x2a1c,0x11ce,0xad,0xe5,0,0xaa,0,0x44,0x77,0x3d);
 DEFINE_GUID(IID_IServerHandler,0xf4f569d0,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
 DEFINE_GUID(IID_IServerSecurity,0x13E,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IServiceProvider,0x6d5140c1,0x7436,0x11ce,0x80,0x34,0,0xaa,0,0x60,0x9,0xfa);
 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);
 DEFINE_OLEGUID(IID_IStdMarshalInfo,24,0,0);
@@ -293,7 +291,6 @@ DEFINE_GUID(IID_ITypeInfo,0x20401,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_ITypeInfo2,0x20412,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_ITypeLib,0x20402,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_ITypeLib2,0x20411,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IUnknown,0,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IUrlHistoryStg,0x3c374a41,0xbae4,0x11cf,0xbf,0x7d,0,0xaa,0,0x69,0x46,0xee);
 DEFINE_GUID(IID_IViewObject,0x10d,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IViewObject2,0x127,0,0,0xc0,0,0,0,0,0,0,0x46);