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
f13fa16f
Commit
f13fa16f
authored
Oct 24, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Nov 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmime: Implement IDirectMusicPerformance_GetSegmentState semi-stub.
parent
617d7fc9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
11 deletions
+97
-11
dmime_private.h
dlls/dmime/dmime_private.h
+1
-0
performance.c
dlls/dmime/performance.c
+84
-5
segmentstate.c
dlls/dmime/segmentstate.c
+6
-0
dmime.c
dlls/dmime/tests/dmime.c
+6
-6
No files found.
dlls/dmime/dmime_private.h
View file @
f13fa16f
...
@@ -77,6 +77,7 @@ extern HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME sta
...
@@ -77,6 +77,7 @@ extern HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME sta
extern
HRESULT
segment_state_play
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
HRESULT
segment_state_play
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
HRESULT
segment_state_tick
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
HRESULT
segment_state_tick
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
HRESULT
segment_state_end_play
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
HRESULT
segment_state_end_play
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicPerformance8
*
performance
);
extern
BOOL
segment_state_has_segment
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicSegment
*
segment
);
extern
HRESULT
wave_track_create_from_chunk
(
IStream
*
stream
,
struct
chunk_entry
*
parent
,
extern
HRESULT
wave_track_create_from_chunk
(
IStream
*
stream
,
struct
chunk_entry
*
parent
,
IDirectMusicTrack8
**
ret_iface
);
IDirectMusicTrack8
**
ret_iface
);
...
...
dlls/dmime/performance.c
View file @
f13fa16f
...
@@ -76,6 +76,8 @@ struct performance
...
@@ -76,6 +76,8 @@ struct performance
HANDLE
notification_event
;
HANDLE
notification_event
;
BOOL
notification_performance
;
BOOL
notification_performance
;
BOOL
notification_segment
;
BOOL
notification_segment
;
IDirectMusicSegment
*
primary_segment
;
};
};
struct
message
struct
message
...
@@ -338,6 +340,12 @@ HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME
...
@@ -338,6 +340,12 @@ HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME
return
S_OK
;
return
S_OK
;
}
}
static
void
performance_set_primary_segment
(
struct
performance
*
This
,
IDirectMusicSegment
*
segment
)
{
if
(
This
->
primary_segment
)
IDirectMusicSegment_Release
(
This
->
primary_segment
);
if
((
This
->
primary_segment
=
segment
))
IDirectMusicSegment_AddRef
(
This
->
primary_segment
);
}
/* IDirectMusicPerformance8 IUnknown part: */
/* IDirectMusicPerformance8 IUnknown part: */
static
HRESULT
WINAPI
performance_QueryInterface
(
IDirectMusicPerformance8
*
iface
,
REFIID
riid
,
void
**
ret_iface
)
static
HRESULT
WINAPI
performance_QueryInterface
(
IDirectMusicPerformance8
*
iface
,
REFIID
riid
,
void
**
ret_iface
)
{
{
...
@@ -487,6 +495,42 @@ static HRESULT WINAPI performance_PlaySegment(IDirectMusicPerformance8 *iface, I
...
@@ -487,6 +495,42 @@ static HRESULT WINAPI performance_PlaySegment(IDirectMusicPerformance8 *iface, I
segment_flags
,
start_time
,
ret_state
,
NULL
,
NULL
);
segment_flags
,
start_time
,
ret_state
,
NULL
,
NULL
);
}
}
struct
state_entry
{
struct
list
entry
;
IDirectMusicSegmentState
*
state
;
};
static
void
state_entry_destroy
(
struct
state_entry
*
entry
)
{
list_remove
(
&
entry
->
entry
);
IDirectMusicSegmentState_Release
(
entry
->
state
);
free
(
entry
);
}
static
void
enum_segment_states
(
struct
performance
*
This
,
IDirectMusicSegment
*
segment
,
struct
list
*
list
)
{
struct
state_entry
*
entry
;
struct
message
*
message
;
LIST_FOR_EACH_ENTRY
(
message
,
&
This
->
messages
,
struct
message
,
entry
)
{
IDirectMusicSegmentState
*
message_state
;
if
(
message
->
msg
.
dwType
!=
DMUS_PMSGT_INTERNAL_SEGMENT_TICK
&&
message
->
msg
.
dwType
!=
DMUS_PMSGT_INTERNAL_SEGMENT_END
)
continue
;
message_state
=
(
IDirectMusicSegmentState
*
)
message
->
msg
.
punkUser
;
if
(
segment
&&
!
segment_state_has_segment
(
message_state
,
segment
))
continue
;
if
(
!
(
entry
=
malloc
(
sizeof
(
*
entry
))))
return
;
entry
->
state
=
message_state
;
IDirectMusicSegmentState_AddRef
(
entry
->
state
);
list_add_tail
(
list
,
&
entry
->
entry
);
}
}
static
HRESULT
WINAPI
performance_Stop
(
IDirectMusicPerformance8
*
iface
,
IDirectMusicSegment
*
pSegment
,
static
HRESULT
WINAPI
performance_Stop
(
IDirectMusicPerformance8
*
iface
,
IDirectMusicSegment
*
pSegment
,
IDirectMusicSegmentState
*
pSegmentState
,
MUSIC_TIME
mtTime
,
DWORD
dwFlags
)
IDirectMusicSegmentState
*
pSegmentState
,
MUSIC_TIME
mtTime
,
DWORD
dwFlags
)
{
{
...
@@ -497,12 +541,36 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM
...
@@ -497,12 +541,36 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM
}
}
static
HRESULT
WINAPI
performance_GetSegmentState
(
IDirectMusicPerformance8
*
iface
,
static
HRESULT
WINAPI
performance_GetSegmentState
(
IDirectMusicPerformance8
*
iface
,
IDirectMusicSegmentState
**
ppSegmentState
,
MUSIC_TIME
mtT
ime
)
IDirectMusicSegmentState
**
state
,
MUSIC_TIME
t
ime
)
{
{
struct
performance
*
This
=
impl_from_IDirectMusicPerformance8
(
iface
);
struct
performance
*
This
=
impl_from_IDirectMusicPerformance8
(
iface
);
struct
list
*
ptr
,
states
=
LIST_INIT
(
states
);
struct
state_entry
*
entry
,
*
next
;
HRESULT
hr
=
S_OK
;
FIXME
(
"(%p,%p, %ld): stub
\n
"
,
This
,
ppSegmentState
,
mtTime
);
TRACE
(
"(%p, %p, %ld)
\n
"
,
This
,
state
,
time
);
return
S_OK
;
if
(
!
state
)
return
E_POINTER
;
EnterCriticalSection
(
&
This
->
safe
);
enum_segment_states
(
This
,
This
->
primary_segment
,
&
states
);
if
(
!
(
ptr
=
list_head
(
&
states
)))
hr
=
DMUS_E_NOT_FOUND
;
else
{
entry
=
LIST_ENTRY
(
ptr
,
struct
state_entry
,
entry
);
*
state
=
entry
->
state
;
IDirectMusicSegmentState_AddRef
(
entry
->
state
);
LIST_FOR_EACH_ENTRY_SAFE
(
entry
,
next
,
&
states
,
struct
state_entry
,
entry
)
state_entry_destroy
(
entry
);
}
LeaveCriticalSection
(
&
This
->
safe
);
return
hr
;
}
}
static
HRESULT
WINAPI
performance_SetPrepareTime
(
IDirectMusicPerformance8
*
iface
,
DWORD
dwMilliSeconds
)
static
HRESULT
WINAPI
performance_SetPrepareTime
(
IDirectMusicPerformance8
*
iface
,
DWORD
dwMilliSeconds
)
...
@@ -1152,6 +1220,8 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface)
...
@@ -1152,6 +1220,8 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface)
WARN
(
"Failed to free message %p, hr %#lx
\n
"
,
message
,
hr
);
WARN
(
"Failed to free message %p, hr %#lx
\n
"
,
message
,
hr
);
}
}
performance_set_primary_segment
(
This
,
NULL
);
if
(
This
->
master_clock
)
if
(
This
->
master_clock
)
{
{
IReferenceClock_Release
(
This
->
master_clock
);
IReferenceClock_Release
(
This
->
master_clock
);
...
@@ -1278,17 +1348,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
...
@@ -1278,17 +1348,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
if
(
FAILED
(
hr
=
IUnknown_QueryInterface
(
source
,
&
IID_IDirectMusicSegment
,
(
void
**
)
&
segment
)))
if
(
FAILED
(
hr
=
IUnknown_QueryInterface
(
source
,
&
IID_IDirectMusicSegment
,
(
void
**
)
&
segment
)))
return
hr
;
return
hr
;
EnterCriticalSection
(
&
This
->
safe
);
performance_set_primary_segment
(
This
,
segment
);
if
((
!
(
music_time
=
start_time
)
&&
FAILED
(
hr
=
IDirectMusicPerformance8_GetTime
(
iface
,
NULL
,
&
music_time
)))
if
((
!
(
music_time
=
start_time
)
&&
FAILED
(
hr
=
IDirectMusicPerformance8_GetTime
(
iface
,
NULL
,
&
music_time
)))
||
FAILED
(
hr
=
segment_state_create
(
segment
,
music_time
,
iface
,
&
state
)))
||
FAILED
(
hr
=
segment_state_create
(
segment
,
music_time
,
iface
,
&
state
)))
{
{
performance_set_primary_segment
(
This
,
NULL
);
LeaveCriticalSection
(
&
This
->
safe
);
IDirectMusicSegment_Release
(
segment
);
IDirectMusicSegment_Release
(
segment
);
return
hr
;
return
hr
;
}
}
EnterCriticalSection
(
&
This
->
safe
);
if
(
FAILED
(
hr
=
segment_state_play
(
state
,
iface
)))
if
(
FAILED
(
hr
=
segment_state_play
(
state
,
iface
)))
{
ERR
(
"Failed to play segment state, hr %#lx
\n
"
,
hr
);
ERR
(
"Failed to play segment state, hr %#lx
\n
"
,
hr
);
performance_set_primary_segment
(
This
,
NULL
);
}
else
if
(
segment_state
)
else
if
(
segment_state
)
{
{
*
segment_state
=
state
;
*
segment_state
=
state
;
...
...
dlls/dmime/segmentstate.c
View file @
f13fa16f
...
@@ -363,3 +363,9 @@ HRESULT segment_state_end_play(IDirectMusicSegmentState *iface, IDirectMusicPerf
...
@@ -363,3 +363,9 @@ HRESULT segment_state_end_play(IDirectMusicSegmentState *iface, IDirectMusicPerf
return
S_OK
;
return
S_OK
;
}
}
BOOL
segment_state_has_segment
(
IDirectMusicSegmentState
*
iface
,
IDirectMusicSegment
*
segment
)
{
struct
segment_state
*
This
=
impl_from_IDirectMusicSegmentState8
((
IDirectMusicSegmentState8
*
)
iface
);
return
!
segment
||
This
->
segment
==
segment
;
}
dlls/dmime/tests/dmime.c
View file @
f13fa16f
...
@@ -4054,9 +4054,9 @@ static void test_segment_state(void)
...
@@ -4054,9 +4054,9 @@ static void test_segment_state(void)
check_track_state
(
track
,
playing
,
FALSE
);
check_track_state
(
track
,
playing
,
FALSE
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
NULL
,
0
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
NULL
,
0
);
todo_wine
ok
(
hr
==
E_POINTER
,
"got %#lx
\n
"
,
hr
);
ok
(
hr
==
E_POINTER
,
"got %#lx
\n
"
,
hr
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
0
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
0
);
todo_wine
ok
(
hr
==
DMUS_E_NOT_FOUND
,
"got %#lx
\n
"
,
hr
);
ok
(
hr
==
DMUS_E_NOT_FOUND
,
"got %#lx
\n
"
,
hr
);
tmp_state
=
state
;
tmp_state
=
state
;
...
@@ -4071,14 +4071,14 @@ static void test_segment_state(void)
...
@@ -4071,14 +4071,14 @@ static void test_segment_state(void)
tmp_state
=
(
void
*
)
0xdeadbeef
;
tmp_state
=
(
void
*
)
0xdeadbeef
;
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
0
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
0
);
ok
(
hr
==
S_OK
,
"got %#lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %#lx
\n
"
,
hr
);
todo_wine
ok
(
state
==
tmp_state
,
"got %p
\n
"
,
state
);
ok
(
state
==
tmp_state
,
"got %p
\n
"
,
state
);
if
(
tmp_state
!=
(
void
*
)
0xdeadbeef
)
IDirectMusicSegmentState_Release
(
tmp_state
);
IDirectMusicSegmentState_Release
(
tmp_state
);
tmp_state
=
(
void
*
)
0xdeadbeef
;
tmp_state
=
(
void
*
)
0xdeadbeef
;
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
69
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
69
);
ok
(
hr
==
S_OK
,
"got %#lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %#lx
\n
"
,
hr
);
todo_wine
ok
(
state
==
tmp_state
,
"got %p
\n
"
,
state
);
ok
(
state
==
tmp_state
,
"got %p
\n
"
,
state
);
if
(
tmp_state
!=
(
void
*
)
0xdeadbeef
)
IDirectMusicSegmentState_Release
(
tmp_state
);
IDirectMusicSegmentState_Release
(
tmp_state
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
70
);
hr
=
IDirectMusicPerformance_GetSegmentState
(
performance
,
&
tmp_state
,
70
);
todo_wine
ok
(
hr
==
DMUS_E_NOT_FOUND
,
"got %#lx
\n
"
,
hr
);
todo_wine
ok
(
hr
==
DMUS_E_NOT_FOUND
,
"got %#lx
\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