[ros-diffs] 01/01: [MSGSM32.ACM] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c994d6438c218338bf373…

commit c994d6438c218338bf373373fcc0217d688f4c7b
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 18 12:31:18 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 18 12:31:18 2018 +0100

    [MSGSM32.ACM] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/msgsm32.acm/msgsm32.c | 32 +++++++++++++++-----------------
 media/doc/README.WINE           |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dll/win32/msgsm32.acm/msgsm32.c b/dll/win32/msgsm32.acm/msgsm32.c
index 4a8f100972..cce1303455 100644
--- a/dll/win32/msgsm32.acm/msgsm32.c
+++ b/dll/win32/msgsm32.acm/msgsm32.c
@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "config.h"
+#include <wine/port.h>
 
-#include <config.h>
-//#include <wine/port.h>
-
-//#include <assert.h>
+#include <assert.h>
 #include <stdarg.h>
-//#include <string.h>
+#include <string.h>
 
 #ifdef HAVE_GSM_GSM_H
 #include <gsm/gsm.h>
@@ -35,17 +33,17 @@
 #include <gsm.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-//#include "mmsystem.h"
-//#include "mmreg.h"
-//#include "msacm.h"
-#include <msacmdrv.h>
-//#include "wine/library.h"
-#include <wine/debug.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
+#include "wine/library.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gsm);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index b05e2f67ad..2f006c5934 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -109,7 +109,7 @@ reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to WineStaging-3.3
 reactos/dll/win32/msftedit            # Synced to WineStaging-3.3
 reactos/dll/win32/msg711.acm          # Synced to WineStaging-3.3
-reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-2.9
+reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-3.3
 reactos/dll/win32/mshtml              # Synced to WineStaging-1.7.55
 reactos/dll/win32/mshtml.tlb          # Synced to WineStaging-1.7.55
 reactos/dll/win32/msi                 # Synced to WineStaging-3.3