Commit d2910bb7 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

quartz/tests: Simplify the file handling in filtergraph.c.

parent ee9ca54e
...@@ -41,9 +41,8 @@ typedef struct TestFilterImpl ...@@ -41,9 +41,8 @@ typedef struct TestFilterImpl
UINT nPins; UINT nPins;
} TestFilterImpl; } TestFilterImpl;
#define FILE_LEN 9 static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0};
static const char avifileA[FILE_LEN] = "test.avi"; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0};
static const char mpegfileA[FILE_LEN] = "test.mpg";
static IGraphBuilder *pgraph; static IGraphBuilder *pgraph;
...@@ -53,17 +52,6 @@ static int createfiltergraph(void) ...@@ -53,17 +52,6 @@ static int createfiltergraph(void)
&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph);
} }
static void renderfile(const char * fileA)
{
HRESULT hr;
WCHAR fileW[FILE_LEN];
MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN);
hr = IGraphBuilder_RenderFile(pgraph, fileW, NULL);
ok(hr==S_OK, "RenderFile returned: %x\n", hr);
}
static void rungraph(void) static void rungraph(void)
{ {
HRESULT hr; HRESULT hr;
...@@ -155,17 +143,19 @@ static void releasefiltergraph(void) ...@@ -155,17 +143,19 @@ static void releasefiltergraph(void)
ok(hr==0, "Releasing filtergraph returned: %x\n", hr); ok(hr==0, "Releasing filtergraph returned: %x\n", hr);
} }
static void test_render_run(const char * fileA) static void test_render_run(const WCHAR *file)
{ {
HANDLE h; HANDLE h;
HRESULT hr;
if (!createfiltergraph()) if (!createfiltergraph())
return; return;
h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
CloseHandle(h); CloseHandle(h);
renderfile(fileA); hr = IGraphBuilder_RenderFile(pgraph, file, NULL);
ok(hr==S_OK, "RenderFile returned: %x\n", hr);
rungraph(); rungraph();
} }
...@@ -1883,8 +1873,8 @@ static void test_render_filter_priority(void) ...@@ -1883,8 +1873,8 @@ static void test_render_filter_priority(void)
START_TEST(filtergraph) START_TEST(filtergraph)
{ {
CoInitializeEx(NULL, COINIT_MULTITHREADED); CoInitializeEx(NULL, COINIT_MULTITHREADED);
test_render_run(avifileA); test_render_run(avifile);
test_render_run(mpegfileA); test_render_run(mpegfile);
test_graph_builder(); test_graph_builder();
test_graph_builder_addfilter(); test_graph_builder_addfilter();
test_mediacontrol(); test_mediacontrol();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment