=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: msgsm32.acm: Use BOOL type where appropriate.

Alexandre Julliard julliard at winehq.org
Fri Nov 15 13:14:29 CST 2013


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

Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date:   Fri Nov 15 02:44:44 2013 +0100

msgsm32.acm: Use BOOL type where appropriate.

---

 dlls/msgsm32.acm/msgsm32.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c
index 5e7bce0..c32c656 100644
--- a/dlls/msgsm32.acm/msgsm32.c
+++ b/dlls/msgsm32.acm/msgsm32.c
@@ -61,13 +61,13 @@ FUNCPTR(gsm_decode);
     if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \
         wine_dlclose(libgsm_handle, NULL, 0); \
         libgsm_handle = NULL; \
-        return 0; \
+        return FALSE; \
     }
 
 /***********************************************************************
  *           GSM_drvLoad
  */
-static LRESULT GSM_drvLoad(void)
+static BOOL GSM_drvLoad(void)
 {
     char error[128];
 
@@ -79,12 +79,12 @@ static LRESULT GSM_drvLoad(void)
         LOAD_FUNCPTR(gsm_option);
         LOAD_FUNCPTR(gsm_encode);
         LOAD_FUNCPTR(gsm_decode);
-        return 1;
+        return TRUE;
     }
     else
     {
         ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error);
-        return 0;
+        return FALSE;
     }
 }
 
@@ -137,10 +137,10 @@ static	LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add)
 }
 
 /* Validate a WAVEFORMATEX structure */
-static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx)
+static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx)
 {
     if (wfx->nChannels != 1)
-        return 0;
+        return FALSE;
 
     switch (wfx->wFormatTag)
     {
@@ -148,54 +148,54 @@ static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx)
         if (wfx->wBitsPerSample != 16)
         {
             WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample);
-            return 0;
+            return FALSE;
         }
         if (wfx->nBlockAlign != 2)
         {
             WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign);
-            return 0;
+            return FALSE;
         }
         if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec)
         {
             WARN("PCM nAvgBytesPerSec %u/%u\n",
                  wfx->nAvgBytesPerSec,
                  wfx->nBlockAlign * wfx->nSamplesPerSec);
-            return 0;
+            return FALSE;
         }
-        return 1;
+        return TRUE;
     case WAVE_FORMAT_GSM610:
         if (wfx->cbSize < sizeof(WORD))
         {
             WARN("GSM cbSize %u\n", wfx->cbSize);
-            return 0;
+            return FALSE;
         }
         if (wfx->wBitsPerSample != 0)
         {
             WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample);
-            return 0;
+            return FALSE;
         }
         if (wfx->nBlockAlign != 65)
         {
             WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign);
-            return 0;
+            return FALSE;
         }
         if (((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320)
         {
             WARN("GSM wSamplesPerBlock %u\n",
                  ((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock);
-            return 0;
+            return FALSE;
         }
         if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320)
         {
             WARN("GSM nAvgBytesPerSec %d / %d\n",
                  wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320);
-            return 0;
+            return FALSE;
         }
-        return 1;
+        return TRUE;
     default:
-        return 0;
+        return FALSE;
     }
-    return 0;
+    return FALSE;
 }
 
 static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 };




More information about the wine-cvs mailing list