include: Consolidate the IAMFilterData iface declaration.
Michael Stefaniuc
mstefani at redhat.de
Fri Jul 8 02:58:18 CDT 2011
---
IAMFilterData is documented and in the SDK but not in the include
directory.
dlls/dxdiagn/Makefile.in | 2 -
dlls/dxdiagn/fil_data.idl | 45 --------------------------------------------
dlls/dxdiagn/provider.c | 2 +-
dlls/quartz/filtermapper.c | 45 +------------------------------------------
include/Makefile.in | 1 +
include/wine/fil_data.idl | 45 ++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 49 insertions(+), 91 deletions(-)
delete mode 100644 dlls/dxdiagn/fil_data.idl
create mode 100644 include/wine/fil_data.idl
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index 6276e74..e4c43c1 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -9,8 +9,6 @@ C_SRCS = \
RC_SRCS = dxdiagn.rc
PO_SRCS = dxdiagn.rc
-IDL_H_SRCS = fil_data.idl
-
IDL_R_SRCS = dxdiagn.idl
@MAKE_DLL_RULES@
diff --git a/dlls/dxdiagn/fil_data.idl b/dlls/dxdiagn/fil_data.idl
deleted file mode 100644
index 806c053..0000000
--- a/dlls/dxdiagn/fil_data.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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
- */
-
-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);
-}
diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index 2a48b2e..f9f7430 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -36,7 +36,7 @@
#include "d3d9.h"
#include "strmif.h"
#include "initguid.h"
-#include "fil_data.h"
+#include "wine/fil_data.h"
#include "psapi.h"
#include "wine/debug.h"
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 78b6699..c4e813b 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -36,6 +36,8 @@
#include "strmif.h"
#include "wine/unicode.h"
#include "uuids.h"
+#include "initguid.h"
+#include "wine/fil_data.h"
#include "wine/debug.h"
@@ -43,49 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0]))
-/* Unexposed IAMFilterData interface */
-typedef struct IAMFilterData IAMFilterData;
-
-typedef struct IAMFilterDataVtbl
-{
- BEGIN_INTERFACE
-
- /*** IUnknown methods ***/
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(
- IAMFilterData *This,
- REFIID riid,
- void **ppvObject);
-
- ULONG (STDMETHODCALLTYPE *AddRef)(
- IAMFilterData *This);
-
- ULONG (STDMETHODCALLTYPE *Release)(
- IAMFilterData *This);
-
- /*** IAMFilterData methods ***/
- HRESULT (STDMETHODCALLTYPE *ParseFilterData)(
- IAMFilterData *This,
- BYTE *pData,
- ULONG cb,
- BYTE **ppRegFilter2);
-
- HRESULT (STDMETHODCALLTYPE *CreateFilterData)(
- IAMFilterData* This,
- REGFILTER2 *prf2,
- BYTE **pRegFilterData,
- ULONG *pcb);
-
- END_INTERFACE
-} IAMFilterDataVtbl;
-struct IAMFilterData
-{
- const IAMFilterDataVtbl *lpVtbl;
-};
-static const GUID IID_IAMFilterData = {
- 0x97f7c4d4, 0x547b, 0x4a5f, { 0x83,0x32, 0x53,0x64,0x30,0xad,0x2e,0x4d }
-};
-
-
typedef struct FilterMapper3Impl
{
IFilterMapper3 IFilterMapper3_iface;
diff --git a/include/Makefile.in b/include/Makefile.in
index b691ffa..492cce4 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,4 +1,5 @@
PRIVATE_IDL_H_SRCS = \
+ wine/fil_data.idl \
wine/winedxgi.idl
PUBLIC_IDL_H_SRCS = \
diff --git a/include/wine/fil_data.idl b/include/wine/fil_data.idl
new file mode 100644
index 0000000..806c053
--- /dev/null
+++ b/include/wine/fil_data.idl
@@ -0,0 +1,45 @@
+/*
+ * 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
+ */
+
+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);
+}
--
1.7.6
More information about the wine-patches
mailing list