[akhaldi] 68458: [MSG711.ACM] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Sun Jul 19 22:56:28 2015
New Revision: 68458

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

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

Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71…
==============================================================================
--- trunk/reactos/dll/win32/msg711.acm/msg711.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msg711.acm/msg711.c	[iso-8859-1] Sun Jul 19 22:56:28 2015
@@ -655,15 +655,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_G711;
     add->vdwACM = 0x01000000;
     add->vdwDriver = 0x01000000;
     add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
     add->cFormatTags = 3; /* PCM, G711 A-LAW & MU-LAW */
     add->cFilterTags = 0;
     add->hicon = NULL;
-    MultiByteToWideChar( CP_ACP, 0, "WINE-G711", -1,
+    MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1,
                          add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR)
);
     MultiByteToWideChar( CP_ACP, 0, "Wine G711 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:56:28 2015
@@ -113,7 +113,7 @@
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to WineStaging-1.7.47
 reactos/dll/win32/msftedit            # Synced to WineStaging-1.7.37
-reactos/dll/win32/msg711.acm          # Synced to WineStaging-1.7.37
+reactos/dll/win32/msg711.acm          # Synced to WineStaging-1.7.47
 reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-1.7.37
 reactos/dll/win32/mshtml              # Synced to WineStaging-1.7.37
 reactos/dll/win32/mshtml.tlb          # Synced to WineStaging-1.7.37