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
01c6b4fe
Commit
01c6b4fe
authored
May 11, 2017
by
Michael Stefaniuc
Committed by
Alexandre Julliard
May 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmime: Forward Init() to InitAudio().
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3236e4cc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
35 deletions
+4
-35
performance.c
dlls/dmime/performance.c
+4
-35
No files found.
dlls/dmime/performance.c
View file @
01c6b4fe
...
...
@@ -247,43 +247,12 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance
/* IDirectMusicPerformanceImpl IDirectMusicPerformance Interface part: */
static
HRESULT
WINAPI
IDirectMusicPerformance8Impl_Init
(
IDirectMusicPerformance8
*
iface
,
IDirectMusic
**
ppDirectMusic
,
IDirectSound
*
pDirectSound
,
HWND
hW
nd
)
IDirectMusic
**
dmusic
,
IDirectSound
*
dsound
,
HWND
hw
nd
)
{
IDirectMusicPerformance8Impl
*
This
=
impl_from_IDirectMusicPerformance8
(
iface
);
FIXME
(
"(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)
\n
"
,
This
,
ppDirectMusic
,
pDirectSound
,
hWnd
);
if
(
This
->
dmusic
)
return
DMUS_E_ALREADY_INITED
;
if
(
NULL
!=
pDirectSound
)
{
This
->
dsound
=
pDirectSound
;
IDirectSound_AddRef
(
This
->
dsound
);
}
else
{
DirectSoundCreate8
(
NULL
,
(
IDirectSound8
**
)
&
This
->
dsound
,
NULL
);
if
(
!
This
->
dsound
)
return
DSERR_NODRIVER
;
TRACE
(
"(%p, %p, %p, %p)
\n
"
,
iface
,
dmusic
,
dsound
,
hwnd
);
if
(
!
hWnd
)
hWnd
=
GetForegroundWindow
();
IDirectSound_SetCooperativeLevel
(
This
->
dsound
,
hWnd
,
DSSCL_PRIORITY
);
}
if
(
NULL
!=
ppDirectMusic
&&
NULL
!=
*
ppDirectMusic
)
{
/* app creates its own dmusic object and gives it to performance */
This
->
dmusic
=
(
IDirectMusic8
*
)
*
ppDirectMusic
;
IDirectMusic8_AddRef
(
This
->
dmusic
);
}
else
{
HRESULT
hr
;
/* App enables the performance to initialize itself and needs a pointer to object */
hr
=
CoCreateInstance
(
&
CLSID_DirectMusic
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IDirectMusic8
,
(
void
**
)
&
This
->
dmusic
);
if
(
FAILED
(
hr
))
return
hr
;
if
(
ppDirectMusic
)
{
*
ppDirectMusic
=
(
IDirectMusic
*
)
This
->
dmusic
;
IDirectMusic8_AddRef
((
LPDIRECTMUSIC8
)
*
ppDirectMusic
);
}
}
return
S_OK
;
return
IDirectMusicPerformance8_InitAudio
(
iface
,
dmusic
,
dsound
?
&
dsound
:
NULL
,
hwnd
,
0
,
0
,
0
,
NULL
);
}
static
HRESULT
WINAPI
IDirectMusicPerformance8Impl_PlaySegment
(
IDirectMusicPerformance8
*
iface
,
...
...
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