mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 08:51:29 +00:00
[MSACM32] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
68430db462
commit
168ccfac22
|
@ -10,7 +10,7 @@ list(APPEND SOURCE
|
||||||
msacm32_main.c
|
msacm32_main.c
|
||||||
pcmconverter.c
|
pcmconverter.c
|
||||||
stream.c
|
stream.c
|
||||||
wineacm.h
|
precomp.h
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
|
${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
|
||||||
|
|
||||||
add_library(msacm32 SHARED
|
add_library(msacm32 SHARED
|
||||||
|
@ -21,5 +21,5 @@ add_library(msacm32 SHARED
|
||||||
set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
|
set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
|
||||||
target_link_libraries(msacm32 wine)
|
target_link_libraries(msacm32 wine)
|
||||||
add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
|
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)
|
add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
|
||||||
|
|
|
@ -21,7 +21,26 @@
|
||||||
* 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 "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.@)
|
||||||
|
|
|
@ -20,7 +20,21 @@
|
||||||
* 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 <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.@)
|
||||||
|
|
|
@ -19,8 +19,24 @@
|
||||||
* 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 <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
|
||||||
|
|
|
@ -21,9 +21,24 @@
|
||||||
* 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"
|
#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);
|
||||||
|
|
||||||
/**********************************************************************/
|
/**********************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,11 @@
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with this library; if not, write to the Free Software
|
* 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 "wineacm.h"
|
||||||
#include <winuser.h>
|
|
||||||
#include <msacmdlg.h>
|
|
||||||
|
|
||||||
#include <reactos/manifest_dll.rc>
|
#include <reactos/manifest_dll.rc>
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,20 @@
|
||||||
* 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 <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;
|
||||||
|
|
|
@ -26,9 +26,28 @@
|
||||||
* embedded driver handling scheme in msacm32.dll which isn't done yet
|
* embedded driver handling scheme in msacm32.dll which isn't done yet
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#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
|
||||||
|
|
17
dll/win32/msacm32/precomp.h
Normal file
17
dll/win32/msacm32/precomp.h
Normal 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 */
|
|
@ -28,8 +28,21 @@
|
||||||
* + properly close ACM streams
|
* + 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"
|
#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);
|
||||||
|
|
|
@ -20,21 +20,11 @@
|
||||||
#ifndef __WINE_WINEACM_H
|
#ifndef __WINE_WINEACM_H
|
||||||
#define __WINE_WINEACM_H
|
#define __WINE_WINEACM_H
|
||||||
|
|
||||||
#include <wine/config.h>
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define NOBITMAP
|
|
||||||
|
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
#include <winuser.h>
|
#include <winuser.h>
|
||||||
|
#ifdef __REACTOS__
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/msacmdrv.h>
|
#include <wine/msacmdrv.h>
|
||||||
#include <wine/unicode.h>
|
#endif
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* Wine specific - Win32
|
* Wine specific - Win32
|
||||||
|
@ -162,6 +152,6 @@ LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
|
||||||
LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
|
LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* Dialog box templates */
|
/* Dialog box templates */
|
||||||
#include <msacmdlg.h>
|
#include "msacmdlg.h"
|
||||||
|
|
||||||
#endif /* __WINE_WINEACM_H */
|
#endif /* __WINE_WINEACM_H */
|
||||||
|
|
|
@ -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/mmdevapi # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mpr # 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/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/msacm32.drv # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9
|
reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/mscat32 # Synced to WineStaging-2.9
|
reactos/dll/win32/mscat32 # Synced to WineStaging-2.9
|
||||||
|
|
Loading…
Reference in a new issue