include: Make fil_data.idl a common header.

dlls/devenum/Makefile.in

@@ -9,7 +9,6 @@ C_SRCS = \
 	parsedisplayname.c
 
 IDL_SRCS = \
-	devenum_classes.idl \
-	fil_data.idl
+	devenum_classes.idl
 
 RC_SRCS = devenum.rc

dlls/devenum/createdevenum.c

@@ -37,7 +37,7 @@
 #include "mmddk.h"
 
 #include "initguid.h"
-#include "fil_data.h"
+#include "wine/fil_data.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(devenum);
 

dlls/dxdiagn/Makefile.in

@@ -9,5 +9,4 @@ C_SRCS = \
 RC_SRCS = dxdiagn.rc
 
 IDL_SRCS = \
-	dxdiagn.idl \
-	fil_data.idl
+	dxdiagn.idl

dlls/dxdiagn/fil_data.idl

-/*
- * Copyright (C) 2009 Vitaliy Margolen
- *
- * 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
- */
-
-#pragma makedep header
-
-import "objidl.idl";
-import "strmif.idl";
-import "unknwn.idl";
-
-
-/*****************************************************************************
- * IAMFilterData interface
- */
-[
-    object,
-    uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d),
-    pointer_default(unique)
-]
-interface IAMFilterData : IUnknown
-{
-    typedef [unique] IAMFilterData *LPIAMFILTERDATA;
-
-    HRESULT ParseFilterData(
-        [in] BYTE * rgbFilterData,
-        [in] ULONG cb,
-        [out] BYTE ** prgbRegFilter2);
-
-    HRESULT CreateFilterData(
-        [in] REGFILTER2 * prf2,
-        [out] BYTE ** prgbFilterData,
-        [out] ULONG * pcb);
-}

dlls/dxdiagn/provider.c

@@ -35,7 +35,7 @@
 #include "d3d9.h"
 #include "strmif.h"
 #include "initguid.h"
-#include "fil_data.h"
+#include "wine/fil_data.h"
 #include "psapi.h"
 #include "wbemcli.h"
 

dlls/quartz/Makefile.in

@@ -30,7 +30,6 @@ RC_SRCS = version.rc
 
 IDL_SRCS = \
 	control_tlb.idl \
-	fil_data.idl \
 	quartz_strmif.idl
 
 dlldata_EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL

dlls/quartz/fil_data.idl

-/*
- * Copyright (C) 2009 Vitaliy Margolen
- *
- * 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
- */
-
-#pragma makedep header
-
-import "objidl.idl";
-import "strmif.idl";
-import "unknwn.idl";
-
-
-/*****************************************************************************
- * IAMFilterData interface
- *
- * Notes:
- *     - This interface is deprecated and IFilterMapper2 should be used instead.
- *     - There is no full replacement for IAMFilterData::ParseFilterData short of manually
- *       parsing out the REGFILTER2 struct from the binary blob.
- */
-[
-    object,
-    uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d),
-    pointer_default(unique)
-]
-interface IAMFilterData : IUnknown
-{
-    typedef [unique] IAMFilterData *LPIAMFILTERDATA;
-
-    HRESULT ParseFilterData(
-        [in] BYTE * rgbFilterData,
-        [in] ULONG cb,
-        [out] BYTE ** prgbRegFilter2);
-
-    HRESULT CreateFilterData(
-        [in] REGFILTER2 * prf2,
-        [out] BYTE ** prgbFilterData,
-        [out] ULONG * pcb);
-}

dlls/quartz/filtermapper.c

@@ -37,7 +37,7 @@
 #include "wine/unicode.h"
 #include "uuids.h"
 #include "initguid.h"
-#include "fil_data.h"
+#include "wine/fil_data.h"
 
 #include "wine/debug.h"
 

dlls/quartz/tests/Makefile.in

@@ -12,7 +12,6 @@ C_SRCS = \
 	referenceclock.c \
 	videorenderer.c
 
-IDL_SRCS = fil_data.idl
 
 RC_SRCS = \
 	rsrc.rc

dlls/quartz/tests/fil_data.idl

-/*
- * Copyright (C) 2009 Vitaliy Margolen
- *
- * 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
- */
-
-#pragma makedep header
-
-import "objidl.idl";
-import "strmif.idl";
-import "unknwn.idl";
-
-
-/*****************************************************************************
- * IAMFilterData interface
- *
- * Notes:
- *     - This interface is deprecated and IFilterMapper2 should be used instead.
- *     - There is no full replacement for IAMFilterData::ParseFilterData short of manually
- *       parsing out the REGFILTER2 struct from the binary blob.
- */
-[
-    object,
-    uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d),
-    pointer_default(unique)
-]
-interface IAMFilterData : IUnknown
-{
-    typedef [unique] IAMFilterData *LPIAMFILTERDATA;
-
-    HRESULT ParseFilterData(
-        [in] BYTE * rgbFilterData,
-        [in] ULONG cb,
-        [out] BYTE ** prgbRegFilter2);
-
-    HRESULT CreateFilterData(
-        [in] REGFILTER2 * prf2,
-        [out] BYTE ** prgbFilterData,
-        [out] ULONG * pcb);
-}

dlls/quartz/tests/filtermapper.c

@@ -26,7 +26,7 @@
 #include "dshow.h"
 #include "winternl.h"
 
-#include "fil_data.h"
+#include "wine/fil_data.h"
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 

include/Makefile.in

@@ -663,6 +663,7 @@ SOURCES = \
 	windowsx.h \
 	wine/debug.h \
 	wine/exception.h \
+	wine/fil_data.idl \
 	wine/itss.idl \
 	wine/library.h \
 	wine/svcctl.idl \

dlls/devenum/fil_data.idl → include/wine/fil_data.idl

@@ -18,14 +18,9 @@
 
 #pragma makedep header
 
-import "objidl.idl";
-import "strmif.idl";
 import "unknwn.idl";
+import "strmif.idl";
 
-
-/*****************************************************************************
- * IAMFilterData interface
- */
 [
     object,
     uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d),
@@ -33,15 +28,7 @@ import "unknwn.idl";
 ]
 interface IAMFilterData : IUnknown
 {
-    typedef [unique] IAMFilterData *LPIAMFILTERDATA;
-
-    HRESULT ParseFilterData(
-        [in] BYTE * rgbFilterData,
-        [in] ULONG cb,
-        [out] BYTE ** prgbRegFilter2);
+    HRESULT ParseFilterData( [in] BYTE *data, [in] ULONG size, [out] BYTE **regfilter );
 
-    HRESULT CreateFilterData(
-        [in] REGFILTER2 * prf2,
-        [out] BYTE ** prgbFilterData,
-        [out] ULONG * pcb);
+    HRESULT CreateFilterData( [in] REGFILTER2 *regfilter, [out] BYTE **data, [out] ULONG *size );
 }