quartz/tests: Fix compilation on systems that don't support nameless structs.
Francois Gouget
fgouget at free.fr
Sun May 20 11:01:52 CDT 2012
---
dlls/quartz/tests/filtergraph.c | 6 +++---
dlls/quartz/tests/filtermapper.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 967a4ac..ea37b2f 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -1798,8 +1798,8 @@ static void test_render_filter_priority(void)
rgf2.dwVersion = 2;
rgf2.dwMerit = MERIT_UNLIKELY;
- S1(U(rgf2)).cPins2 = 1;
- S1(U(rgf2)).rgPins2 = rgPins2;
+ S2(U(rgf2)).cPins2 = 1;
+ S2(U(rgf2)).rgPins2 = rgPins2;
rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER;
rgPins2[0].cInstances = 1;
rgPins2[0].nMediaTypes = 1;
@@ -1825,7 +1825,7 @@ static void test_render_filter_priority(void)
&CLSID_LegacyAmFilterCategory, NULL, &rgf2);
ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr);
- S1(U(rgf2)).cPins2 = 2;
+ S2(U(rgf2)).cPins2 = 2;
rgPins2[0].dwFlags = 0;
rgPinType[0].clsMinorType = &mediasubtype1;
diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c
index 68918f2..b52d17e 100644
--- a/dlls/quartz/tests/filtermapper.c
+++ b/dlls/quartz/tests/filtermapper.c
@@ -104,8 +104,8 @@ static void test_fm2_enummatchingfilters(void)
/* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */
rgf2.dwVersion = 2;
rgf2.dwMerit = MERIT_UNLIKELY;
- S1(U(rgf2)).cPins2 = 1;
- S1(U(rgf2)).rgPins2 = rgPins2;
+ S2(U(rgf2)).cPins2 = 1;
+ S2(U(rgf2)).rgPins2 = rgPins2;
rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER;
rgPins2[0].cInstances = 1;
@@ -136,7 +136,7 @@ static void test_fm2_enummatchingfilters(void)
rgPins2[1].lpMedium = NULL;
rgPins2[1].clsPinCategory = NULL;
- S1(U(rgf2)).cPins2 = 2;
+ S2(U(rgf2)).cPins2 = 2;
hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL,
&CLSID_LegacyAmFilterCategory, NULL, &rgf2);
@@ -418,8 +418,8 @@ static void test_register_filter_with_null_clsMinorType(void)
ZeroMemory(&rgf2, sizeof(rgf2));
rgf2.dwVersion = 1;
rgf2.dwMerit = MERIT_UNLIKELY;
- S(U(rgf2)).cPins = 1;
- S(U(rgf2)).rgPins = &rgPins;
+ S1(U(rgf2)).cPins = 1;
+ S1(U(rgf2)).rgPins = &rgPins;
rgPins.strName = wszPinName;
rgPins.bRendered = 1;
@@ -447,8 +447,8 @@ static void test_register_filter_with_null_clsMinorType(void)
ZeroMemory(&rgf2, sizeof(rgf2));
rgf2.dwVersion = 2;
rgf2.dwMerit = MERIT_UNLIKELY;
- S1(U(rgf2)).cPins2 = 1;
- S1(U(rgf2)).rgPins2 = &rgPins2;
+ S2(U(rgf2)).cPins2 = 1;
+ S2(U(rgf2)).rgPins2 = &rgPins2;
rgPins2.dwFlags = REG_PINFLAG_B_RENDERER;
rgPins2.cInstances = 1;
--
1.7.10
More information about the wine-patches
mailing list