[MSACM32]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61400

diff --git a/reactos/dll/win32/msacm32/driver.c b/reactos/dll/win32/msacm32/driver.c
index a4f89f5..7b0ee99 100644 (file)
--- a/reactos/dll/win32/msacm32/driver.c
+++ b/reactos/dll/win32/msacm32/driver.c
@@ -21,28 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#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/reactos/dll/win32/msacm32/filter.c b/reactos/dll/win32/msacm32/filter.c
index 73eb30a..4f21bc8 100644 (file)
--- a/reactos/dll/win32/msacm32/filter.c
+++ b/reactos/dll/win32/msacm32/filter.c
@@ -20,23 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#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/reactos/dll/win32/msacm32/format.c b/reactos/dll/win32/msacm32/format.c
index 858defa..cefdded 100644 (file)
--- a/reactos/dll/win32/msacm32/format.c
+++ b/reactos/dll/win32/msacm32/format.c
@@ -19,26 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#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/reactos/dll/win32/msacm32/internal.c b/reactos/dll/win32/msacm32/internal.c
index 5f6efd8..f8cb519 100644 (file)
--- a/reactos/dll/win32/msacm32/internal.c
+++ b/reactos/dll/win32/msacm32/internal.c
@@ -21,26 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#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>
 
-WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+#include <winreg.h>
 
 /**********************************************************************/
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Bg.rc b/reactos/dll/win32/msacm32/lang/msacm_Bg.rc
index 0d61958..4b81a16 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Bg.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Bg.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Cs.rc b/reactos/dll/win32/msacm32/lang/msacm_Cs.rc
index 6558b56..8c18f00 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Cs.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Cs.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Da.rc b/reactos/dll/win32/msacm32/lang/msacm_Da.rc
index 21e4572..d42b4ba 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Da.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_De.rc b/reactos/dll/win32/msacm32/lang/msacm_De.rc
index 5eb13f5..fa964b6 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_De.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/msacm32/lang/msacm_En.rc b/reactos/dll/win32/msacm32/lang/msacm_En.rc
index 861f123..dee98ca 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_En.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_En.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Es.rc b/reactos/dll/win32/msacm32/lang/msacm_Es.rc
index 06a3b9a..b18338f 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Es.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Fr.rc b/reactos/dll/win32/msacm32/lang/msacm_Fr.rc
index e66dfb1..6b61dbb 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Fr.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Fr.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_He.rc b/reactos/dll/win32/msacm32/lang/msacm_He.rc
index 561d074..600ee4e 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_He.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_He.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Hu.rc b/reactos/dll/win32/msacm32/lang/msacm_Hu.rc
index 2341adf..02ed5f9 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Hu.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_It.rc b/reactos/dll/win32/msacm32/lang/msacm_It.rc
index bd0d589..f2c8ff6 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_It.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Ja.rc b/reactos/dll/win32/msacm32/lang/msacm_Ja.rc
index e3ab062..420b8c0 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Ja.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Ja.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Ko.rc b/reactos/dll/win32/msacm32/lang/msacm_Ko.rc
index dad8a47..ee960c7 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Ko.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Ko.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Lt.rc b/reactos/dll/win32/msacm32/lang/msacm_Lt.rc
index d8af779..d5d34f2 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Lt.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Nl.rc b/reactos/dll/win32/msacm32/lang/msacm_Nl.rc
index 07605c2..16e9cf8 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Nl.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_No.rc b/reactos/dll/win32/msacm32/lang/msacm_No.rc
index 06231a3..da08390 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_No.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Pl.rc b/reactos/dll/win32/msacm32/lang/msacm_Pl.rc
index 4f185b6..c24c8ec 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Pl.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Pl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 235, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Pt.rc b/reactos/dll/win32/msacm32/lang/msacm_Pt.rc
index c1388a3..bde9e16 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Pt.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Pt.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Ro.rc b/reactos/dll/win32/msacm32/lang/msacm_Ro.rc
index 0c6d6dd..aa529d0 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Ro.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Ro.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Ru.rc b/reactos/dll/win32/msacm32/lang/msacm_Ru.rc
index edc717e..5d900b4 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Ru.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Si.rc b/reactos/dll/win32/msacm32/lang/msacm_Si.rc
index deac15c..a8b5b2f 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Si.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Sv.rc b/reactos/dll/win32/msacm32/lang/msacm_Sv.rc
index b096071..70a0a4d 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Sv.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Tr.rc b/reactos/dll/win32/msacm32/lang/msacm_Tr.rc
index 3dd8834..0655833 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Tr.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 DLG_ACMFORMATCHOOSE_ID DIALOG  10, 20, 225, 100

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Uk.rc b/reactos/dll/win32/msacm32/lang/msacm_Uk.rc
index c2d4a4c..0476f0e 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Uk.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Uk.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/lang/msacm_Zh.rc b/reactos/dll/win32/msacm32/lang/msacm_Zh.rc
index 1d87164..8238fa8 100644 (file)
--- a/reactos/dll/win32/msacm32/lang/msacm_Zh.rc
+++ b/reactos/dll/win32/msacm32/lang/msacm_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wineacm.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/msacm32/msacm32_main.c b/reactos/dll/win32/msacm32/msacm32_main.c
index 8d19088..bd5d10a 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32_main.c
+++ b/reactos/dll/win32/msacm32/msacm32_main.c
@@ -21,22 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-//#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/reactos/dll/win32/msacm32/msacm_main.c b/reactos/dll/win32/msacm32/msacm_main.c
index c5c0975..08a2a43 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm_main.c
+++ b/reactos/dll/win32/msacm32/msacm_main.c
@@ -18,19 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "mmsystem.h"
-#include "mmreg.h"
-#include "msacm.h"
-#include "msacmdrv.h"
 #include "wineacm.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**************************************************************************
  *             DllEntryPoint (MSACM.255)

diff --git a/reactos/dll/win32/msacm32/pcmconverter.c b/reactos/dll/win32/msacm32/pcmconverter.c
index aec0d5f..d0a1b17 100644 (file)
--- a/reactos/dll/win32/msacm32/pcmconverter.c
+++ b/reactos/dll/win32/msacm32/pcmconverter.c
@@ -26,30 +26,9 @@
  *       embedded driver handling scheme in msacm32.dll which isn't done yet
  */
 
-#define WIN32_NO_STATUS
-
-#include <config.h>
+#include "wineacm.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/reactos/dll/win32/msacm32/stream.c b/reactos/dll/win32/msacm32/stream.c
index 4fbd082..74ad5ae 100644 (file)
--- a/reactos/dll/win32/msacm32/stream.c
+++ b/reactos/dll/win32/msacm32/stream.c
@@ -28,23 +28,8 @@
  *     + properly close ACM streams
  */
 
-#define WIN32_NO_STATUS
-
-//#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/reactos/dll/win32/msacm32/wineacm.h b/reactos/dll/win32/msacm32/wineacm.h
index 83a780d..16b6c41 100644 (file)
--- a/reactos/dll/win32/msacm32/wineacm.h
+++ b/reactos/dll/win32/msacm32/wineacm.h
@@ -20,8 +20,20 @@
 #ifndef __WINE_WINEACM_H
 #define __WINE_WINEACM_H
 
-//#include <windef.h>
-//#include <winuser.h>
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define NOBITMAP
+
+#include <wine/msacmdrv.h>
+#include <wine/unicode.h>
+
+#include <winuser.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  * Wine specific - Win32