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
298ffd8f
Commit
298ffd8f
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::SetWindowPosition().
Ferro CCTV calls this.
parent
8be62e8e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
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
+3
-0
No files found.
dlls/quartz/tests/videorenderer.c
View file @
298ffd8f
...
@@ -2405,6 +2405,9 @@ static void test_video_window(void)
...
@@ -2405,6 +2405,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_SetWindowPosition
(
window
,
100
,
200
,
300
,
400
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/tests/vmr7.c
View file @
298ffd8f
...
@@ -2404,6 +2404,9 @@ static void test_video_window(void)
...
@@ -2404,6 +2404,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_SetWindowPosition
(
window
,
100
,
200
,
300
,
400
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/tests/vmr9.c
View file @
298ffd8f
...
@@ -2630,6 +2630,9 @@ static void test_video_window(void)
...
@@ -2630,6 +2630,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
hr
=
IVideoWindow_put_Visible
(
window
,
OATRUE
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_SetWindowPosition
(
window
,
100
,
200
,
300
,
400
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
testfilter_init
(
&
source
);
testfilter_init
(
&
source
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
&
source
.
filter
.
IBaseFilter_iface
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
IFilterGraph2_AddFilter
(
graph
,
filter
,
NULL
);
...
...
dlls/quartz/window.c
View file @
298ffd8f
...
@@ -598,6 +598,9 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface,
...
@@ -598,6 +598,9 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface,
TRACE
(
"window %p, left %ld, top %ld, width %ld, height %ld.
\n
"
,
window
,
left
,
top
,
width
,
height
);
TRACE
(
"window %p, left %ld, top %ld, width %ld, height %ld.
\n
"
,
window
,
left
,
top
,
width
,
height
);
if
(
!
window
->
pPin
->
peer
)
return
VFW_E_NOT_CONNECTED
;
if
(
!
SetWindowPos
(
window
->
hwnd
,
NULL
,
left
,
top
,
width
,
height
,
SWP_NOACTIVATE
|
SWP_NOZORDER
))
if
(
!
SetWindowPos
(
window
->
hwnd
,
NULL
,
left
,
top
,
width
,
height
,
SWP_NOACTIVATE
|
SWP_NOZORDER
))
return
E_FAIL
;
return
E_FAIL
;
return
S_OK
;
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