Author: akhaldi Date: Tue Nov 24 12:34:05 2015 New Revision: 70093
URL: http://svn.reactos.org/svn/reactos?rev=70093&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
Added: trunk/rostests/winetests/quartz/mpegsplit.c (with props) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/quartz/fil_data.idl trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/testlist.c
Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeList... ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -8,6 +8,7 @@ filtermapper.c memallocator.c misc.c + mpegsplit.c referenceclock.c videorenderer.c testlist.c)
Modified: trunk/rostests/winetests/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/fil_data.... ============================================================================== --- trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -15,6 +15,8 @@ * 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";
Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergra... ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -180,6 +180,9 @@ ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pF != NULL, "pF is NULL\n");
+ hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); + ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); + /* add the two filters to the graph */ hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); @@ -203,6 +206,15 @@ ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, NULL, pIn); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, NULL); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, pIn); + ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr);
if (pIn) IPin_Release(pIn); if (pEnum) IEnumPins_Release(pEnum);
Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtermap... ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -509,7 +509,7 @@ saBound.lLbound = 0; saBound.cElements = sizeof(data_block); psa = SafeArrayCreate(VT_UI1, 1, &saBound); - ok(psa != NULL, "Unable to crate safe array\n"); + ok(psa != NULL, "Unable to create safe array\n"); if (!psa) goto out; hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); ok(hr == S_OK, "Unable to access array data\n");
Added: trunk/rostests/winetests/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/mpegsplit... ============================================================================== --- trunk/rostests/winetests/quartz/mpegsplit.c (added) +++ trunk/rostests/winetests/quartz/mpegsplit.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -0,0 +1,58 @@ +/* + * Unit tests for the MPEG-1 stream splitter functions + * + * Copyright 2015 Anton Baskanov + * + * 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 + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" + +static IUnknown *create_mpeg_splitter(void) +{ + IUnknown *mpeg_splitter = NULL; + HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&mpeg_splitter); + ok(S_OK == result, "got 0x%08x\n", result); + return mpeg_splitter; +} + +static void test_query_interface(void) +{ + IUnknown *mpeg_splitter = create_mpeg_splitter(); + + IAMStreamSelect *stream_select = NULL; + HRESULT result = IUnknown_QueryInterface( + mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + IAMStreamSelect_Release(stream_select); + } + + IUnknown_Release(mpeg_splitter); +} + +START_TEST(mpegsplit) +{ + CoInitialize(NULL); + + test_query_interface(); + + CoUninitialize(); +}
Propchange: trunk/rostests/winetests/quartz/mpegsplit.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist.... ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -1,4 +1,4 @@ -/* Automatically generated file; DO NOT EDIT!! */ +/* Automatically generated by make depend; DO NOT EDIT!! */
#define STANDALONE #include <wine/test.h> @@ -9,6 +9,7 @@ extern void func_filtermapper(void); extern void func_memallocator(void); extern void func_misc(void); +extern void func_mpegsplit(void); extern void func_referenceclock(void); extern void func_videorenderer(void);
@@ -20,7 +21,8 @@ { "filtermapper", func_filtermapper }, { "memallocator", func_memallocator }, { "misc", func_misc }, + { "mpegsplit", func_mpegsplit }, + { "referenceclock", func_referenceclock }, { "videorenderer", func_videorenderer }, - { "referenceclock", func_referenceclock }, { 0, 0 } };