From d321a315757397e48ad3906cffd834107befa9ca Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 23 Apr 2014 14:34:13 +0000
Subject: [PATCH] [MSGSM32.ACM] * Sync with Wine 1.7.17. CORE-8080

svn path=/trunk/; revision=62917
---
 reactos/dll/win32/msgsm32.acm/msgsm32.c | 38 ++++++++++++-------------
 reactos/media/doc/README.WINE           |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/reactos/dll/win32/msgsm32.acm/msgsm32.c b/reactos/dll/win32/msgsm32.acm/msgsm32.c
index 358ed13cc4c..be09b905cf8 100644
--- a/reactos/dll/win32/msgsm32.acm/msgsm32.c
+++ b/reactos/dll/win32/msgsm32.acm/msgsm32.c
@@ -63,13 +63,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];
 
@@ -81,12 +81,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;
     }
 }
 
@@ -139,10 +139,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)
     {
@@ -150,54 +150,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 };
@@ -512,7 +512,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
             return ACMERR_NOTPOSSIBLE;
         }
 
-        /* The packing algorythm writes 32 bytes, then 33 bytes,
+        /* The packing algorithm writes 32 bytes, then 33 bytes,
          * and it seems to pad to align to 65 bytes always
          * adding extra data where necessary
          */
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index f52366884fa..ec2be7c5623 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -116,7 +116,7 @@ reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to Wine-1.7.17
 reactos/dll/win32/msftedit            # Synced to Wine-1.7.1
 reactos/dll/win32/msg711.acm          # Synced to Wine-1.7.1
-reactos/dll/win32/msgsm32.acm         # Synced to Wine-1.7.1
+reactos/dll/win32/msgsm32.acm         # Synced to Wine-1.7.17
 reactos/dll/win32/mshtml              # Synced to Wine-1.7.1
 reactos/dll/win32/mshtml.tlb          # Synced to Wine-1.7.1
 reactos/dll/win32/msi                 # Synced to Wine-1.7.1