[MSACM32] Sync with Wine Staging 1.7.47. CORE-9924

svn path=/trunk/; revision=68453

diff --git a/reactos/dll/win32/msacm32/driver.c b/reactos/dll/win32/msacm32/driver.c
index 7b0ee99..778a598 100644 (file)
--- a/reactos/dll/win32/msacm32/driver.c
+++ b/reactos/dll/win32/msacm32/driver.c
@@ -149,7 +149,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
         }
         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;
     }
 

diff --git a/reactos/dll/win32/msacm32/pcmconverter.c b/reactos/dll/win32/msacm32/pcmconverter.c
index d0a1b17..cdbf8af 100644 (file)
--- a/reactos/dll/win32/msacm32/pcmconverter.c
+++ b/reactos/dll/win32/msacm32/pcmconverter.c
@@ -704,15 +704,15 @@ static    LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add)
 
     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) );

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 72fee4a..de5a96a 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -105,7 +105,7 @@ reactos/dll/win32/mlang               # Synced to WineStaging-1.7.37
 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