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
e4ec04bf
Commit
e4ec04bf
authored
May 03, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
May 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Check whether the pin is connected in IVideoWindow::put_MessageDrain().
Ferro CCTV calls this.
parent
9d6f8a6a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
3 deletions
+15
-3
videorenderer.c
dlls/quartz/tests/videorenderer.c
+3
-0
vmr7.c
dlls/quartz/tests/vmr7.c
+3
-0
vmr9.c
dlls/quartz/tests/vmr9.c
+3
-0
window.c
dlls/quartz/window.c
+6
-3
No files found.
dlls/quartz/tests/videorenderer.c
View file @
e4ec04bf
...
...
@@ -2399,6 +2399,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Owner
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_MessageDrain
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/tests/vmr7.c
View file @
e4ec04bf
...
...
@@ -2398,6 +2398,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Owner
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_MessageDrain
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/tests/vmr9.c
View file @
e4ec04bf
...
...
@@ -2624,6 +2624,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Owner
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_MessageDrain
(
window
,
(
OAHWND
)
our_hwnd
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/window.c
View file @
e4ec04bf
...
...
@@ -511,11 +511,14 @@ HRESULT WINAPI BaseControlWindowImpl_get_Owner(IVideoWindow *iface, OAHWND *Owne
HRESULT
WINAPI
BaseControlWindowImpl_put_MessageDrain
(
IVideoWindow
*
iface
,
OAHWND
Drain
)
{
struct
video_window
*
This
=
impl_from_IVideoWindow
(
iface
);
struct
video_window
*
window
=
impl_from_IVideoWindow
(
iface
);
TRACE
(
"window %p, drain %#Ix.
\n
"
,
window
,
Drain
);
TRACE
(
"window %p, drain %#Ix.
\n
"
,
This
,
Drain
);
if
(
!
window
->
pPin
->
peer
)
return
VFW_E_NOT_CONNECTED
;
This
->
hwndDrain
=
(
HWND
)
Drain
;
window
->
hwndDrain
=
(
HWND
)
Drain
;
return
S_OK
;
}
...
...
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