Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSACM32] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-18 12:20:12 +01:00
parent 68430db462
commit 168ccfac22
12 changed files with 137 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/msacm32/CMakeLists.txt
View file

@ -10,7 +10,7 @@ list(APPEND SOURCE
msacm32_main.c
pcmconverter.c
stream.c
wineacm.h
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
add_library(msacm32 SHARED
@ -21,5 +21,5 @@ add_library(msacm32 SHARED
set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
target_link_libraries(msacm32 wine)
add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
add_pch(msacm32 wineacm.h SOURCE)
add_pch(msacm32 precomp.h SOURCE)
add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)

19
dll/win32/msacm32/driver.c
View file

@ -21,7 +21,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#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.@)

14
dll/win32/msacm32/filter.c
View file

@ -20,7 +20,21 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#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.@)

16
dll/win32/msacm32/format.c
View file

@ -19,8 +19,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#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

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

@ -21,9 +21,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wineacm.h"
#include <stdarg.h>
#include <string.h>
#include <winreg.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);
/**********************************************************************/

7
dll/win32/msacm32/msacm.rc
View file

@ -15,12 +15,11 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <windef.h>
#include <winuser.h>
#include <msacmdlg.h>
#include "wineacm.h"
#include <reactos/manifest_dll.rc>

12
dll/win32/msacm32/msacm32_main.c
View file

@ -21,8 +21,20 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#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;

21
dll/win32/msacm32/pcmconverter.c
View file

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

17
dll/win32/msacm32/precomp.h Normal file
View file

@ -0,0 +1,17 @@
#ifndef _WINEACM_PRECOMP_H
#define _WINEACM_PRECOMP_H
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define NOBITMAP
#include "wineacm.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#endif /* !_WINEACM_PRECOMP_H */

13
dll/win32/msacm32/stream.c
View file

@ -28,8 +28,21 @@
* + properly close ACM streams
*/
#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);

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

@ -20,21 +20,11 @@
#ifndef __WINE_WINEACM_H
#define __WINE_WINEACM_H
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define NOBITMAP
#include <windef.h>
#include <winuser.h>
#include <wine/debug.h>
#ifdef __REACTOS__
#include <wine/msacmdrv.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
#endif
/***********************************************************************
* Wine specific - Win32
@ -162,6 +152,6 @@ LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
/* Dialog box templates */
#include <msacmdlg.h>
#include "msacmdlg.h"
#endif /* __WINE_WINEACM_H */

2
media/doc/README.WINE
View file

@ -100,7 +100,7 @@ reactos/dll/win32/mlang # Synced to WineStaging-3.3
reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3
reactos/dll/win32/mpr # Synced to WineStaging-3.3
reactos/dll/win32/mprapi # Synced to WineStaging-3.3
reactos/dll/win32/msacm32 # Synced to WineStaging-2.16
reactos/dll/win32/msacm32 # Synced to WineStaging-3.3
reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9
reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9
reactos/dll/win32/mscat32 # Synced to WineStaging-2.9