Author: akhaldi
Date: Sun Jul 19 23:01:00 2015
New Revision: 68459
URL:
http://svn.reactos.org/svn/reactos?rev=68459&view=rev
Log:
[MSGSM32.ACM] Sync with Wine Staging 1.7.47. CORE-9924
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/msgs…
==============================================================================
--- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] Sun Jul 19 23:01:00 2015
@@ -119,14 +119,14 @@
add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED;
/* Details found from probing native msgsm32.acm */
add->wMid = MM_MICROSOFT;
- add->wPid = 36;
+ add->wPid = MM_MSFT_ACM_GSM610;
add->vdwACM = 0x3320000;
add->vdwDriver = 0x4000000;
add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
add->cFormatTags = 2;
add->cFilterTags = 0;
add->hicon = NULL;
- MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10", -1,
+ MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1,
add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR)
);
MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -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 23:01:00 2015
@@ -114,7 +114,7 @@
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.47
-reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.37
+reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47
reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37
reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37
reactos/dll/win32/msi # Synced to WineStaging-1.7.37