Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSACM32]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-25 11:46:57 +00:00
parent 5ee36b1e8f
commit aac4baa0ad
33 changed files with 16 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/dll/win32/msacm32/driver.c
View file

@ -21,28 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "wineacm.h"
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
/*********************************************************************** /***********************************************************************
* acmDriverAddA (MSACM32.@) * acmDriverAddA (MSACM32.@)

16
reactos/dll/win32/msacm32/filter.c
View file

@ -20,23 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "wineacm.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
/*********************************************************************** /***********************************************************************
* acmFilterChooseA (MSACM32.@) * acmFilterChooseA (MSACM32.@)

18
reactos/dll/win32/msacm32/format.c
View file

@ -19,26 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "wineacm.h"
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
struct MSACM_FillFormatData { struct MSACM_FillFormatData {
HWND hWnd; HWND hWnd;
#define WINE_ACMFF_TAG 0 #define WINE_ACMFF_TAG 0

19
reactos/dll/win32/msacm32/internal.c
View file

@ -21,26 +21,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "wineacm.h"
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(msacm); #include <winreg.h>
/**********************************************************************/ /**********************************************************************/

2
reactos/dll/win32/msacm32/lang/msacm_Bg.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Cs.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */ /* Czech strings in CP1250 */

2
reactos/dll/win32/msacm32/lang/msacm_Da.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_De.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/msacm32/lang/msacm_En.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Es.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Fr.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_He.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Hu.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_It.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Ja.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Ko.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Lt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Nl.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_No.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Pl.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 235, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 235, 100

2
reactos/dll/win32/msacm32/lang/msacm_Pt.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

2
reactos/dll/win32/msacm32/lang/msacm_Ro.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Ru.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Si.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/msacm32/lang/msacm_Sv.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Tr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100

2
reactos/dll/win32/msacm32/lang/msacm_Uk.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/msacm32/lang/msacm_Zh.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "wineacm.h"
/* Chinese text is encoded in UTF-8 */ /* Chinese text is encoded in UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

14
reactos/dll/win32/msacm32/msacm32_main.c
View file

@ -21,22 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "wineacm.h"
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
/**********************************************************************/ /**********************************************************************/
HINSTANCE MSACM_hInstance32 = 0; HINSTANCE MSACM_hInstance32 = 0;

12
reactos/dll/win32/msacm32/msacm_main.c
View file

@ -18,19 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "wineacm.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
/************************************************************************** /**************************************************************************
* DllEntryPoint (MSACM.255) * DllEntryPoint (MSACM.255)

23
reactos/dll/win32/msacm32/pcmconverter.c
View file

@ -26,30 +26,9 @@
* embedded driver handling scheme in msacm32.dll which isn't done yet * embedded driver handling scheme in msacm32.dll which isn't done yet
*/ */
#define WIN32_NO_STATUS #include "wineacm.h"
#include <config.h>
#include <assert.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 * PCM_drvOpen

15
reactos/dll/win32/msacm32/stream.c
View file

@ -28,23 +28,8 @@
* + properly close ACM streams * + 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" #include "wineacm.h"
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has) static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has)
{ {
TRACE("(%p)\n", has); TRACE("(%p)\n", has);

16
reactos/dll/win32/msacm32/wineacm.h
View file

@ -20,8 +20,20 @@
#ifndef __WINE_WINEACM_H #ifndef __WINE_WINEACM_H
#define __WINE_WINEACM_H #define __WINE_WINEACM_H
//#include <windef.h> #include <config.h>
//#include <winuser.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 * Wine specific - Win32