[mingw-crt/f20] Missing patch

Erik van Pienbroek epienbro at fedoraproject.org
Thu Jan 1 12:23:54 UTC 2015


commit 7a8191122f17f518b11ac0c5f01dd5f9b3b2e5b5
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jan 1 13:24:01 2015 +0100

    Missing patch

 ...d-missing-urlmon-CLSIDs-and-get-rid-of-du.patch |   49 ++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/0002-uuid.c-Added-missing-urlmon-CLSIDs-and-get-rid-of-du.patch b/0002-uuid.c-Added-missing-urlmon-CLSIDs-and-get-rid-of-du.patch
new file mode 100644
index 0000000..620676d
--- /dev/null
+++ b/0002-uuid.c-Added-missing-urlmon-CLSIDs-and-get-rid-of-du.patch
@@ -0,0 +1,49 @@
+From 922439973edc8d7289780d4232573b6e480bcd0b Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Thu, 1 Jan 2015 02:02:35 +0100
+Subject: [PATCH 2/2] uuid.c: Added missing urlmon CLSIDs and get rid of
+ duplicated IIDs.
+
+This is a partial cherry-pick of 3dc34b66edf0bbe00a51b228d087a9b60e89ef50
+---
+ mingw-w64-crt/Makefile.am   | 2 +-
+ mingw-w64-crt/libsrc/uuid.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
+index d45645c..00458fc 100644
+--- a/mingw-w64-crt/Makefile.am
++++ b/mingw-w64-crt/Makefile.am
+@@ -96,7 +96,7 @@ src_libuuid=\
+   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 \
+diff --git a/mingw-w64-crt/libsrc/uuid.c b/mingw-w64-crt/libsrc/uuid.c
+index 4bfdee9..14edbea 100644
+--- a/mingw-w64-crt/libsrc/uuid.c
++++ b/mingw-w64-crt/libsrc/uuid.c
+@@ -26,6 +26,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);
+@@ -121,6 +122,8 @@ DEFINE_GUID(IID_IAsyncOperation,0x3d8b0590,0xf691,0x11d2,0x8e,0xa9,0x00,0x60,0x9
+ /*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);
+-- 
+2.1.0
+


More information about the scm-commits mailing list