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
0777941e
Commit
0777941e
authored
Mar 28, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Return void from strmbase_renderer_init().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9829385c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
24 deletions
+8
-24
nullrenderer.c
dlls/qedit/nullrenderer.c
+2
-7
dsoundrender.c
dlls/quartz/dsoundrender.c
+2
-6
videorenderer.c
dlls/quartz/videorenderer.c
+1
-4
vmr9.c
dlls/quartz/vmr9.c
+1
-3
renderer.c
dlls/strmbase/renderer.c
+1
-3
strmbase.h
include/wine/strmbase.h
+1
-1
No files found.
dlls/qedit/nullrenderer.c
View file @
0777941e
...
...
@@ -64,20 +64,15 @@ static const struct strmbase_renderer_ops renderer_ops =
HRESULT
null_renderer_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
{
HRESULT
hr
;
NullRendererImpl
*
pNullRenderer
;
*
out
=
NULL
;
pNullRenderer
=
CoTaskMemAlloc
(
sizeof
(
NullRendererImpl
));
hr
=
strmbase_renderer_init
(
&
pNullRenderer
->
renderer
,
outer
,
strmbase_renderer_init
(
&
pNullRenderer
->
renderer
,
outer
,
&
CLSID_NullRenderer
,
L"In"
,
&
renderer_ops
);
if
(
FAILED
(
hr
))
CoTaskMemFree
(
pNullRenderer
);
else
*
out
=
&
pNullRenderer
->
renderer
.
filter
.
IUnknown_inner
;
*
out
=
&
pNullRenderer
->
renderer
.
filter
.
IUnknown_inner
;
return
S_OK
;
}
dlls/quartz/dsoundrender.c
View file @
0777941e
...
...
@@ -825,12 +825,8 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
return
E_OUTOFMEMORY
;
memset
(
object
,
0
,
sizeof
(
*
object
));
if
(
FAILED
(
hr
=
strmbase_renderer_init
(
&
object
->
renderer
,
outer
,
&
CLSID_DSoundRender
,
L"Audio Input pin (rendered)"
,
&
renderer_ops
)))
{
CoTaskMemFree
(
object
);
return
hr
;
}
strmbase_renderer_init
(
&
object
->
renderer
,
outer
,
&
CLSID_DSoundRender
,
L"Audio Input pin (rendered)"
,
&
renderer_ops
);
if
(
FAILED
(
hr
=
system_clock_create
(
&
object
->
renderer
.
filter
.
IUnknown_inner
,
&
object
->
system_clock
)))
{
...
...
dlls/quartz/videorenderer.c
View file @
0777941e
...
...
@@ -716,12 +716,9 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out)
pVideoRenderer
->
IOverlay_iface
.
lpVtbl
=
&
overlay_vtbl
;
hr
=
strmbase_renderer_init
(
&
pVideoRenderer
->
renderer
,
outer
,
strmbase_renderer_init
(
&
pVideoRenderer
->
renderer
,
outer
,
&
CLSID_VideoRenderer
,
L"In"
,
&
renderer_ops
);
if
(
FAILED
(
hr
))
goto
fail
;
hr
=
video_window_init
(
&
pVideoRenderer
->
baseControlWindow
,
&
IVideoWindow_VTable
,
&
pVideoRenderer
->
renderer
.
filter
,
&
pVideoRenderer
->
renderer
.
sink
.
pin
,
&
renderer_BaseWindowFuncTable
);
...
...
dlls/quartz/vmr9.c
View file @
0777941e
...
...
@@ -2326,9 +2326,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid)
pVMR
->
IVMRWindowlessControl9_iface
.
lpVtbl
=
&
VMR9_WindowlessControl_Vtbl
;
pVMR
->
IOverlay_iface
.
lpVtbl
=
&
overlay_vtbl
;
hr
=
strmbase_renderer_init
(
&
pVMR
->
renderer
,
outer
,
clsid
,
L"VMR Input0"
,
&
renderer_ops
);
if
(
FAILED
(
hr
))
goto
fail
;
strmbase_renderer_init
(
&
pVMR
->
renderer
,
outer
,
clsid
,
L"VMR Input0"
,
&
renderer_ops
);
hr
=
video_window_init
(
&
pVMR
->
baseControlWindow
,
&
IVideoWindow_VTable
,
&
pVMR
->
renderer
.
filter
,
&
pVMR
->
renderer
.
sink
.
pin
,
&
renderer_BaseWindowFuncTable
);
...
...
dlls/strmbase/renderer.c
View file @
0777941e
...
...
@@ -388,7 +388,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa
return
hr
;
}
HRESULT
WINAPI
strmbase_renderer_init
(
struct
strmbase_renderer
*
filter
,
IUnknown
*
outer
,
void
strmbase_renderer_init
(
struct
strmbase_renderer
*
filter
,
IUnknown
*
outer
,
const
CLSID
*
clsid
,
const
WCHAR
*
sink_name
,
const
struct
strmbase_renderer_ops
*
ops
)
{
memset
(
filter
,
0
,
sizeof
(
*
filter
));
...
...
@@ -408,6 +408,4 @@ HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown
QualityControlImpl_Create
(
&
filter
->
sink
.
pin
,
&
filter
->
qcimpl
);
filter
->
qcimpl
->
IQualityControl_iface
.
lpVtbl
=
&
Renderer_QualityControl_Vtbl
;
return
S_OK
;
}
include/wine/strmbase.h
View file @
0777941e
...
...
@@ -327,6 +327,6 @@ struct strmbase_renderer_ops
HRESULT
WINAPI
BaseRendererImpl_Receive
(
struct
strmbase_renderer
*
filter
,
IMediaSample
*
sample
);
HRESULT
WINAPI
strmbase_renderer_init
(
struct
strmbase_renderer
*
filter
,
IUnknown
*
outer
,
void
strmbase_renderer_init
(
struct
strmbase_renderer
*
filter
,
IUnknown
*
outer
,
const
CLSID
*
clsid
,
const
WCHAR
*
sink_name
,
const
struct
strmbase_renderer_ops
*
ops
);
void
strmbase_renderer_cleanup
(
struct
strmbase_renderer
*
filter
);
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