winmm/tests: Replace some '#if 0's with 'if (0)'s.
Francois Gouget
fgouget at free.fr
Thu Jan 11 08:35:11 CST 2007
Fix the code so it compiles without warnings.
---
Let me know if I should submit a patch adding a try+catch to
waveInGetDevCapsA() rather than wait for an application that needs it to
show up.
dlls/winmm/tests/capture.c | 20 ++++++++++++--------
dlls/winmm/tests/wave.c | 12 ++++++++----
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index 1dadd82..f148df4 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -329,27 +329,29 @@ static void wave_in_test_device(int device)
"waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(device),wave_in_error(rc));
- rc=waveInGetDevCapsA(device,0,sizeof(capsA));
+ rc=waveInGetDevCapsA(device,NULL,sizeof(capsA));
ok(rc==MMSYSERR_INVALPARAM,
"waveInGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n",
dev_name(device),wave_in_error(rc));
- rc=waveInGetDevCapsW(device,0,sizeof(capsW));
+ rc=waveInGetDevCapsW(device,NULL,sizeof(capsW));
ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED,
"waveInGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(device),wave_in_error(rc));
-#if 0 /* FIXME: this works on windows but crashes wine */
- rc=waveInGetDevCapsA(device,1,sizeof(capsA));
+ if (0)
+ {
+ /* FIXME: this works on windows but crashes wine */
+ rc=waveInGetDevCapsA(device,(LPWAVEINCAPSA)1,sizeof(capsA));
ok(rc==MMSYSERR_INVALPARAM,
"waveInGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n",
dev_name(device),wave_in_error(rc));
- rc=waveInGetDevCapsW(device,1,sizeof(capsW));
+ rc=waveInGetDevCapsW(device,(LPWAVEINCAPSW)1,sizeof(capsW));
ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED,
"waveInGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(device),wave_in_error(rc));
-#endif
+ }
rc=waveInGetDevCapsA(device,&capsA,4);
ok(rc==MMSYSERR_NOERROR,
@@ -572,7 +574,9 @@ static void wave_in_test_device(int device)
trace("waveInOpen(%s): 6 channels not supported\n",
dev_name(device));
-#if 0 /* ALSA doesn't like this */
+ if (0)
+ {
+ /* FIXME: ALSA doesn't like this */
/* test if 24 bit samples supported */
wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE;
wfex.Format.nChannels=2;
@@ -596,7 +600,7 @@ static void wave_in_test_device(int device)
} else
trace("waveInOpen(%s): 24 bit samples not supported\n",
dev_name(device));
-#endif
+ }
/* test if 32 bit samples supported */
wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE;
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 1ab9a19..fd20571 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -838,7 +838,9 @@ static void wave_out_test_device(int device)
"waveOutGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(device),wave_out_error(rc));
-#if 0 /* FIXME: this works on windows but crashes wine */
+ if (0)
+ {
+ /* FIXME: this works on windows but crashes wine */
rc=waveOutGetDevCapsA(device,(LPWAVEOUTCAPSA)1,sizeof(capsA));
ok(rc==MMSYSERR_INVALPARAM,
"waveOutGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n",
@@ -848,7 +850,7 @@ static void wave_out_test_device(int device)
ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED,
"waveOutGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(device),wave_out_error(rc));
-#endif
+ }
rc=waveOutGetDevCapsA(device,&capsA,4);
ok(rc==MMSYSERR_NOERROR,
@@ -1257,7 +1259,9 @@ static void wave_out_test_device(int device)
trace("waveOutOpen(%s): 6 channels not supported\n",
dev_name(device));
-#if 0 /* ALSA doesn't like this format */
+ if (0)
+ {
+ /* FIXME: ALSA doesn't like this format */
/* test if 24 bit samples supported */
wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE;
wfex.Format.nChannels=2;
@@ -1283,7 +1287,7 @@ static void wave_out_test_device(int device)
} else
trace("waveOutOpen(%s): 24 bit samples not supported\n",
dev_name(device));
-#endif
+ }
/* test if 32 bit samples supported */
wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE;
--
1.4.4.2
More information about the wine-patches
mailing list