Francois Gouget : dmsynth/tests: Fix compilation on systems that don' t support nameless structs or unions.

Alexandre Julliard julliard at winehq.org
Mon May 6 14:08:44 CDT 2013


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat May  4 09:30:49 2013 +0200

dmsynth/tests: Fix compilation on systems that don't support nameless structs or unions.

---

 dlls/dmsynth/tests/dmsynth.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index 83a0bca..ba094a1 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -56,30 +56,30 @@ static void test_dmsynth(void)
     hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth);
     ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr);
 
-    property.Id = 0;
-    property.Flags = KSPROPERTY_TYPE_GET;
+    S(U(property)).Id = 0;
+    S(U(property)).Flags = KSPROPERTY_TYPE_GET;
 
-    property.Set = GUID_DMUS_PROP_INSTRUMENT2;
+    S(U(property)).Set = GUID_DMUS_PROP_INSTRUMENT2;
     hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);
     ok(value == TRUE, "Return value: %u, should be 1\n", value);
-    property.Set = GUID_DMUS_PROP_DLS2;
+    S(U(property)).Set = GUID_DMUS_PROP_DLS2;
     hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);
     ok(value == TRUE, "Return value: %u, should be 1\n", value);
-    property.Set = GUID_DMUS_PROP_GM_Hardware;
+    S(U(property)).Set = GUID_DMUS_PROP_GM_Hardware;
     hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);
     ok(value == FALSE, "Return value: %u, should be 0\n", value);
-    property.Set = GUID_DMUS_PROP_GS_Hardware;
+    S(U(property)).Set = GUID_DMUS_PROP_GS_Hardware;
     hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);
     ok(value == FALSE, "Return value: %u, should be 0\n", value);
-    property.Set = GUID_DMUS_PROP_XG_Hardware;
+    S(U(property)).Set = GUID_DMUS_PROP_XG_Hardware;
     hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);
@@ -88,7 +88,7 @@ static void test_dmsynth(void)
     hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink);
     ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr);
 
-    property.Set = GUID_DMUS_PROP_SinkUsesDSound;
+    S(U(property)).Set = GUID_DMUS_PROP_SinkUsesDSound;
     hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes);
     ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr);
     ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);




More information about the wine-cvs mailing list