From 27a0ced6e11737b2e9c32bd2ea2e688d1a8fc39d Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Sun, 14 Feb 1999 09:41:42 +0000 Subject: [PATCH] Change a couple of names that would conflict after all 32[AW] suffixes are removed. Structures defined in both mmreg.h and mmsystem.h are protected with #ifdef:s as in MS' headers. --- dlls/msacm/msacm_main.c | 8 ++++---- dlls/msacm32/format.c | 2 +- dlls/msacm32/stream.c | 4 ++-- include/mmreg.h | 19 ++++++++++--------- include/mmsystem.h | 5 ++++- include/msacm.h | 48 ++++++++++++++++++++++++------------------------ include/msacmdrv.h | 20 ++++++++++---------- include/winbase.h | 2 ++ 8 files changed, 57 insertions(+), 51 deletions(-) diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c index 206c4ce39d1..e234d436be0 100644 --- a/dlls/msacm/msacm_main.c +++ b/dlls/msacm/msacm_main.c @@ -207,8 +207,8 @@ MMRESULT16 WINAPI acmFormatEnum16( * ACMFORMATSUGGEST (MSACM.45) */ MMRESULT16 WINAPI acmFormatSuggest16( - HACMDRIVER16 had, LPWAVEFORMATEX16 pwfxSrc, - LPWAVEFORMATEX16 pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) + HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, + LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest @@ -283,8 +283,8 @@ MMRESULT16 WINAPI acmFilterEnum16( */ MMRESULT16 WINAPI acmStreamOpen16( LPHACMSTREAM16 phas, HACMDRIVER16 had, - LPWAVEFORMATEX16 pwfxSrc, LPWAVEFORMATEX16 pwfxDst, - LPWAVEFILTER16 pwfltr, DWORD dwCallback, + LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, + LPWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { FIXME(msacm, "(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 5495c920add..0cd2fc1d6f6 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -97,7 +97,7 @@ MMRESULT32 WINAPI acmFormatEnum32W( * acmFormatSuggest (MSACM32.29) */ MMRESULT32 WINAPI acmFormatSuggest32( - HACMDRIVER32 had, PWAVEFORMATEX32 pwfxSrc, PWAVEFORMATEX32 pwfxDst, + HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 2a29faa4ee0..d159478d74a 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -51,8 +51,8 @@ MMRESULT32 WINAPI acmStreamMessage32( * acmStreamOpen (MSACM32.40) */ MMRESULT32 WINAPI acmStreamOpen32( - PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX32 pwfxSrc, - PWAVEFORMATEX32 pwfxDst, PWAVEFILTER32 pwfltr, DWORD dwCallback, + PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, + PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { FIXME(msacm, "(%p, 0x%08x, %p, %p, %p, %ld, %ld, %ld): stub\n", diff --git a/include/mmreg.h b/include/mmreg.h index 7589ff62157..b54994b9ad2 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -8,21 +8,23 @@ * Defines/Enums */ +#ifndef _ACM_WAVEFILTER +#define _ACM_WAVEFILTER + #define WAVE_FILTER_UNKNOWN 0x0000 #define WAVE_FILTER_DEVELOPMENT 0xFFFF -/*********************************************************************** - * Structures - */ - typedef struct _WAVEFILTER { DWORD cbStruct; DWORD dwFilterTag; DWORD fdwFilter; DWORD dwReserved[5]; -} WAVEFILTER16, *PWAVEFILTER16, *NPWAVEFILTER16, *LPWAVEFILTER16, - WAVEFILTER32, *PWAVEFILTER32; +} WAVEFILTER, *PWAVEFILTER, *NPWAVEFILTER, *LPWAVEFILTER; +#endif /* _ACM_WAVEFILTER */ + +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ typedef struct _WAVEFORMATEX { WORD wFormatTag; WORD nChannels; @@ -31,7 +33,6 @@ typedef struct _WAVEFORMATEX { WORD nBlockAlign; WORD wBitsPerSample; WORD cbSize; -} WAVEFORMATEX16, *PWAVEFORMATEX16, *NWAVEFORMATEX16, *LPWAVEFORMATEX16, - WAVEFORMATEX32, *PWAVEFORMATEX32; - +} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; +#endif /* _WAVEFORMATEX_ */ diff --git a/include/mmsystem.h b/include/mmsystem.h index 4fcdf85a68c..de3bc25a92d 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -343,6 +343,8 @@ typedef struct { WORD wBitsPerSample; } PCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ /* dito same for Win16 / Win32 */ typedef struct { WORD wFormatTag; /* format type */ @@ -353,7 +355,8 @@ typedef struct { WORD wBitsPerSample; /* number of bits per sample of mono data */ WORD cbSize; /* the count in bytes of the size of */ /* extra information (after cbSize) */ -} WAVEFORMATEX,*LPWAVEFORMATEX; +} WAVEFORMATEX, *LPWAVEFORMATEX, *NPWAVEFORMATEX, *PWAVEFORMATEX; +#endif UINT16 WINAPI waveOutGetNumDevs16(void); UINT32 WINAPI waveOutGetNumDevs32(void); diff --git a/include/msacm.h b/include/msacm.h index 356362854b4..898254fdb3b 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -329,7 +329,7 @@ typedef struct _ACMFILTERCHOOSE32A HWND32 hwndOwner; - PWAVEFILTER32 pwfltr; + PWAVEFILTER pwfltr; DWORD cbwfltr; LPCSTR pszTitle; @@ -340,7 +340,7 @@ typedef struct _ACMFILTERCHOOSE32A DWORD cchName; DWORD fdwEnum; - PWAVEFILTER32 pwfltrEnum; + PWAVEFILTER pwfltrEnum; HINSTANCE32 hInstance; LPCSTR pszTemplateName; @@ -355,7 +355,7 @@ typedef struct _ACMFILTERCHOOSE32W HWND32 hwndOwner; - PWAVEFILTER32 pwfltr; + PWAVEFILTER pwfltr; DWORD cbwfltr; LPCWSTR pszTitle; @@ -366,7 +366,7 @@ typedef struct _ACMFILTERCHOOSE32W DWORD cchName; DWORD fdwEnum; - PWAVEFILTER32 pwfltrEnum; + PWAVEFILTER pwfltrEnum; HINSTANCE32 hInstance; LPCWSTR pszTemplateName; @@ -381,7 +381,7 @@ typedef struct _ACMFILTERCHOOSE16 HWND16 hwndOwner; - LPWAVEFILTER16 pwfltr; + LPWAVEFILTER pwfltr; DWORD cbwfltr; LPCSTR pszTitle; @@ -392,7 +392,7 @@ typedef struct _ACMFILTERCHOOSE16 DWORD cchName; DWORD fdwEnum; - LPWAVEFILTER16 pwfltrEnum; + LPWAVEFILTER pwfltrEnum; HINSTANCE16 hInstance; LPCSTR pszTemplateName; @@ -406,7 +406,7 @@ typedef struct _ACMFILTERDETAILS32A DWORD dwFilterIndex; DWORD dwFilterTag; DWORD fdwSupport; - PWAVEFILTER32 pwfltr; + PWAVEFILTER pwfltr; DWORD cbwfltr; CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILS32A, *PACMFILTERDETAILS32A; @@ -417,7 +417,7 @@ typedef struct _ACMFILTERDETAILS32W DWORD dwFilterIndex; DWORD dwFilterTag; DWORD fdwSupport; - PWAVEFILTER32 pwfltr; + PWAVEFILTER pwfltr; DWORD cbwfltr; WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILS32W, *PACMFILTERDETAILS32W; @@ -428,7 +428,7 @@ typedef struct _ACMFILTERDETAILS16 DWORD dwFilterIndex; DWORD dwFilterTag; DWORD fdwSupport; - LPWAVEFILTER16 pwfltr; + LPWAVEFILTER pwfltr; DWORD cbwfltr; CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16; @@ -473,7 +473,7 @@ typedef struct _ACMFORMATCHOOSE32A HWND32 hwndOwner; - PWAVEFORMATEX32 pwfx; + PWAVEFORMATEX pwfx; DWORD cbwfx; LPCSTR pszTitle; @@ -484,7 +484,7 @@ typedef struct _ACMFORMATCHOOSE32A DWORD cchName; DWORD fdwEnum; - PWAVEFORMATEX32 pwfxEnum; + PWAVEFORMATEX pwfxEnum; HINSTANCE32 hInstance; LPCSTR pszTemplateName; @@ -499,7 +499,7 @@ typedef struct _ACMFORMATCHOOSE32W HWND32 hwndOwner; - PWAVEFORMATEX32 pwfx; + PWAVEFORMATEX pwfx; DWORD cbwfx; LPCWSTR pszTitle; @@ -525,7 +525,7 @@ typedef struct _ACMFORMATCHOOSE16 HWND16 hwndOwner; - LPWAVEFORMATEX16 pwfx; + LPWAVEFORMATEX pwfx; DWORD cbwfx; LPCSTR pszTitle; @@ -536,7 +536,7 @@ typedef struct _ACMFORMATCHOOSE16 DWORD cchName; DWORD fdwEnum; - LPWAVEFORMATEX16 pwfxEnum; + LPWAVEFORMATEX pwfxEnum; HINSTANCE16 hInstance; LPCSTR pszTemplateName; @@ -550,7 +550,7 @@ typedef struct _ACMFORMATDETAILS32A DWORD dwFormatIndex; DWORD dwFormatTag; DWORD fdwSupport; - PWAVEFORMATEX32 pwfx; + PWAVEFORMATEX pwfx; DWORD cbwfx; CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILS32A, *PACMFORMATDETAILS32A; @@ -561,7 +561,7 @@ typedef struct _ACMFORMATDETAILS32W DWORD dwFormatIndex; DWORD dwFormatTag; DWORD fdwSupport; - PWAVEFORMATEX32 pwfx; + PWAVEFORMATEX pwfx; DWORD cbwfx; WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILS32W, *PACMFORMATDETAILS32W; @@ -572,7 +572,7 @@ typedef struct _ACMFORMATDETAILS16 DWORD dwFormatIndex; DWORD dwFormatTag; DWORD fdwSupport; - LPWAVEFORMATEX16 pwfx; + LPWAVEFORMATEX pwfx; DWORD cbwfx; CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16; @@ -746,8 +746,8 @@ MMRESULT16 WINAPI acmFormatEnum16( ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum ); MMRESULT16 WINAPI acmFormatSuggest16( - HACMDRIVER16 had, LPWAVEFORMATEX16 pwfxSrc, - LPWAVEFORMATEX16 pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest + HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, + LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest ); MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails @@ -768,8 +768,8 @@ MMRESULT16 WINAPI acmFilterEnum16( ); MMRESULT16 WINAPI acmStreamOpen16( LPHACMSTREAM16 phas, HACMDRIVER16 had, - LPWAVEFORMATEX16 pwfxSrc, LPWAVEFORMATEX16 pwfxDst, - LPWAVEFILTER16 pwfltr, DWORD dwCallback, + LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, + LPWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen ); MMRESULT16 WINAPI acmStreamClose16( @@ -886,7 +886,7 @@ MMRESULT32 WINAPI acmFormatEnum32W( ACMFORMATENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum ); MMRESULT32 WINAPI acmFormatSuggest32( - HACMDRIVER32 had, PWAVEFORMATEX32 pwfxSrc, PWAVEFORMATEX32 pwfxDst, + HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest ); MMRESULT32 WINAPI acmFormatTagDetails32A( @@ -918,8 +918,8 @@ MMRESULT32 WINAPI acmStreamMessage32( HACMSTREAM32 has, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2 ); MMRESULT32 WINAPI acmStreamOpen32( - PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX32 pwfxSrc, - PWAVEFORMATEX32 pwfxDst, PWAVEFILTER32 pwfltr, DWORD dwCallback, + PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, + PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen ); MMRESULT32 WINAPI acmStreamPrepareHeader32( diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 91e564e9431..86dc34afb25 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -89,9 +89,9 @@ typedef struct _ACMDRVOPENDESC16 typedef struct _ACMDRVSTREAMINSTANCE16 { DWORD cbStruct; - LPWAVEFORMATEX16 pwfxSrc; - LPWAVEFORMATEX16 pwfxDst; - LPWAVEFILTER16 pwfltr; + LPWAVEFORMATEX pwfxSrc; + LPWAVEFORMATEX pwfxDst; + LPWAVEFILTER pwfltr; DWORD dwCallback; DWORD dwInstance; DWORD fdwOpen; @@ -103,9 +103,9 @@ typedef struct _ACMDRVSTREAMINSTANCE16 typedef struct _ACMDRVSTREAMINSTANCE32 { DWORD cbStruct; - PWAVEFORMATEX32 pwfxSrc; - PWAVEFORMATEX32 pwfxDst; - PWAVEFILTER32 pwfltr; + PWAVEFORMATEX pwfxSrc; + PWAVEFORMATEX pwfxDst; + PWAVEFILTER pwfltr; DWORD dwCallback; DWORD dwInstance; DWORD fdwOpen; @@ -184,9 +184,9 @@ typedef struct _ACMDRVFORMATSUGGEST16 { DWORD cbStruct; DWORD fdwSuggest; - LPWAVEFORMATEX16 pwfxSrc; + LPWAVEFORMATEX pwfxSrc; DWORD cbwfxSrc; - LPWAVEFORMATEX16 pwfxDst; + LPWAVEFORMATEX pwfxDst; DWORD cbwfxDst; } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST; @@ -194,9 +194,9 @@ typedef struct _ACMDRVFORMATSUGGEST32 { DWORD cbStruct; DWORD fdwSuggest; - PWAVEFORMATEX32 pwfxSrc; + PWAVEFORMATEX pwfxSrc; DWORD cbwfxSrc; - PWAVEFORMATEX32 pwfxDst; + PWAVEFORMATEX pwfxDst; DWORD cbwfxDst; } ACMDRVFORMATSUGGEST32, *PACMDRVFORMATSUGGEST32; diff --git a/include/winbase.h b/include/winbase.h index da444b4402a..a4c8ec151c4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1397,6 +1397,8 @@ BOOL32 WINAPI FlushFileBuffers(HFILE32); BOOL32 WINAPI FlushViewOfFile(LPCVOID, DWORD); DWORD WINAPI FormatMessage32A(DWORD,LPCVOID,DWORD,DWORD,LPSTR, DWORD,LPDWORD); +DWORD WINAPI FormatMessage32W(DWORD,LPCVOID,DWORD,DWORD,LPWSTR, + DWORD,LPDWORD); #define FormatMessage WINELIB_NAME_AW(FormatMessage) BOOL32 WINAPI FreeConsole(void); BOOL32 WINAPI FreeEnvironmentStrings32A(LPSTR); -- 2.11.4.GIT