[PATCH] strmiids: Add evr interface GUIDS

Fabian Maurer dark.shadow4 at web.de
Sat Sep 16 13:50:14 CDT 2017


v2: simplify evr header and add extra source file to strmiids

This is needed since evr includes mfiidl.h, which includes strmif.h.
We need strmif.h GUIDs, but not mfidls.h GUID. Simplest approach is to
add another source file.

Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
 dlls/strmiids/Makefile.in |  1 +
 dlls/strmiids/evr.c       | 24 ++++++++++++++++++++++++
 include/evr.idl           |  5 -----
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 dlls/strmiids/evr.c

diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in
index baf7019b84..09edc7018f 100644
--- a/dlls/strmiids/Makefile.in
+++ b/dlls/strmiids/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = libstrmiids.a
 
 C_SRCS = \
+	evr.c \
 	strmiids.c
diff --git a/dlls/strmiids/evr.c b/dlls/strmiids/evr.c
new file mode 100644
index 0000000000..343a15d95d
--- /dev/null
+++ b/dlls/strmiids/evr.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2017 Fabian Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* Don't define those GUIDs here */
+#include "mfidl.h"
+
+#include "initguid.h"
+
+#include "evr.h"
diff --git a/include/evr.idl b/include/evr.idl
index 22f745e12e..c307da3337 100644
--- a/include/evr.idl
+++ b/include/evr.idl
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "unknwn.idl";
-import "propidl.idl";
 import "mfidl.idl";
-import "mftransform.idl";
-import "mediaobj.idl";
-import "strmif.idl";
 
 typedef enum _MFVP_MESSAGE_TYPE {
     MFVP_MESSAGE_FLUSH,
-- 
2.14.1




More information about the wine-patches mailing list