Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 14:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QUARTZ_WINETEST]

Browse source 
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64306
This commit is contained in:
Amine Khaldi 2014-09-26 09:51:20 +00:00
parent 80675f700d
commit 3b71331829
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1847,17 +1847,17 @@ static void test_render_filter_priority(void)
get_connected_filter_name(ptestfilter, ConnectedFilterName1); get_connected_filter_name(ptestfilter, ConnectedFilterName1);
ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"),
"unexpected connected filter: %s\n", ConnectedFilterName1); "unexpected connected filter: %s\n", ConnectedFilterName1);
}
hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL,
&CLSID_TestFilter2); &CLSID_TestFilter2);
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr);
hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL,
&CLSID_TestFilter3); &CLSID_TestFilter3);
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr);
hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL,
&CLSID_TestFilter4); &CLSID_TestFilter4);
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr);
}
out: out:
@ -1877,7 +1877,6 @@ static void test_render_filter_priority(void)
START_TEST(filtergraph) START_TEST(filtergraph)
{ {
HRESULT hr; HRESULT hr;
CoInitializeEx(NULL, COINIT_MULTITHREADED); CoInitializeEx(NULL, COINIT_MULTITHREADED);
hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER,
&IID_IGraphBuilder, (LPVOID*)&pgraph); &IID_IGraphBuilder, (LPVOID*)&pgraph);
@ -1885,6 +1884,7 @@ START_TEST(filtergraph)
skip("Creating filtergraph returned %08x, skipping tests\n", hr); skip("Creating filtergraph returned %08x, skipping tests\n", hr);
return; return;
} }
IGraphBuilder_Release(pgraph);
test_render_run(avifile); test_render_run(avifile);
test_render_run(mpegfile); test_render_run(mpegfile);
test_graph_builder(); test_graph_builder();

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

@ -62,7 +62,7 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum)
{ {
CHAR val1[512], val2[512]; CHAR val1[512], val2[512];
WideCharToMultiByte(CP_ACP, 0, V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); WideCharToMultiByte(CP_ACP, 0, V_BSTR(&var), -1, val1, sizeof(val1), 0, 0);
WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0);
if (!lstrcmpA(val1, val2)) found = TRUE; if (!lstrcmpA(val1, val2)) found = TRUE;
} }
@ -87,7 +87,7 @@ static void test_fm2_enummatchingfilters(void)
CLSID clsidFilter1; CLSID clsidFilter1;
CLSID clsidFilter2; CLSID clsidFilter2;
IEnumMoniker *pEnum = NULL; IEnumMoniker *pEnum = NULL;
BOOL found; BOOL found, registered = TRUE;
ZeroMemory(&rgf2, sizeof(rgf2)); ZeroMemory(&rgf2, sizeof(rgf2));
@ -121,7 +121,10 @@ static void test_fm2_enummatchingfilters(void)
hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL,
&CLSID_LegacyAmFilterCategory, NULL, &rgf2); &CLSID_LegacyAmFilterCategory, NULL, &rgf2);
if (hr == E_ACCESSDENIED) if (hr == E_ACCESSDENIED)
{
registered = FALSE;
skip("Not authorized to register filters\n"); skip("Not authorized to register filters\n");
}
else else
{ {
ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr);
@ -192,13 +195,16 @@ static void test_fm2_enummatchingfilters(void)
ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); ok(!found, "EnumMatchingFilters should not return the test filter 2\n");
} }
hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, if (registered)
&clsidFilter1); {
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL,
&clsidFilter1);
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr);
hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL,
&clsidFilter2); &clsidFilter2);
ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr);
}
out: out:

10
rostests/winetests/quartz/referenceclock.c
View file

@ -28,19 +28,21 @@
static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock)
{ {
HRESULT hr; HRESULT hr;
IUnknown *pF; void *pF;
hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF);
ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr);
ok(pF != NULL, "pF is NULL\n"); ok(pF != NULL, "pF is NULL\n");
if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF);
hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF);
ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr);
ok(pF == NULL, "pF is not NULL\n"); ok(pF == NULL, "pF is not NULL\n");
hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF);
ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr);
ok(pF != NULL, "pF is NULL\n"); ok(pF != NULL, "pF is NULL\n");
if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF);
} }
/* The following method expects a reference clock that will keep ticking for /* The following method expects a reference clock that will keep ticking for