Author: akhaldi Date: Wed Dec 25 11:46:57 2013 New Revision: 61400
URL: http://svn.reactos.org/svn/reactos?rev=61400&view=rev Log: [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
Modified: trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/filter.c trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/internal.c trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc trunk/reactos/dll/win32/msacm32/msacm32_main.c trunk/reactos/dll/win32/msacm32/msacm_main.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/dll/win32/msacm32/wineacm.h
Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c?... ============================================================================== --- trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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.@)
Modified: trunk/reactos/dll/win32/msacm32/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/filter.c?... ============================================================================== --- trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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.@)
Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c?... ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,25 +19,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 <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;
Modified: trunk/reactos/dll/win32/msacm32/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/internal.... ============================================================================== --- trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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 "wineacm.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);
/**********************************************************************/
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msac... ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * 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)
Modified: trunk/reactos/dll/win32/msacm32/msacm32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32_m... ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,21 +21,7 @@ * 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);
/**********************************************************************/
Modified: trunk/reactos/dll/win32/msacm32/msacm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_mai... ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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)
Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconver... ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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
Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c?... ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -28,22 +28,7 @@ * + 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) {
Modified: trunk/reactos/dll/win32/msacm32/wineacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/wineacm.h... ============================================================================== --- trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -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