Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
40a4a5c7
Commit
40a4a5c7
authored
May 12, 2017
by
Michael Stefaniuc
Committed by
Alexandre Julliard
May 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmusic: Fail in CreatePort() if SetDirectSound() wasn't called.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
14f89931
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
dmusic.c
dlls/dmusic/dmusic.c
+3
-3
dmusic.c
dlls/dmusic/tests/dmusic.c
+1
-1
No files found.
dlls/dmusic/dmusic.c
View file @
40a4a5c7
...
...
@@ -129,14 +129,14 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI
TRACE
(
"(%p)->(%s, %p, %p, %p)
\n
"
,
This
,
debugstr_dmguid
(
rclsid_port
),
port_params
,
port
,
unkouter
);
if
(
!
rclsid_port
)
if
(
!
rclsid_port
||
!
port
)
return
E_POINTER
;
if
(
!
port_params
)
return
E_INVALIDARG
;
if
(
!
port
)
return
E_POINTER
;
if
(
unkouter
)
return
CLASS_E_NOAGGREGATION
;
if
(
!
This
->
dsound
)
return
DMUS_E_DSOUND_NOT_SET
;
if
(
TRACE_ON
(
dmusic
))
dump_DMUS_PORTPARAMS
(
port_params
);
...
...
dlls/dmusic/tests/dmusic.c
View file @
40a4a5c7
...
...
@@ -68,7 +68,7 @@ static void test_dmusic(void)
/* No port can be created before SetDirectSound is called */
hr
=
IDirectMusic_CreatePort
(
dmusic
,
&
GUID_NULL
,
&
port_params
,
&
port
,
NULL
);
todo_wine
ok
(
hr
==
DMUS_E_DSOUND_NOT_SET
,
"IDirectMusic_CreatePort returned: %x
\n
"
,
hr
);
ok
(
hr
==
DMUS_E_DSOUND_NOT_SET
,
"IDirectMusic_CreatePort returned: %x
\n
"
,
hr
);
hr
=
IDirectMusic_SetDirectSound
(
dmusic
,
NULL
,
NULL
);
ok
(
hr
==
S_OK
,
"IDirectMusic_SetDirectSound returned: %x
\n
"
,
hr
);
...
...
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