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
957ac08c
Commit
957ac08c
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_GetAllocateForOutput in the async reader.
parent
8de2ec5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
22 deletions
+24
-22
wm_asyncreader.c
dlls/winegstreamer/wm_asyncreader.c
+11
-3
wmvcore.c
dlls/wmvcore/tests/wmvcore.c
+13
-19
No files found.
dlls/winegstreamer/wm_asyncreader.c
View file @
957ac08c
...
...
@@ -879,13 +879,21 @@ static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *
return
IWMSyncReader2_SetAllocateForOutput
(
reader
->
reader
,
output
,
allocate
?
reader
->
allocator
:
NULL
);
}
static
HRESULT
WINAPI
WMReaderAdvanced_GetAllocateForOutput
(
IWMReaderAdvanced6
*
iface
,
DWORD
output
_num
,
BOOL
*
allocate
)
static
HRESULT
WINAPI
WMReaderAdvanced_GetAllocateForOutput
(
IWMReaderAdvanced6
*
iface
,
DWORD
output
,
BOOL
*
allocate
)
{
struct
async_reader
*
reader
=
impl_from_IWMReaderAdvanced6
(
iface
);
IWMReaderAllocatorEx
*
allocator
;
HRESULT
hr
;
FIXME
(
"reader %p, output %lu, allocate %p, stub!
\n
"
,
reader
,
output_num
,
allocate
);
TRACE
(
"reader %p, output %lu, allocate %p.
\n
"
,
reader
,
output
,
allocate
);
return
E_NOTIMPL
;
if
(
FAILED
(
hr
=
IWMSyncReader2_GetAllocateForOutput
(
reader
->
reader
,
output
,
&
allocator
)))
return
hr
;
if
((
*
allocate
=
allocator
!=
NULL
))
IWMReaderAllocatorEx_Release
(
allocator
);
return
hr
;
}
static
HRESULT
WINAPI
WMReaderAdvanced_SetAllocateForStream
(
IWMReaderAdvanced6
*
iface
,
...
...
dlls/wmvcore/tests/wmvcore.c
View file @
957ac08c
...
...
@@ -2505,15 +2505,13 @@ static void test_async_reader_allocate(IWMReader *reader,
callback
->
allocated_samples
=
true
;
hr
=
IWMReaderAdvanced2_GetAllocateForOutput
(
advanced
,
0
,
&
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_GetAllocateForOutput
(
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_GetAllocateForOutput
(
advanced
,
2
,
&
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
,
0
,
&
allocate
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
@@ -2536,13 +2534,11 @@ static void test_async_reader_allocate(IWMReader *reader,
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IWMReaderAdvanced2_GetAllocateForOutput
(
advanced
,
0
,
&
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_GetAllocateForOutput
(
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
,
1
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
@@ -2572,13 +2568,11 @@ static void test_async_reader_allocate(IWMReader *reader,
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IWMReaderAdvanced2_GetAllocateForOutput
(
advanced
,
0
,
&
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_GetAllocateForOutput
(
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
,
1
,
&
allocate
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#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