[ros-diffs] [akhaldi] 68453: [MSACM32] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Sun Jul 19 22:43:17 2015
New Revision: 68453

URL: http://svn.reactos.org/svn/reactos?rev=68453&view=rev
Log:
[MSACM32] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/win32/msacm32/driver.c
    trunk/reactos/dll/win32/msacm32/pcmconverter.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msacm32/driver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c…
==============================================================================
--- trunk/reactos/dll/win32/msacm32/driver.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msacm32/driver.c	[iso-8859-1] Sun Jul 19 22:43:17 2015
@@ -149,7 +149,7 @@
         }
         break;
     default:
-        ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd &
ACM_DRIVERADDF_TYPEMASK);
+        ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd);
         return MMSYSERR_INVALFLAG;
     }
 

Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve…
==============================================================================
--- trunk/reactos/dll/win32/msacm32/pcmconverter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msacm32/pcmconverter.c	[iso-8859-1] Sun Jul 19 22:43:17 2015
@@ -704,15 +704,15 @@
 
     add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC;
     add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED;
-    add->wMid = 0xFF;
-    add->wPid = 0x00;
+    add->wMid = MM_MICROSOFT;
+    add->wPid = MM_MSFT_ACM_PCM;
     add->vdwACM = 0x01000000;
     add->vdwDriver = 0x01000000;
     add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER;
     add->cFormatTags = 1;
     add->cFilterTags = 0;
     add->hicon = NULL;
-    MultiByteToWideChar( CP_ACP, 0, "WINE-PCM", -1,
+    MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1,
                          add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR)
);
     MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1,
                          add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jul 19 22:43:17 2015
@@ -105,7 +105,7 @@
 reactos/dll/win32/mmdevapi            # Synced to WineStaging-1.7.47
 reactos/dll/win32/mpr                 # Synced to WineStaging-1.7.47
 reactos/dll/win32/mprapi              # Synced to WineStaging-1.7.37
-reactos/dll/win32/msacm32             # Synced to WineStaging-1.7.37
+reactos/dll/win32/msacm32             # Synced to WineStaging-1.7.47
 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-1.7.37
 reactos/dll/win32/mscat32             # Synced to WineStaging-1.7.37