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
9b47d3c5
Commit
9b47d3c5
authored
May 03, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
May 08, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Check whether the pin is connected in IVideoWindow::put_WindowStyle().
Ferro CCTV calls this.
parent
bf461e64
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
0 deletions
+11
-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
+2
-0
No files found.
dlls/quartz/tests/videorenderer.c
View file @
9b47d3c5
...
@@ -2387,6 +2387,9 @@ static void test_video_window(void)
...
@@ -2387,6 +2387,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
WS_CHILD
|
WS_VISIBLE
|
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/tests/vmr7.c
View file @
9b47d3c5
...
@@ -2386,6 +2386,9 @@ static void test_video_window(void)
...
@@ -2386,6 +2386,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
WS_CHILD
|
WS_VISIBLE
|
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/tests/vmr9.c
View file @
9b47d3c5
...
@@ -2612,6 +2612,9 @@ static void test_video_window(void)
...
@@ -2612,6 +2612,9 @@ static void test_video_window(void)
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
WS_CHILD
|
WS_VISIBLE
|
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
hr
=
IVideoWindow_get_AutoShow
(
window
,
&
l
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/window.c
View file @
9b47d3c5
...
@@ -231,6 +231,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG s
...
@@ -231,6 +231,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG s
if
(
style
&
(
WS_DISABLED
|
WS_HSCROLL
|
WS_MAXIMIZE
|
WS_MINIMIZE
|
WS_VSCROLL
))
if
(
style
&
(
WS_DISABLED
|
WS_HSCROLL
|
WS_MAXIMIZE
|
WS_MINIMIZE
|
WS_VSCROLL
))
return
E_INVALIDARG
;
return
E_INVALIDARG
;
if
(
!
window
->
pPin
->
peer
)
return
VFW_E_NOT_CONNECTED
;
SetWindowLongW
(
window
->
hwnd
,
GWL_STYLE
,
style
);
SetWindowLongW
(
window
->
hwnd
,
GWL_STYLE
,
style
);
SetWindowPos
(
window
->
hwnd
,
0
,
0
,
0
,
0
,
0
,
SetWindowPos
(
window
->
hwnd
,
0
,
0
,
0
,
0
,
0
,
...
...
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