Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/devenum/Makefile.in | 3 +- dlls/devenum/createdevenum.c | 2 +- dlls/devenum/fil_data.idl | 47 -------------------------- dlls/dxdiagn/Makefile.in | 3 +- dlls/dxdiagn/provider.c | 2 +- dlls/quartz/Makefile.in | 1 - dlls/quartz/fil_data.idl | 52 ----------------------------- dlls/quartz/filtermapper.c | 2 +- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/fil_data.idl | 52 ----------------------------- dlls/quartz/tests/filtermapper.c | 2 +- include/Makefile.in | 1 + {dlls/dxdiagn => include/wine}/fil_data.idl | 21 ++---------- 13 files changed, 10 insertions(+), 179 deletions(-) delete mode 100644 dlls/devenum/fil_data.idl delete mode 100644 dlls/quartz/fil_data.idl delete mode 100644 dlls/quartz/tests/fil_data.idl rename {dlls/dxdiagn => include/wine}/fil_data.idl (67%)
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index d1407a9..2760eed 100644 --- a/dlls/devenum/Makefile.in +++ b/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 diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e3ae54f..4b2feca 100644 --- a/dlls/devenum/createdevenum.c +++ b/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);
diff --git a/dlls/devenum/fil_data.idl b/dlls/devenum/fil_data.idl deleted file mode 100644 index 7e37a75..0000000 --- a/dlls/devenum/fil_data.idl +++ /dev/null @@ -1,47 +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 - */ - -#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); -} diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 3a1017e..c16396e 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -9,5 +9,4 @@ C_SRCS = \ RC_SRCS = dxdiagn.rc
IDL_SRCS = \ - dxdiagn.idl \ - fil_data.idl + dxdiagn.idl diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 4f964ad..1fdab5e 100644 --- a/dlls/dxdiagn/provider.c +++ b/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"
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e938865..5eb8d44 100644 --- a/dlls/quartz/Makefile.in +++ b/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 diff --git a/dlls/quartz/fil_data.idl b/dlls/quartz/fil_data.idl deleted file mode 100644 index ab93499..0000000 --- a/dlls/quartz/fil_data.idl +++ /dev/null @@ -1,52 +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 - */ - -#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); -} diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 20c7e3a..d78f643 100644 --- a/dlls/quartz/filtermapper.c +++ b/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"
diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 4f54666..6b880c3 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ referenceclock.c \ videorenderer.c
-IDL_SRCS = fil_data.idl
RC_SRCS = \ rsrc.rc diff --git a/dlls/quartz/tests/fil_data.idl b/dlls/quartz/tests/fil_data.idl deleted file mode 100644 index ab93499..0000000 --- a/dlls/quartz/tests/fil_data.idl +++ /dev/null @@ -1,52 +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 - */ - -#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); -} diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 5a43785..7b6a018 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/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);
diff --git a/include/Makefile.in b/include/Makefile.in index 39f2691..995544a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -664,6 +664,7 @@ SOURCES = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/fil_data.idl \ wine/itss.idl \ wine/library.h \ wine/svcctl.idl \ diff --git a/dlls/dxdiagn/fil_data.idl b/include/wine/fil_data.idl similarity index 67% rename from dlls/dxdiagn/fil_data.idl rename to include/wine/fil_data.idl index 7e37a75..19dfa8a 100644 --- a/dlls/dxdiagn/fil_data.idl +++ b/include/wine/fil_data.idl @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#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 +26,7 @@ import "unknwn.idl"; ] interface IAMFilterData : IUnknown { - typedef [unique] IAMFilterData *LPIAMFILTERDATA; + HRESULT ParseFilterData( [in] BYTE *data, [in] ULONG size, [out] BYTE **regfilter );
- HRESULT ParseFilterData( - [in] BYTE * rgbFilterData, - [in] ULONG cb, - [out] BYTE ** prgbRegFilter2); - - HRESULT CreateFilterData( - [in] REGFILTER2 * prf2, - [out] BYTE ** prgbFilterData, - [out] ULONG * pcb); + HRESULT CreateFilterData( [in] REGFILTER2 *regfilter, [out] BYTE **data, [out] ULONG *size ); }