From 12e576d9a0d23fa810c76ccdb9f6e0dd5183cd8f Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 10 Jun 2006 15:28:04 +0000 Subject: [PATCH] 2006-06-10 Chris Sutcliffe * lib/uuid.c (CLSID_StaticDib, CLSID_StaticMetafile, CLSID_StdHlink, CLSID_StdHlinkBrowseContext): Remove. Moved to relevant files. * lib/cguid-uuid.c (CLSID_StaticDib, CLSID_StaticMetafile): Added. * lib/hlguids-uuid.c: New file. Thank you to Julien Lecomte (julienlecomte at users dot sourceforge dot net). --- winsup/w32api/ChangeLog | 9 +++++++++ winsup/w32api/lib/cguid-uuid.c | 7 +++++++ winsup/w32api/lib/hlguids-uuid.c | 13 +++++++++++++ winsup/w32api/lib/uuid.c | 4 ---- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 winsup/w32api/lib/hlguids-uuid.c diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ae90a7659..d39f2d846 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2006-06-10 Chris Sutcliffe + + * lib/uuid.c (CLSID_StaticDib, CLSID_StaticMetafile, CLSID_StdHlink, + CLSID_StdHlinkBrowseContext): Remove. Moved to relevant files. + * lib/cguid-uuid.c (CLSID_StaticDib, CLSID_StaticMetafile): Added. + * lib/hlguids-uuid.c: New file. + Thank you to Julien Lecomte (julienlecomte at users dot sourceforge dot + net). + 2006-06-10 Chris Sutcliffe * lib/Makefile.in: Added urlmon-uuid and hlink-uuid as sources and diff --git a/winsup/w32api/lib/cguid-uuid.c b/winsup/w32api/lib/cguid-uuid.c index 1cfb4ccc9..737a542ff 100644 --- a/winsup/w32api/lib/cguid-uuid.c +++ b/winsup/w32api/lib/cguid-uuid.c @@ -4,6 +4,9 @@ /* 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(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -11,3 +14,7 @@ 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); +// Picture (Device Independant Bitmap) CLSID +DEFINE_OLEGUID(CLSID_StaticDib,0x316,0,0); +// Picture (Metafile) CLSID +DEFINE_OLEGUID(CLSID_StaticMetafile,0x315,0,0); diff --git a/winsup/w32api/lib/hlguids-uuid.c b/winsup/w32api/lib/hlguids-uuid.c new file mode 100644 index 000000000..6a5d03743 --- /dev/null +++ b/winsup/w32api/lib/hlguids-uuid.c @@ -0,0 +1,13 @@ +/* hlguids-uuid.c */ +/* Generate GUIDs for HyperLink GUID 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(CLSID_StdHlink,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); +DEFINE_GUID(CLSID_StdHlinkBrowseContext,0x79eac9d1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c index 688b0ad7c..678c1c5b1 100644 --- a/winsup/w32api/lib/uuid.c +++ b/winsup/w32api/lib/uuid.c @@ -34,8 +34,6 @@ DEFINE_GUID(CLSID_PSInPlaceActive,0x30f,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_PSInPlaceFrame,0x310,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_PersistPropset,0xfb8f0821,0x164,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13); DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_StaticDib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_StaticMetafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_StdMarshal,0x17,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(FMTID_DocSummaryInformation,0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x8,0,0x2b,0x2c,0xf9,0xae); DEFINE_GUID(FMTID_SummaryInformation,0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x8,0,0x2b,0x27,0xb3,0xd9); @@ -96,8 +94,6 @@ DEFINE_GUID(IID_IStubManager,0x6,0,0,0xc0,0,0,0,0,0,0,0x46); * DEFINE_GUID(CLSID_HttpSProtocol,0x79eac9e5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(CLSID_MkProtocol,0x79eac9e6,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(CLSID_PSUrlMonProxy,0x79eac9f1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); -* DEFINE_GUID(CLSID_StdHlink,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); -* DEFINE_GUID(CLSID_StdHlinkBrowseContext,0x79eac9d1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(CLSID_StdURLMoniker,0x79eac9e0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(CLSID_StdURLProtocol,0x79eac9e1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); * DEFINE_GUID(FLAGID_Internet,0x96300da0,0x2bab,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);