From aac4baa0ad4de0d49aea867d54174ba6dd96e779 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 25 Dec 2013 11:46:57 +0000 Subject: [PATCH] [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 --- reactos/dll/win32/msacm32/driver.c | 21 -------------------- reactos/dll/win32/msacm32/filter.c | 16 --------------- reactos/dll/win32/msacm32/format.c | 18 ----------------- reactos/dll/win32/msacm32/internal.c | 19 +----------------- reactos/dll/win32/msacm32/lang/msacm_Bg.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Cs.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Da.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_De.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_En.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Es.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Fr.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_He.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Hu.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_It.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Ja.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Ko.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Lt.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Nl.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_No.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Pl.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Pt.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Ro.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Ru.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Si.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Sv.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Tr.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Uk.rc | 2 -- reactos/dll/win32/msacm32/lang/msacm_Zh.rc | 2 -- reactos/dll/win32/msacm32/msacm32_main.c | 14 ------------- reactos/dll/win32/msacm32/msacm_main.c | 12 ----------- reactos/dll/win32/msacm32/pcmconverter.c | 23 +--------------------- reactos/dll/win32/msacm32/stream.c | 15 -------------- reactos/dll/win32/msacm32/wineacm.h | 16 +++++++++++++-- 33 files changed, 16 insertions(+), 186 deletions(-) diff --git a/reactos/dll/win32/msacm32/driver.c b/reactos/dll/win32/msacm32/driver.c index a4f89f5fb52..7b0ee9996ae 100644 --- 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 -//#include "wine/port.h" - -//#include -//#include - -#include -//#include "winbase.h" -#include -//#include "winuser.h" -//#include "winnls.h" -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include #include "wineacm.h" -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmDriverAddA (MSACM32.@) diff --git a/reactos/dll/win32/msacm32/filter.c b/reactos/dll/win32/msacm32/filter.c index 73eb30aad43..4f21bc83748 100644 --- 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 -//#include -#include -#include -#include -//#include "winerror.h" -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include #include "wineacm.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmFilterChooseA (MSACM32.@) diff --git a/reactos/dll/win32/msacm32/format.c b/reactos/dll/win32/msacm32/format.c index 858defa221a..cefdded34b6 100644 --- 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 -//#include -#include -//#include "winbase.h" -//#include "winnls.h" -//#include "winerror.h" -#include -#include -#include -#include -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include #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 5f6efd823c2..f8cb5198ee5 100644 --- 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 -//#include - -#include -//#include "winbase.h" -#include -#include -//#include "winerror.h" -#include -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include #include "wineacm.h" -#include -#include -WINE_DEFAULT_DEBUG_CHANNEL(msacm); +#include /**********************************************************************/ diff --git a/reactos/dll/win32/msacm32/lang/msacm_Bg.rc b/reactos/dll/win32/msacm32/lang/msacm_Bg.rc index 0d6195885cb..4b81a16f07b 100644 --- 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 6558b561643..8c18f00683e 100644 --- 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 21e457298c0..d42b4ba20a6 100644 --- 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 5eb13f54de2..fa964b6c636 100644 --- 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 861f12345bc..dee98caa680 100644 --- 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 06a3b9a7541..b18338fb471 100644 --- 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 e66dfb17431..6b61dbb9764 100644 --- 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 561d07463e3..600ee4ef989 100644 --- 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 2341adf42e4..02ed5f9da61 100644 --- 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 bd0d58930ee..f2c8ff65026 100644 --- 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 e3ab062ed74..420b8c0bffe 100644 --- 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 dad8a47a42c..ee960c7aae4 100644 --- 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 d8af77903da..d5d34f29a31 100644 --- 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 07605c2f254..16e9cf87367 100644 --- 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 06231a33a3f..da083908b6d 100644 --- 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 4f185b69852..c24c8ec28ed 100644 --- 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 c1388a3e512..bde9e16ef3d 100644 --- 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 0c6d6dd082d..aa529d09555 100644 --- 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 edc717e54af..5d900b450ea 100644 --- 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 deac15cbde0..a8b5b2f3e9f 100644 --- 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 b096071290d..70a0a4d169b 100644 --- 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 3dd88343ca8..06558331b5e 100644 --- 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 c2d4a4cb190..0476f0e4c08 100644 --- 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 1d871640526..8238fa8734c 100644 --- 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 8d190887200..bd5d10aa919 100644 --- 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 - -//#include "windef.h" -//#include "winbase.h" -#include -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include #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 c5c097549c6..08a2a43a635 100644 --- 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 - -#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 aec0d5f3bd9..d0a1b173d86 100644 --- 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 +#include "wineacm.h" #include -#include -//#include - -#include -#include -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -//#include "wingdi.h" -#include -#include - -#include -//#include "wineacm.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * PCM_drvOpen diff --git a/reactos/dll/win32/msacm32/stream.c b/reactos/dll/win32/msacm32/stream.c index 4fbd082d8e8..74ad5ae0ce6 100644 --- 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 -//#include -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include #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 83a780d02fd..16b6c41f365 100644 --- 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 -//#include +#include + +#include + +#define WIN32_NO_STATUS +#define NOBITMAP + +#include +#include + +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * Wine specific - Win32 -- 2.17.1