[ros-diffs] [akhaldi] 62917: [MSGSM32.ACM] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:34:13 2014
New Revision: 62917

URL: http://svn.reactos.org/svn/reactos?rev=62917&view=rev
Log:
[MSGSM32.ACM]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgsm...
==============================================================================
--- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c	[iso-8859-1] Wed Apr 23 14:34:13 2014
@@ -63,13 +63,13 @@
     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 @@
         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 @@
 }

/* 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 @@
         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 1;
+            return FALSE;
+        }
+        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 1;
+            return FALSE;
+        }
+        return TRUE;
     default:
-        return 0;
-    }
-    return 0;
+        return FALSE;
+    }
+    return FALSE;
 }

static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 };
@@ -512,7 +512,7 @@
             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
          */

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 23 14:34:13 2014
@@ -116,7 +116,7 @@
 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