[QUARTZ_WINETEST]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62810

diff --git a/rostests/winetests/quartz/CMakeLists.txt b/rostests/winetests/quartz/CMakeLists.txt
index 901dc06..086628c 100644 (file)
--- a/rostests/winetests/quartz/CMakeLists.txt
+++ b/rostests/winetests/quartz/CMakeLists.txt
@@ -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)
 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)
 add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)

diff --git a/rostests/winetests/quartz/avisplitter.c b/rostests/winetests/quartz/avisplitter.c
index ad01906..2fa7f91 100644 (file)
--- a/rostests/winetests/quartz/avisplitter.c
+++ b/rostests/winetests/quartz/avisplitter.c
@@ -57,7 +57,7 @@ static int count_threads(void)
     return threads;
 }
 
     return threads;
 }
 

-static int create_avisplitter(void)
+static BOOL create_avisplitter(void)

 {
     HRESULT hr;
 
 {
     HRESULT hr;
 


@@ -128,7 +128,7 @@ static void test_basefilter(void)
     ULONG ref;
     HRESULT hr;
 
     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 */
     if (base == NULL)
     {
         /* test_query_interface handles this case */

diff --git a/rostests/winetests/quartz/dsoundrender.c b/rostests/winetests/quartz/dsoundrender.c
index 336cbfa..3a8f8da 100644 (file)
--- a/rostests/winetests/quartz/dsoundrender.c
+++ b/rostests/winetests/quartz/dsoundrender.c
@@ -39,7 +39,7 @@
 
 static IUnknown *pDSRender = NULL;
 
 
 static IUnknown *pDSRender = NULL;
 

-static int create_dsound_renderer(void)
+static BOOL create_dsound_renderer(void)

 {
     HRESULT hr;
 
 {
     HRESULT hr;
 


@@ -179,7 +179,7 @@ static void test_basefilter(void)
     ULONG ref;
     HRESULT hr;
 
     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 */
     if (base == NULL)
     {
         /* test_query_interface handles this case */

diff --git a/rostests/winetests/quartz/filtergraph.c b/rostests/winetests/quartz/filtergraph.c
index 50ab5cf..166472d 100644 (file)
--- a/rostests/winetests/quartz/filtergraph.c
+++ b/rostests/winetests/quartz/filtergraph.c
@@ -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->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));
     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);
         }
     }
     CoTaskMemFree(pTestFilter->ppPins);

-    pTestFilter->csFilter.DebugInfo->Spare[0] = 0;

     DeleteCriticalSection(&pTestFilter->csFilter);
     CoTaskMemFree(pTestFilter);
 
     DeleteCriticalSection(&pTestFilter->csFilter);
     CoTaskMemFree(pTestFilter);
 


@@ -1213,7 +1211,6 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface)
 
         CoTaskMemFree(This->ppPins);
 
 
         CoTaskMemFree(This->ppPins);
 

-        This->csFilter.DebugInfo->Spare[0] = 0;

         DeleteCriticalSection(&This->csFilter);
 
         CoTaskMemFree(This);
         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 };
 
     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;
     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(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);
         "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(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);
             "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(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);
             "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);
         "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(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);
     }
 
            "unexpected connected filter: %s\n", ConnectedFilterName1);
     }
 

diff --git a/rostests/winetests/quartz/filtermapper.c b/rostests/winetests/quartz/filtermapper.c
index b52d17e..a67df1d 100644 (file)
--- a/rostests/winetests/quartz/filtermapper.c
+++ b/rostests/winetests/quartz/filtermapper.c
@@ -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;
 
     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;
 
     ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr);
     if (FAILED(hr)) goto out;
 

diff --git a/rostests/winetests/quartz/videorenderer.c b/rostests/winetests/quartz/videorenderer.c
index 67f7dd8..d826ce9 100644 (file)
--- a/rostests/winetests/quartz/videorenderer.c
+++ b/rostests/winetests/quartz/videorenderer.c
@@ -110,7 +110,7 @@ static void test_basefilter(void)
     ULONG ref;
     HRESULT hr;
 
     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 */
     if (base == NULL)
     {
         /* test_query_interface handles this case */