[ros-diffs] [akhaldi] 62810: [QUARTZ_WINETEST] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Sat Apr 19 16:28:22 2014
New Revision: 62810

URL: http://svn.reactos.org/svn/reactos?rev=62810&view=rev
Log:
[QUARTZ_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/rostests/winetests/quartz/CMakeLists.txt
    trunk/rostests/winetests/quartz/avisplitter.c
    trunk/rostests/winetests/quartz/dsoundrender.c
    trunk/rostests/winetests/quartz/filtergraph.c
    trunk/rostests/winetests/quartz/filtermapper.c
    trunk/rostests/winetests/quartz/videorenderer.c

Modified: trunk/rostests/winetests/quartz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/quartz/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/CMakeLists.txt	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -15,5 +15,8 @@
 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)

Modified: trunk/rostests/winetests/quartz/avisplitter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/avisplit…
==============================================================================
--- trunk/rostests/winetests/quartz/avisplitter.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/avisplitter.c	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -57,7 +57,7 @@
     return threads;
 }
 
-static int create_avisplitter(void)
+static BOOL create_avisplitter(void)
 {
     HRESULT hr;
 
@@ -128,7 +128,7 @@
     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 */

Modified: trunk/rostests/winetests/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre…
==============================================================================
--- trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -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 @@
     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 */

Modified: trunk/rostests/winetests/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr…
==============================================================================
--- trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -1094,7 +1094,6 @@
     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 @@
         }
     }
     CoTaskMemFree(pTestFilter->ppPins);
-    pTestFilter->csFilter.DebugInfo->Spare[0] = 0;
     DeleteCriticalSection(&pTestFilter->csFilter);
     CoTaskMemFree(pTestFilter);
 
@@ -1213,7 +1211,6 @@
 
         CoTaskMemFree(This->ppPins);
 
-        This->csFilter.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&This->csFilter);
 
         CoTaskMemFree(This);
@@ -1559,9 +1556,10 @@
     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 @@
     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 @@
     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 @@
     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 @@
         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);
     }
 

Modified: trunk/rostests/winetests/quartz/filtermapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma…
==============================================================================
--- trunk/rostests/winetests/quartz/filtermapper.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/filtermapper.c	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -233,7 +233,7 @@
     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;
 

Modified: trunk/rostests/winetests/quartz/videorenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren…
==============================================================================
--- trunk/rostests/winetests/quartz/videorenderer.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/videorenderer.c	[iso-8859-1] Sat Apr 19 16:28:22 2014
@@ -110,7 +110,7 @@
     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 */