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
b2315480
Commit
b2315480
authored
Aug 22, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Oct 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Use IWMSyncReader2_GetAllocateForStream in the async reader.
parent
04fa6391
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
24 deletions
+28
-24
wm_asyncreader.c
dlls/winegstreamer/wm_asyncreader.c
+14
-4
wmvcore.c
dlls/wmvcore/tests/wmvcore.c
+14
-20
No files found.
dlls/winegstreamer/wm_asyncreader.c
View file @
b2315480
...
...
@@ -905,11 +905,21 @@ static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *
return
IWMSyncReader2_SetAllocateForStream
(
reader
->
reader
,
stream_number
,
allocate
?
reader
->
allocator
:
NULL
);
}
static
HRESULT
WINAPI
WMReaderAdvanced_GetAllocateForStream
(
IWMReaderAdvanced6
*
iface
,
WORD
output_num
,
BOOL
*
allocate
)
static
HRESULT
WINAPI
WMReaderAdvanced_GetAllocateForStream
(
IWMReaderAdvanced6
*
iface
,
WORD
stream_number
,
BOOL
*
allocate
)
{
struct
async_reader
*
This
=
impl_from_IWMReaderAdvanced6
(
iface
);
FIXME
(
"(%p)->(%d %p)
\n
"
,
This
,
output_num
,
allocate
);
return
E_NOTIMPL
;
struct
async_reader
*
reader
=
impl_from_IWMReaderAdvanced6
(
iface
);
IWMReaderAllocatorEx
*
allocator
;
HRESULT
hr
;
TRACE
(
"reader %p, stream_number %u, allocate %p.
\n
"
,
reader
,
stream_number
,
allocate
);
if
(
FAILED
(
hr
=
IWMSyncReader2_GetAllocateForStream
(
reader
->
reader
,
stream_number
,
&
allocator
)))
return
hr
;
if
((
*
allocate
=
allocator
!=
NULL
))
IWMReaderAllocatorEx_Release
(
allocator
);
return
hr
;
}
static
HRESULT
WINAPI
WMReaderAdvanced_GetStatistics
(
IWMReaderAdvanced6
*
iface
,
WM_READER_STATISTICS
*
statistics
)
...
...
dlls/wmvcore/tests/wmvcore.c
View file @
b2315480
...
...
@@ -2514,17 +2514,15 @@ static void test_async_reader_allocate(IWMReader *reader,
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
0
,
&
allocate
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
1
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
2
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
3
,
&
allocate
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IWMReaderAdvanced2_SetAllocateForOutput
(
advanced
,
0
,
TRUE
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
@@ -2541,13 +2539,11 @@ static void test_async_reader_allocate(IWMReader *reader,
ok
(
allocate
==
TRUE
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
1
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
2
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
run_async_reader
(
reader
,
advanced
,
callback
);
...
...
@@ -2575,13 +2571,11 @@ static void test_async_reader_allocate(IWMReader *reader,
ok
(
!
allocate
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
1
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
allocate
==
TRUE
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
allocate
==
TRUE
,
"Got allocate %d.
\n
"
,
allocate
);
hr
=
IWMReaderAdvanced2_GetAllocateForStream
(
advanced
,
2
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
allocate
==
TRUE
,
"Got allocate %d.
\n
"
,
allocate
);
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
allocate
==
TRUE
,
"Got allocate %d.
\n
"
,
allocate
);
run_async_reader
(
reader
,
advanced
,
callback
);
...
...
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