mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 22:47:28 +00:00
[MMDEVAPI] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
2c523eef19
commit
9c982d0105
|
@ -10,7 +10,7 @@ list(APPEND SOURCE
|
||||||
audiovolume.c
|
audiovolume.c
|
||||||
devenum.c
|
devenum.c
|
||||||
main.c
|
main.c
|
||||||
mmdevapi.h
|
precomp.h
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
|
${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
|
||||||
|
|
||||||
add_library(mmdevapi SHARED
|
add_library(mmdevapi SHARED
|
||||||
|
@ -22,6 +22,6 @@ add_library(mmdevapi SHARED
|
||||||
set_module_type(mmdevapi win32dll)
|
set_module_type(mmdevapi win32dll)
|
||||||
target_link_libraries(mmdevapi uuid wine)
|
target_link_libraries(mmdevapi uuid wine)
|
||||||
add_importlibs(mmdevapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
|
add_importlibs(mmdevapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
|
||||||
add_pch(mmdevapi mmdevapi.h SOURCE)
|
add_pch(mmdevapi precomp.h SOURCE)
|
||||||
add_dependencies(mmdevapi dxsdk)
|
add_dependencies(mmdevapi dxsdk)
|
||||||
add_cd_file(TARGET mmdevapi DESTINATION reactos/system32 FOR all)
|
add_cd_file(TARGET mmdevapi DESTINATION reactos/system32 FOR all)
|
||||||
|
|
|
@ -16,8 +16,30 @@
|
||||||
* 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 COBJMACROS
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "winnls.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
|
#include "ole2.h"
|
||||||
|
#include "mmdeviceapi.h"
|
||||||
|
#include "mmsystem.h"
|
||||||
|
#include "dsound.h"
|
||||||
|
#include "audioclient.h"
|
||||||
|
#include "endpointvolume.h"
|
||||||
|
#include "audiopolicy.h"
|
||||||
|
|
||||||
#include "mmdevapi.h"
|
#include "mmdevapi.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
|
||||||
|
|
||||||
typedef struct AEVImpl {
|
typedef struct AEVImpl {
|
||||||
IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface;
|
IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface;
|
||||||
LONG ref;
|
LONG ref;
|
||||||
|
|
|
@ -16,15 +16,33 @@
|
||||||
* 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 <stdarg.h>
|
||||||
|
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
#define COBJMACROS
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "winnls.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
#include "wine/list.h"
|
||||||
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
|
#include "initguid.h"
|
||||||
|
#include "ole2.h"
|
||||||
|
#include "mmdeviceapi.h"
|
||||||
|
#include "dshow.h"
|
||||||
|
#include "dsound.h"
|
||||||
|
#include "audioclient.h"
|
||||||
|
#include "endpointvolume.h"
|
||||||
|
#include "audiopolicy.h"
|
||||||
|
|
||||||
#include "mmdevapi.h"
|
#include "mmdevapi.h"
|
||||||
|
#include "devpkey.h"
|
||||||
|
|
||||||
#include <wine/list.h>
|
WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
|
||||||
|
|
||||||
#include <oleauto.h>
|
|
||||||
#include <initguid.h>
|
|
||||||
#define _WINDOWS_H
|
|
||||||
#include <dshow.h>
|
|
||||||
#include <devpkey.h>
|
|
||||||
|
|
||||||
static const WCHAR software_mmdevapi[] =
|
static const WCHAR software_mmdevapi[] =
|
||||||
{ 'S','o','f','t','w','a','r','e','\\',
|
{ 'S','o','f','t','w','a','r','e','\\',
|
||||||
|
|
|
@ -17,9 +17,36 @@
|
||||||
* 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 "mmdevapi.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <rpcproxy.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "wingdi.h"
|
||||||
|
#include "wine/library.h"
|
||||||
|
|
||||||
|
#include "ole2.h"
|
||||||
|
#include "olectl.h"
|
||||||
|
#include "rpcproxy.h"
|
||||||
|
#include "propsys.h"
|
||||||
|
#include "propkeydef.h"
|
||||||
|
#include "mmdeviceapi.h"
|
||||||
|
#include "mmsystem.h"
|
||||||
|
#include "dsound.h"
|
||||||
|
#include "audioclient.h"
|
||||||
|
#include "endpointvolume.h"
|
||||||
|
#include "audiopolicy.h"
|
||||||
|
#include "devpkey.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
|
||||||
|
#include "mmdevapi.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
|
||||||
|
|
||||||
static HINSTANCE instance;
|
static HINSTANCE instance;
|
||||||
|
|
||||||
|
|
|
@ -16,34 +16,11 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _MMDEVAPI_H_
|
#pragma once
|
||||||
#define _MMDEVAPI_H_
|
|
||||||
|
|
||||||
#include <wine/config.h>
|
#ifndef __WINE_CONFIG_H
|
||||||
#include <wine/port.h>
|
# error You must include config.h to use this header
|
||||||
|
#endif
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define _INC_WINDOWS
|
|
||||||
#define COM_NO_WINDOWS_H
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
#include <winreg.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <audiopolicy.h>
|
|
||||||
#include <endpointvolume.h>
|
|
||||||
#include <mmdeviceapi.h>
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
|
|
||||||
|
|
||||||
extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
|
extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
|
||||||
extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;
|
extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;
|
||||||
|
@ -102,5 +79,3 @@ extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC
|
||||||
extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN;
|
extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;
|
extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* _MMDEVAPI_H_ */
|
|
||||||
|
|
31
dll/win32/mmdevapi/precomp.h
Normal file
31
dll/win32/mmdevapi/precomp.h
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
|
||||||
|
#ifndef _MMDEVAPI_PRECOMP_H_
|
||||||
|
#define _MMDEVAPI_PRECOMP_H_
|
||||||
|
|
||||||
|
#include <wine/config.h>
|
||||||
|
#include <wine/port.h>
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#define WIN32_NO_STATUS
|
||||||
|
#define _INC_WINDOWS
|
||||||
|
#define COM_NO_WINDOWS_H
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
|
||||||
|
#include <windef.h>
|
||||||
|
#include <winbase.h>
|
||||||
|
#include <wingdi.h>
|
||||||
|
#include <winreg.h>
|
||||||
|
#include <objbase.h>
|
||||||
|
#include <audiopolicy.h>
|
||||||
|
#include <endpointvolume.h>
|
||||||
|
#include <mmdeviceapi.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
#include <wine/unicode.h>
|
||||||
|
|
||||||
|
#include "mmdevapi.h"
|
||||||
|
|
||||||
|
#endif /* !_MMDEVAPI_PRECOMP_H_ */
|
|
@ -97,7 +97,7 @@ reactos/dll/win32/mciseq # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mciwave # Synced to WineStaging-3.3
|
reactos/dll/win32/mciwave # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3
|
reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mlang # Synced to WineStaging-3.3
|
reactos/dll/win32/mlang # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mmdevapi # Synced to Wine-3.0
|
reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/mpr # Synced to Wine-3.0
|
reactos/dll/win32/mpr # Synced to Wine-3.0
|
||||||
reactos/dll/win32/mprapi # Synced to WineStaging-2.9
|
reactos/dll/win32/mprapi # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/msacm32 # Synced to WineStaging-2.16
|
reactos/dll/win32/msacm32 # Synced to WineStaging-2.16
|
||||||
|
|
Loading…
Reference in a new issue