Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QUARTZ_WINETEST]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62810
This commit is contained in:
Amine Khaldi 2014-04-19 16:28:22 +00:00
parent 6069c46a4d
commit fa2c5bdeb0
6 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rostests/winetests/quartz/CMakeLists.txt
View file

@ -15,5 +15,8 @@ add_executable(quartz_winetest ${SOURCE})
target_link_libraries(quartz_winetest uuid)
add_dependencies(quartz_winetest quartz_test_idlheader)
set_module_type(quartz_winetest win32cui)
add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(quartz_winetest ntdll)
endif()
add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)

4
rostests/winetests/quartz/avisplitter.c
View file

@ -57,7 +57,7 @@ static int count_threads(void)
return threads;
}
static int create_avisplitter(void)
static BOOL create_avisplitter(void)
{
HRESULT hr;
@ -128,7 +128,7 @@ static void test_basefilter(void)
ULONG ref;
HRESULT hr;
IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void *)&base);
IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void **)&base);
if (base == NULL)
{
/* test_query_interface handles this case */

4
rostests/winetests/quartz/dsoundrender.c
View file

@ -39,7 +39,7 @@
static IUnknown *pDSRender = NULL;
static int create_dsound_renderer(void)
static BOOL create_dsound_renderer(void)
{
HRESULT hr;
@ -179,7 +179,7 @@ static void test_basefilter(void)
ULONG ref;
HRESULT hr;
IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void *)&base);
IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void **)&base);
if (base == NULL)
{
/* test_query_interface handles this case */

20
rostests/winetests/quartz/filtergraph.c
View file

@ -1094,7 +1094,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi
pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl;
pTestFilter->refCount = 1;
InitializeCriticalSection(&pTestFilter->csFilter);
pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter");
pTestFilter->state = State_Stopped;
ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO));
@ -1149,7 +1148,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi
}
}
CoTaskMemFree(pTestFilter->ppPins);
pTestFilter->csFilter.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&pTestFilter->csFilter);
CoTaskMemFree(pTestFilter);
@ -1213,7 +1211,6 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface)
CoTaskMemFree(This->ppPins);
This->csFilter.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->csFilter);
CoTaskMemFree(This);
@ -1559,9 +1556,10 @@ static void test_render_filter_priority(void)
static const WCHAR wszFilterInstanceName4[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 'I',
'n', 's', 't', 'a', 'n', 'c', 'e', '4', 0 };
/* Test which renderer of two already added to the graph will be chosen (one is "exact" match, other is
"wildcard" match. Seems to very by order in which filters are added to the graph, thus indicating
no preference given to exact match. */
/* Test which renderer of two already added to the graph will be chosen
* (one is "exact" match, other is "wildcard" match. Seems to depend
* on the order in which filters are added to the graph, thus indicating
* no preference given to exact match. */
hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2);
ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr);
if (!pgraph2) return;
@ -1643,7 +1641,7 @@ static void test_render_filter_priority(void)
ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr);
get_connected_filter_name(ptestfilter, ConnectedFilterName2);
ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2),
ok(strcmp(ConnectedFilterName1, ConnectedFilterName2),
"expected connected filters to be different but got %s both times\n", ConnectedFilterName1);
IFilterGraph2_Release(pgraph2);
@ -1699,7 +1697,7 @@ static void test_render_filter_priority(void)
ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr);
get_connected_filter_name(ptestfilter, ConnectedFilterName1);
ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName1, "TestfilterInstance2"),
ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3") || !strcmp(ConnectedFilterName1, "TestfilterInstance2"),
"unexpected connected filter: %s\n", ConnectedFilterName1);
IFilterGraph2_Release(pgraph2);
@ -1751,9 +1749,9 @@ static void test_render_filter_priority(void)
ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr);
get_connected_filter_name(ptestfilter, ConnectedFilterName2);
ok(!lstrcmp(ConnectedFilterName2, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName2, "TestfilterInstance2"),
ok(!strcmp(ConnectedFilterName2, "TestfilterInstance3") || !strcmp(ConnectedFilterName2, "TestfilterInstance2"),
"unexpected connected filter: %s\n", ConnectedFilterName2);
ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2),
ok(strcmp(ConnectedFilterName1, ConnectedFilterName2),
"expected connected filters to be different but got %s both times\n", ConnectedFilterName1);
IFilterGraph2_Release(pgraph2);
@ -1847,7 +1845,7 @@ static void test_render_filter_priority(void)
ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr);
get_connected_filter_name(ptestfilter, ConnectedFilterName1);
ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"),
ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"),
"unexpected connected filter: %s\n", ConnectedFilterName1);
}

2
rostests/winetests/quartz/filtermapper.c
View file

@ -233,7 +233,7 @@ static void test_legacy_filter_registration(void)
ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr);
if (FAILED(hr)) goto out;
hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (LPVOID)&pMapper);
hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (void **)&pMapper);
ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr);
if (FAILED(hr)) goto out;

2
rostests/winetests/quartz/videorenderer.c
View file

@ -110,7 +110,7 @@ static void test_basefilter(void)
ULONG ref;
HRESULT hr;
IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void *)&base);
IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void **)&base);
if (base == NULL)
{
/* test_query_interface handles this case */