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
fb954b7b
Commit
fb954b7b
authored
Jan 18, 2016
by
Andrew Eikum
Committed by
Alexandre Julliard
Jan 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xaudio2_8: Don't use IXAudio27 interface to call Initialize.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ff8f129a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
compat.c
dlls/xaudio2_7/compat.c
+3
-3
xaudio_dll.c
dlls/xaudio2_7/xaudio_dll.c
+10
-11
xaudio_private.h
dlls/xaudio2_7/xaudio_private.h
+1
-0
No files found.
dlls/xaudio2_7/compat.c
View file @
fb954b7b
...
...
@@ -468,7 +468,7 @@ static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags,
{
IXAudio2Impl
*
This
=
impl_from_IXAudio27
(
iface
);
TRACE
(
"(%p)->(0x%x, 0x%x)
\n
"
,
This
,
flags
,
processor
);
return
S_OK
;
return
xaudio2_initialize
(
This
,
flags
,
processor
)
;
}
static
HRESULT
WINAPI
XA27_RegisterForCallbacks
(
IXAudio27
*
iface
,
...
...
@@ -1305,7 +1305,7 @@ static HRESULT WINAPI XA22_Initialize(IXAudio22 *iface, UINT32 flags,
{
IXAudio2Impl
*
This
=
impl_from_IXAudio22
(
iface
);
TRACE
(
"(%p)->(0x%x, 0x%x)
\n
"
,
This
,
flags
,
processor
);
return
S_OK
;
return
xaudio2_initialize
(
This
,
flags
,
processor
)
;
}
static
HRESULT
WINAPI
XA22_RegisterForCallbacks
(
IXAudio22
*
iface
,
...
...
@@ -2163,7 +2163,7 @@ static HRESULT WINAPI XA20_Initialize(IXAudio20 *iface, UINT32 flags,
{
IXAudio2Impl
*
This
=
impl_from_IXAudio20
(
iface
);
TRACE
(
"(%p)->(0x%x, 0x%x)
\n
"
,
This
,
flags
,
processor
);
return
S_OK
;
return
xaudio2_initialize
(
This
,
flags
,
processor
)
;
}
static
HRESULT
WINAPI
XA20_RegisterForCallbacks
(
IXAudio20
*
iface
,
...
...
dlls/xaudio2_7/xaudio_dll.c
View file @
fb954b7b
...
...
@@ -2046,14 +2046,22 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
return
IClassFactory_QueryInterface
(
factory
,
riid
,
ppv
);
}
HRESULT
xaudio2_initialize
(
IXAudio2Impl
*
This
,
UINT32
flags
,
XAUDIO2_PROCESSOR
proc
)
{
if
(
flags
)
FIXME
(
"Unimplemented flags: 0x%x
\n
"
,
flags
);
return
S_OK
;
}
#if XAUDIO2_VER >= 8
HRESULT
WINAPI
XAudio2Create
(
IXAudio2
**
ppxa2
,
UINT32
flags
,
XAUDIO2_PROCESSOR
proc
)
{
HRESULT
hr
;
IXAudio2
*
xa2
;
IXAudio27
*
xa27
;
IClassFactory
*
cf
;
TRACE
(
"%p 0x%x 0x%x
\n
"
,
ppxa2
,
flags
,
proc
);
cf
=
make_xaudio2_factory
();
hr
=
IClassFactory_CreateInstance
(
cf
,
NULL
,
&
IID_IXAudio2
,
(
void
**
)
&
xa2
);
...
...
@@ -2061,21 +2069,12 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p
if
(
FAILED
(
hr
))
return
hr
;
hr
=
IXAudio2_QueryInterface
(
xa2
,
&
IID_IXAudio27
,
(
void
**
)
&
xa27
);
hr
=
xaudio2_initialize
(
impl_from_IXAudio2
(
xa2
),
flags
,
proc
);
if
(
FAILED
(
hr
)){
IXAudio2_Release
(
xa2
);
return
hr
;
}
hr
=
IXAudio27_Initialize
(
xa27
,
flags
,
proc
);
if
(
FAILED
(
hr
)){
IXAudio27_Release
(
xa27
);
IXAudio2_Release
(
xa2
);
return
hr
;
}
IXAudio27_Release
(
xa27
);
*
ppxa2
=
xa2
;
return
S_OK
;
...
...
dlls/xaudio2_7/xaudio_private.h
View file @
fb954b7b
...
...
@@ -150,3 +150,4 @@ extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN;
extern
const
IXAudio20MasteringVoiceVtbl
XAudio20MasteringVoice_Vtbl
DECLSPEC_HIDDEN
;
extern
IClassFactory
*
make_xapo_factory
(
REFCLSID
clsid
)
DECLSPEC_HIDDEN
;
extern
HRESULT
xaudio2_initialize
(
IXAudio2Impl
*
This
,
UINT32
flags
,
XAUDIO2_PROCESSOR
proc
)
DECLSPEC_HIDDEN
;
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