01/01: [MSACM32] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

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

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

    [MSACM32] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/msacm32/CMakeLists.txt |  4 ++--
 dll/win32/msacm32/driver.c       | 19 +++++++++++++++++++
 dll/win32/msacm32/filter.c       | 14 ++++++++++++++
 dll/win32/msacm32/format.c       | 16 ++++++++++++++++
 dll/win32/msacm32/internal.c     | 17 ++++++++++++++++-
 dll/win32/msacm32/msacm.rc       |  7 +++----
 dll/win32/msacm32/msacm32_main.c | 12 ++++++++++++
 dll/win32/msacm32/pcmconverter.c | 21 ++++++++++++++++++++-
 dll/win32/msacm32/precomp.h      | 17 +++++++++++++++++
 dll/win32/msacm32/stream.c       | 13 +++++++++++++
 dll/win32/msacm32/wineacm.h      | 16 +++-------------
 media/doc/README.WINE            |  2 +-
 12 files changed, 136 insertions(+), 22 deletions(-)

diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index 9be89256cc..88a5830b0b 100644
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     msacm32_main.c
     pcmconverter.c
     stream.c
-    wineacm.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
 
 add_library(msacm32 SHARED
@@ -21,5 +21,5 @@ add_library(msacm32 SHARED
 set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
 target_link_libraries(msacm32 wine)
 add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
-add_pch(msacm32 wineacm.h SOURCE)
+add_pch(msacm32 precomp.h SOURCE)
 add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/msacm32/driver.c b/dll/win32/msacm32/driver.c
index 778a5983f6..e0c5fdd90e 100644
--- a/dll/win32/msacm32/driver.c
+++ b/dll/win32/msacm32/driver.c
@@ -21,7 +21,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdarg.h>
+#include <stdio.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 "wineacm.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           acmDriverAddA (MSACM32.@)
diff --git a/dll/win32/msacm32/filter.c b/dll/win32/msacm32/filter.c
index 4f21bc8374..53db82777d 100644
--- a/dll/win32/msacm32/filter.c
+++ b/dll/win32/msacm32/filter.c
@@ -20,7 +20,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.@)
diff --git a/dll/win32/msacm32/format.c b/dll/win32/msacm32/format.c
index 9535f20332..b3d2900393 100644
--- a/dll/win32/msacm32/format.c
+++ b/dll/win32/msacm32/format.c
@@ -19,8 +19,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 struct MSACM_FillFormatData {
     HWND		hWnd;
 #define WINE_ACMFF_TAG		0
diff --git a/dll/win32/msacm32/internal.c b/dll/win32/msacm32/internal.c
index 6550f4c270..7bafcaad5e 100644
--- a/dll/win32/msacm32/internal.c
+++ b/dll/win32/msacm32/internal.c
@@ -21,9 +21,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
-#include <winreg.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**********************************************************************/
 
diff --git a/dll/win32/msacm32/msacm.rc b/dll/win32/msacm32/msacm.rc
index f26f474cb9..f72be33cac 100644
--- a/dll/win32/msacm32/msacm.rc
+++ b/dll/win32/msacm32/msacm.rc
@@ -15,12 +15,11 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-#include <msacmdlg.h>
+#include "wineacm.h"
+
 
 #include <reactos/manifest_dll.rc>
 
diff --git a/dll/win32/msacm32/msacm32_main.c b/dll/win32/msacm32/msacm32_main.c
index ae362f25cc..efe58af309 100644
--- a/dll/win32/msacm32/msacm32_main.c
+++ b/dll/win32/msacm32/msacm32_main.c
@@ -21,8 +21,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 /**********************************************************************/
 
 HINSTANCE	MSACM_hInstance32 = 0;
diff --git a/dll/win32/msacm32/pcmconverter.c b/dll/win32/msacm32/pcmconverter.c
index 61a1b354ec..d52662ac76 100644
--- a/dll/win32/msacm32/pcmconverter.c
+++ b/dll/win32/msacm32/pcmconverter.c
@@ -26,9 +26,28 @@
  *	  embedded driver handling scheme in msacm32.dll which isn't done yet
  */
 
-#include "wineacm.h"
+#include "config.h"
 
 #include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "wingdi.h"
+#include "winnls.h"
+#include "winuser.h"
+
+#include "msacmdrv.h"
+#include "wineacm.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           PCM_drvOpen
diff --git a/dll/win32/msacm32/precomp.h b/dll/win32/msacm32/precomp.h
new file mode 100644
index 0000000000..dae503337b
--- /dev/null
+++ b/dll/win32/msacm32/precomp.h
@@ -0,0 +1,17 @@
+
+#ifndef _WINEACM_PRECOMP_H
+#define _WINEACM_PRECOMP_H
+
+#include <wine/config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define NOBITMAP
+
+#include "wineacm.h"
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#endif /* !_WINEACM_PRECOMP_H */
diff --git a/dll/win32/msacm32/stream.c b/dll/win32/msacm32/stream.c
index a938d80371..e06503abfe 100644
--- a/dll/win32/msacm32/stream.c
+++ b/dll/win32/msacm32/stream.c
@@ -28,8 +28,21 @@
  *	+ properly close ACM streams
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 static PWINE_ACMSTREAM	ACM_GetStream(HACMSTREAM has)
 {
     TRACE("(%p)\n", has);
diff --git a/dll/win32/msacm32/wineacm.h b/dll/win32/msacm32/wineacm.h
index 11dea6e05b..37d639d215 100644
--- a/dll/win32/msacm32/wineacm.h
+++ b/dll/win32/msacm32/wineacm.h
@@ -20,21 +20,11 @@
 #ifndef __WINE_WINEACM_H
 #define __WINE_WINEACM_H
 
-#include <wine/config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define NOBITMAP
-
 #include <windef.h>
 #include <winuser.h>
-
-#include <wine/debug.h>
+#ifdef __REACTOS__
 #include <wine/msacmdrv.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+#endif
 
 /***********************************************************************
  * Wine specific - Win32
@@ -162,6 +152,6 @@ LRESULT CALLBACK	PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT
wMsg,
 				       LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
 
 /* Dialog box templates */
-#include <msacmdlg.h>
+#include "msacmdlg.h"
 
 #endif /* __WINE_WINEACM_H */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 442dd6dd8f..92d7b248dc 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -100,7 +100,7 @@ reactos/dll/win32/mlang               # Synced to WineStaging-3.3
 reactos/dll/win32/mmdevapi            # Synced to WineStaging-3.3
 reactos/dll/win32/mpr                 # Synced to WineStaging-3.3
 reactos/dll/win32/mprapi              # Synced to WineStaging-3.3
-reactos/dll/win32/msacm32             # Synced to WineStaging-2.16
+reactos/dll/win32/msacm32             # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32.drv         # Synced to WineStaging-2.9
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-2.9
 reactos/dll/win32/mscat32             # Synced to WineStaging-2.9