Nikolay Sivov : quartz/tests: Enable compilation with -D__WINESRC__.

Alexandre Julliard julliard at winehq.org
Tue Oct 29 15:12:26 CDT 2013


Module: wine
Branch: master
Commit: ff3521718d13c21440cfca4472b9dddac143f4ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff3521718d13c21440cfca4472b9dddac143f4ee

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Oct 29 19:27:07 2013 +0400

quartz/tests: Enable compilation with -D__WINESRC__.

---

 dlls/quartz/tests/Makefile.in   |    1 -
 dlls/quartz/tests/filtergraph.c |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index d4f7c41..ae5fbac 100644
--- a/dlls/quartz/tests/Makefile.in
+++ b/dlls/quartz/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = quartz.dll
 IMPORTS   = oleaut32 ole32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	avisplitter.c \
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 6e839a8..68ac884 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -1643,7 +1643,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 +1699,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 +1751,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 +1847,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);
     }
 




More information about the wine-cvs mailing list