Michael Stefaniuc : winmm: Avoid TRUE FALSE conditional expressions.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Tue Jul 31 10:58:15 2012 +0200

winmm: Avoid TRUE FALSE conditional expressions.

---

dlls/winmm/mmio.c       |    2 +-
 dlls/winmm/playsound.c  |    2 +-
 dlls/winmm/tests/wave.c |    2 +-
 dlls/winmm/waveform.c   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index e77d641..7f35480 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -481,7 +481,7 @@ static	BOOL		MMIO_Destroy(LPWINE_MMIO wm)
    wm = NULL;
     }
     LeaveCriticalSection(&WINMM_cs);
-    return wm ? FALSE : TRUE;
+    return !wm;
 }

/****************************************************************
diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index e5b820b..0d32274 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -525,7 +525,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
     if (fdwSound & SND_ASYNC)
     {
         HANDLE      handle;
-        wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE;
+        wps->bLoop = (fdwSound & SND_LOOP) != 0;
         if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) {
             SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL);
             CloseHandle(handle);
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 111dd1c..28b4145 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -605,7 +605,7 @@ static void wave_out_test_deviceOut(int device, double duration,
     WORD nChannels = pwfx->nChannels;
     WORD wBitsPerSample = pwfx->wBitsPerSample;
     DWORD nSamplesPerSec = pwfx->nSamplesPerSec;
-    BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE;
+    BOOL has_volume = (pcaps->dwSupport & WAVECAPS_VOLUME) != 0;
     double paused = 0.0;
     DWORD_PTR callback = 0;
     DWORD_PTR callback_instance = 0;
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index 602eb06..73f7a04 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -1778,7 +1778,7 @@ static LRESULT WINMM_Reset(HWAVE hwave)
     IAudioClient_Reset(device->client);

cb_info = device->cb_info;
-    is_out = device->render ? TRUE : FALSE;
+    is_out = device->render != NULL;

LeaveCriticalSection(&device->lock);