Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
121a69e0
Commit
121a69e0
authored
Jan 19, 2016
by
Andrew Eikum
Committed by
Alexandre Julliard
Jan 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xaudio2_9: Add xaudio2_9.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bf5dca19
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
2 deletions
+38
-2
configure
configure
+3
-0
configure.ac
configure.ac
+2
-0
compat.c
dlls/xaudio2_7/compat.c
+8
-0
xaudio_dll.c
dlls/xaudio2_7/xaudio_dll.c
+1
-0
Makefile.in
dlls/xaudio2_9/Makefile.in
+13
-0
xaudio2_9.spec
dlls/xaudio2_9/xaudio2_9.spec
+6
-0
xaudio2.idl
include/xaudio2.idl
+5
-2
No files found.
configure
View file @
121a69e0
...
@@ -1408,6 +1408,7 @@ enable_xaudio2_5
...
@@ -1408,6 +1408,7 @@ enable_xaudio2_5
enable_xaudio2_6
enable_xaudio2_6
enable_xaudio2_7
enable_xaudio2_7
enable_xaudio2_8
enable_xaudio2_8
enable_xaudio2_9
enable_xinput1_1
enable_xinput1_1
enable_xinput1_2
enable_xinput1_2
enable_xinput1_3
enable_xinput1_3
...
@@ -13720,6 +13721,7 @@ then
...
@@ -13720,6 +13721,7 @@ then
enable_xaudio2_6
=
${
enable_xaudio2_6
:-
no
}
enable_xaudio2_6
=
${
enable_xaudio2_6
:-
no
}
enable_xaudio2_7
=
${
enable_xaudio2_7
:-
no
}
enable_xaudio2_7
=
${
enable_xaudio2_7
:-
no
}
enable_xaudio2_8
=
${
enable_xaudio2_8
:-
no
}
enable_xaudio2_8
=
${
enable_xaudio2_8
:-
no
}
enable_xaudio2_9
=
${
enable_xaudio2_9
:-
no
}
fi
fi
if
test
"
$ac_cv_header_kstat_h
"
=
"yes"
if
test
"
$ac_cv_header_kstat_h
"
=
"yes"
...
@@ -18035,6 +18037,7 @@ wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean
...
@@ -18035,6 +18037,7 @@ wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean
wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean
wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean
wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test
wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test
wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean
wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean
wine_fn_config_dll xaudio2_9 enable_xaudio2_9 clean
wine_fn_config_dll xinput1_1 enable_xinput1_1
wine_fn_config_dll xinput1_1 enable_xinput1_1
wine_fn_config_dll xinput1_2 enable_xinput1_2
wine_fn_config_dll xinput1_2 enable_xinput1_2
wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput
wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput
...
...
configure.ac
View file @
121a69e0
...
@@ -1685,6 +1685,7 @@ then
...
@@ -1685,6 +1685,7 @@ then
enable_xaudio2_6=${enable_xaudio2_6:-no}
enable_xaudio2_6=${enable_xaudio2_6:-no}
enable_xaudio2_7=${enable_xaudio2_7:-no}
enable_xaudio2_7=${enable_xaudio2_7:-no}
enable_xaudio2_8=${enable_xaudio2_8:-no}
enable_xaudio2_8=${enable_xaudio2_8:-no}
enable_xaudio2_9=${enable_xaudio2_9:-no}
fi
fi
dnl **** Check for libkstat ****
dnl **** Check for libkstat ****
...
@@ -3401,6 +3402,7 @@ WINE_CONFIG_DLL(xaudio2_6,,[clean])
...
@@ -3401,6 +3402,7 @@ WINE_CONFIG_DLL(xaudio2_6,,[clean])
WINE_CONFIG_DLL(xaudio2_7,,[clean])
WINE_CONFIG_DLL(xaudio2_7,,[clean])
WINE_CONFIG_TEST(dlls/xaudio2_7/tests)
WINE_CONFIG_TEST(dlls/xaudio2_7/tests)
WINE_CONFIG_DLL(xaudio2_8,,[clean])
WINE_CONFIG_DLL(xaudio2_8,,[clean])
WINE_CONFIG_DLL(xaudio2_9,,[clean])
WINE_CONFIG_DLL(xinput1_1)
WINE_CONFIG_DLL(xinput1_1)
WINE_CONFIG_DLL(xinput1_2)
WINE_CONFIG_DLL(xinput1_2)
WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput])
WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput])
...
...
dlls/xaudio2_7/compat.c
View file @
121a69e0
...
@@ -78,6 +78,14 @@
...
@@ -78,6 +78,14 @@
* Change parameter of IXAudio2::CreateMasteringVoice
* Change parameter of IXAudio2::CreateMasteringVoice
* Add Flags parameter to IXAudio2SourceVoice::GetState
* Add Flags parameter to IXAudio2SourceVoice::GetState
* Add IXAudio2MasteringVoice::GetChannelMask
* Add IXAudio2MasteringVoice::GetChannelMask
* Add DisableLateField member to XAUDIO2FX_REVERB_PARAMETERS
*
* 2.9
* Change IID_IXAudio2
* New flags: XAUDIO2_STOP_ENGINE_WHEN_IDLE, XAUDIO2_1024_QUANTUM,
* XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT
* ABI break:
* Add SideDelay member to XAUDIO2FX_REVERB_PARAMETERS
*/
*/
#include "config.h"
#include "config.h"
...
...
dlls/xaudio2_7/xaudio_dll.c
View file @
121a69e0
...
@@ -1192,6 +1192,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
...
@@ -1192,6 +1192,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
TRACE
(
"(%p)->(%s, %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
TRACE
(
"(%p)->(%s, %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IXAudio28
)
||
IsEqualGUID
(
riid
,
&
IID_IXAudio2
))
IsEqualGUID
(
riid
,
&
IID_IXAudio2
))
*
ppvObject
=
&
This
->
IXAudio2_iface
;
*
ppvObject
=
&
This
->
IXAudio2_iface
;
else
if
(
IsEqualGUID
(
riid
,
&
IID_IXAudio27
)){
else
if
(
IsEqualGUID
(
riid
,
&
IID_IXAudio27
)){
...
...
dlls/xaudio2_9/Makefile.in
0 → 100644
View file @
121a69e0
EXTRADEFS
=
-DXAUDIO2_VER
=
9
MODULE
=
xaudio2_9.dll
IMPORTS
=
advapi32 ole32 user32 uuid
EXTRALIBS
=
$(OPENAL_LIBS)
PARENTSRC
=
../xaudio2_7
C_SRCS
=
\
compat.c
\
x3daudio.c
\
xapofx.c
\
xaudio_dll.c
IDL_SRCS
=
xaudio_classes.idl
dlls/xaudio2_9/xaudio2_9.spec
0 → 100644
View file @
121a69e0
@ stdcall XAudio2Create(ptr long long)
@ stdcall CreateAudioVolumeMeter(ptr)
@ stdcall CreateAudioReverb(ptr)
@ cdecl CreateFX(ptr ptr ptr long)
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
@ cdecl X3DAudioInitialize(long float ptr)
include/xaudio2.idl
View file @
121a69e0
...
@@ -1001,11 +1001,14 @@ interface IXAudio27 : IUnknown
...
@@ -1001,11 +1001,14 @@ interface IXAudio27 : IUnknown
[
in
,
defaultvalue
(
NULL
)
]
void
*
pReserved
)
;
[
in
,
defaultvalue
(
NULL
)
]
void
*
pReserved
)
;
}
}
/*
XAudio2
2.8
's IXAudio2 is identical to 2.9'
s
*/
cpp_quote
(
"DEFINE_GUID(IID_IXAudio28, 0x60d8dac8, 0x5aa1, 0x4e8e, 0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84);"
)
[
[
object
,
object
,
uuid
(
60
d8dac8
-
5
aa1
-
4
e8e
-
b597
-
2
f5e2883d484
),
uuid
(
2b02
e3cf
-
2
e0b
-
4
ec3
-
be45
-
1b2
a3fe7210d
)
]
]
/*
XAudio2
2.
8
's IXAudio2 interface. */
/*
XAudio2
2.
9
's IXAudio2 interface. */
interface IXAudio2 : IUnknown
interface IXAudio2 : IUnknown
{
{
HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback);
HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment