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

        * lib/Makefile.in: Add cguid-uuid and olectlid-uuid as sources and
        objects.
        * lib/uuid.c (CLSID_CColorPropPage, CLSID_CFontPropPage,
        CLSID_CPicturePropPage, CLSID_Picture_Dib, CLSID_Picture_Metafile,
        CLSID_StdFont, CLSID_StdPicture, GUID_NULL, IID_ICreateTypeInfo,
        IID_ICreateTypeInfo2, IID_ICreateTypeLib, IID_ICreateTypeLib2, IID_IDebug,
        IID_IDebugStream, IID_IDispatch, IID_IEnumFORMATETC,IID_IEnumMoniker,
        IID_IEnumOLEVERB, IID_IEnumSTATDATA, IID_IEnumSTATSTG, IID_IEnumString,
        IID_IEnumUnknown, IID_IEnumVARIANT, IID_IOleLink, IID_IPSFactory,
        IID_IRpcChannel, IID_IRpcProxy, IID_IRpcStub, IID_ITypeInfo,
        IID_ITypeInfo2, IID_ITypeLib, IID_ITypeLib2): Remove.  Moved to relevant
        files.
        * lib/oaidl-uuid.c (IID_ICreateTypeInfo, IID_ICreateTypeInfo2,
        IID_ICreateTypeLib, IID_ICreateTypeLib2, IID_ITypeInfo, IID_ITypeInfo2,
        IID_ITypeLib, IID_ITypeLib2, IID_IEnumVARIANT): Define.
        * lib/cguid-uuid.c: New file.
        * lib/olectlid-uuid.c: New file.

1 files changed, 13 insertions, 0 deletions

diff --git a/winsup/w32api/lib/cguid-uuid.c b/winsup/w32api/lib/cguid-uuid.c
new file mode 100644
index 000000000..1cfb4ccc9
--- /dev/null
+++ b/winsup/w32api/lib/cguid-uuid.c
@@ -0,0 +1,13 @@
+/* cguid-uuid.c */
+/* Generate GUIDs for CGUID interfaces */
+
+/* All IIDs defined in this file were extracted from
+ * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */
+
+#define INITGUID
+#include <basetyps.h>
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+DEFINE_OLEGUID(IID_IRpcChannel,0x4,0,0);
+DEFINE_OLEGUID(IID_IRpcStub,0x5,0,0);
+DEFINE_OLEGUID(IID_IRpcProxy,0x7,0,0);
+DEFINE_OLEGUID(IID_IPSFactory,0x9,0,0);