From: <cj...@us...> - 2014-05-16 10:04:00
|
Revision: 6638 http://sourceforge.net/p/mingw-w64/code/6638 Author: cjacek Date: 2014-05-16 10:03:53 +0000 (Fri, 16 May 2014) Log Message: ----------- uuid.c: Added missing urlmon CLSIDs and get rid of duplicated IIDs. Modified Paths: -------------- trunk/mingw-w64-crt/Makefile.am trunk/mingw-w64-crt/Makefile.in trunk/mingw-w64-crt/libsrc/uuid.c Removed Paths: ------------- trunk/mingw-w64-crt/libsrc/urlmon-uuid.c Modified: trunk/mingw-w64-crt/Makefile.am =================================================================== --- trunk/mingw-w64-crt/Makefile.am 2014-05-13 23:07:14 UTC (rev 6637) +++ trunk/mingw-w64-crt/Makefile.am 2014-05-16 10:03:53 UTC (rev 6638) @@ -126,7 +126,7 @@ libsrc/ntddkbd-uuid.c libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddser-uuid.c \ libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c libsrc/oaidl-uuid.c libsrc/objidl-uuid.c libsrc/objsafe-uuid.c \ libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c libsrc/power-uuid.c \ - libsrc/powrprof-uuid.c libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ + libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c src_libws2_32=libsrc/ws2_32.c \ Modified: trunk/mingw-w64-crt/Makefile.in =================================================================== --- trunk/mingw-w64-crt/Makefile.in 2014-05-13 23:07:14 UTC (rev 6637) +++ trunk/mingw-w64-crt/Makefile.in 2014-05-16 10:03:53 UTC (rev 6638) @@ -1216,9 +1216,8 @@ libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c \ libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c \ libsrc/power-uuid.c libsrc/powrprof-uuid.c \ - libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c \ - libsrc/usbiodef-uuid.c libsrc/uuid.c libsrc/vds-uuid.c \ - libsrc/virtdisk-uuid.c libsrc/wia-uuid.c + libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ + libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c am__objects_28 = libsrc/lib32_libuuid_a-ativscp-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-atsmedia-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-bth-uuid.$(OBJEXT) \ @@ -1255,7 +1254,6 @@ libsrc/lib32_libuuid_a-oleidl-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-power-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-powrprof-uuid.$(OBJEXT) \ - libsrc/lib32_libuuid_a-urlmon-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-usbcamdi-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-usbiodef-uuid.$(OBJEXT) \ libsrc/lib32_libuuid_a-uuid.$(OBJEXT) \ @@ -2349,9 +2347,8 @@ libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c \ libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c \ libsrc/power-uuid.c libsrc/powrprof-uuid.c \ - libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c \ - libsrc/usbiodef-uuid.c libsrc/uuid.c libsrc/vds-uuid.c \ - libsrc/virtdisk-uuid.c libsrc/wia-uuid.c + libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ + libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c am__objects_58 = libsrc/lib64_libuuid_a-ativscp-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-atsmedia-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-bth-uuid.$(OBJEXT) \ @@ -2388,7 +2385,6 @@ libsrc/lib64_libuuid_a-oleidl-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-power-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-powrprof-uuid.$(OBJEXT) \ - libsrc/lib64_libuuid_a-urlmon-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-usbcamdi-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-usbiodef-uuid.$(OBJEXT) \ libsrc/lib64_libuuid_a-uuid.$(OBJEXT) \ @@ -3857,7 +3853,7 @@ libsrc/ntddkbd-uuid.c libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddser-uuid.c \ libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c libsrc/oaidl-uuid.c libsrc/objidl-uuid.c libsrc/objsafe-uuid.c \ libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c libsrc/power-uuid.c \ - libsrc/powrprof-uuid.c libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ + libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \ libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c src_libws2_32 = libsrc/ws2_32.c \ @@ -7177,8 +7173,6 @@ libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib32_libuuid_a-powrprof-uuid.$(OBJEXT): \ libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp) -libsrc/lib32_libuuid_a-urlmon-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \ - libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib32_libuuid_a-usbcamdi-uuid.$(OBJEXT): \ libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib32_libuuid_a-usbiodef-uuid.$(OBJEXT): \ @@ -8775,8 +8769,6 @@ libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib64_libuuid_a-powrprof-uuid.$(OBJEXT): \ libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp) -libsrc/lib64_libuuid_a-urlmon-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \ - libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib64_libuuid_a-usbcamdi-uuid.$(OBJEXT): \ libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp) libsrc/lib64_libuuid_a-usbiodef-uuid.$(OBJEXT): \ @@ -10286,7 +10278,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-oleidl-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-power-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-powrprof-uuid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-usbiodef-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-uuid.Po@am__quote@ @@ -10361,7 +10352,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-oleidl-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-power-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-powrprof-uuid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-usbiodef-uuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-uuid.Po@am__quote@ @@ -21039,20 +21029,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-powrprof-uuid.obj `if test -f 'libsrc/powrprof-uuid.c'; then $(CYGPATH_W) 'libsrc/powrprof-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/powrprof-uuid.c'; fi` -libsrc/lib32_libuuid_a-urlmon-uuid.o: libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-urlmon-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib32_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib32_libuuid_a-urlmon-uuid.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c - -libsrc/lib32_libuuid_a-urlmon-uuid.obj: libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-urlmon-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib32_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib32_libuuid_a-urlmon-uuid.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi` - libsrc/lib32_libuuid_a-usbcamdi-uuid.o: libsrc/usbcamdi-uuid.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-usbcamdi-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Tpo -c -o libsrc/lib32_libuuid_a-usbcamdi-uuid.o `test -f 'libsrc/usbcamdi-uuid.c' || echo '$(srcdir)/'`libsrc/usbcamdi-uuid.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Po @@ -30125,20 +30101,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-powrprof-uuid.obj `if test -f 'libsrc/powrprof-uuid.c'; then $(CYGPATH_W) 'libsrc/powrprof-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/powrprof-uuid.c'; fi` -libsrc/lib64_libuuid_a-urlmon-uuid.o: libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-urlmon-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib64_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib64_libuuid_a-urlmon-uuid.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c - -libsrc/lib64_libuuid_a-urlmon-uuid.obj: libsrc/urlmon-uuid.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-urlmon-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib64_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib64_libuuid_a-urlmon-uuid.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi` - libsrc/lib64_libuuid_a-usbcamdi-uuid.o: libsrc/usbcamdi-uuid.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-usbcamdi-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Tpo -c -o libsrc/lib64_libuuid_a-usbcamdi-uuid.o `test -f 'libsrc/usbcamdi-uuid.c' || echo '$(srcdir)/'`libsrc/usbcamdi-uuid.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Po Deleted: trunk/mingw-w64-crt/libsrc/urlmon-uuid.c =================================================================== --- trunk/mingw-w64-crt/libsrc/urlmon-uuid.c 2014-05-13 23:07:14 UTC (rev 6637) +++ trunk/mingw-w64-crt/libsrc/urlmon-uuid.c 2014-05-16 10:03:53 UTC (rev 6638) @@ -1,14 +0,0 @@ -/* urlmon-uuid.c */ -/* Generate GUIDs for URLMON interfaces */ - -/* All IIDs defined in this file were extracted from - * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ - -#define INITGUID -#include <basetyps.h> -DEFINE_GUID(IID_IBindHost,0xfc4801a1,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); -DEFINE_GUID(IID_IBindProtocol,0x79eac9cd,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); -DEFINE_GUID(IID_IBindStatusCallback,0x79eac9c1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); -DEFINE_GUID(IID_IBindStatusCallbackMsg,0x79eac9cb,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); -DEFINE_GUID(IID_IBinding,0x79eac9c0,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); Modified: trunk/mingw-w64-crt/libsrc/uuid.c =================================================================== --- trunk/mingw-w64-crt/libsrc/uuid.c 2014-05-13 23:07:14 UTC (rev 6637) +++ trunk/mingw-w64-crt/libsrc/uuid.c 2014-05-16 10:03:53 UTC (rev 6638) @@ -22,6 +22,7 @@ #include <urlhist.h> #include <oleacc.h> #include <uiautomation.h> +#include <urlmon.h> DEFINE_GUID(ARRAYID_PathProperties,0x7ecbba04,0x2d97,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); DEFINE_GUID(CATID_Control,0x40fc6ed4,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2); @@ -117,6 +118,8 @@ /*DEFINE_GUID(IID_IBindHost,0xfc4801a1,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52); DEFINE_GUID(IID_IBindProtocol,0x79eac9cd,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);*/ DEFINE_GUID(IID_IBindStatusCallbackMsg,0x79eac9cb,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); +DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94,0x0ac9,0x11d1,0x89,0x6c,0x00,0xc0,0x4f,0xb6,0xbf,0xc4); +DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95,0x0AC9,0x11D1,0x89,0x6C,0x00,0xC0,0x4F,0xB6,0xBF,0xC4); /*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_IClassFactory2,0xb196b28f,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |