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
a54597fd
Commit
a54597fd
authored
May 01, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
May 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/vmr9: Forbid setting the video clipping window while connected.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f1de733a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
vmr9.c
dlls/quartz/tests/vmr9.c
+1
-1
vmr9.c
dlls/quartz/vmr9.c
+17
-10
No files found.
dlls/quartz/tests/vmr9.c
View file @
a54597fd
...
...
@@ -3234,7 +3234,7 @@ static void test_clipping_window(void)
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRWindowlessControl9_SetVideoClippingWindow
(
windowless_control
,
window
);
todo_wine
ok
(
hr
==
VFW_E_WRONG_STATE
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
VFW_E_WRONG_STATE
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IFilterGraph2_Disconnect
(
graph
,
&
source
.
source
.
pin
.
IPin_iface
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
...
dlls/quartz/vmr9.c
View file @
a54597fd
...
...
@@ -1846,23 +1846,30 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
VMR9WindowlessControl_SetVideoClippingWindow
(
IVMRWindowlessControl9
*
iface
,
HWND
hwnd
)
static
HRESULT
WINAPI
VMR9WindowlessControl_SetVideoClippingWindow
(
IVMRWindowlessControl9
*
iface
,
HWND
window
)
{
struct
quartz_vmr
*
This
=
impl_from_IVMRWindowlessControl9
(
iface
);
struct
quartz_vmr
*
filter
=
impl_from_IVMRWindowlessControl9
(
iface
);
TRACE
(
"
(%p/%p)->(%p)
\n
"
,
iface
,
This
,
hwnd
);
TRACE
(
"
filter %p, window %p.
\n
"
,
filter
,
window
);
if
(
!
IsWindow
(
hwnd
))
if
(
!
IsWindow
(
window
))
{
WARN
(
"Invalid window %p, returning E_INVALIDARG.
\n
"
,
hwnd
);
WARN
(
"Invalid window %p, returning E_INVALIDARG.
\n
"
,
window
);
return
E_INVALIDARG
;
}
EnterCriticalSection
(
&
This
->
renderer
.
filter
.
csFilter
);
This
->
hWndClippingWindow
=
hwnd
;
if
(
This
->
renderer
.
sink
.
pin
.
peer
)
VMR9_maybe_init
(
This
,
FALSE
,
&
This
->
renderer
.
sink
.
pin
.
mt
);
LeaveCriticalSection
(
&
This
->
renderer
.
filter
.
csFilter
);
EnterCriticalSection
(
&
filter
->
renderer
.
filter
.
csFilter
);
if
(
filter
->
renderer
.
sink
.
pin
.
peer
)
{
LeaveCriticalSection
(
&
filter
->
renderer
.
filter
.
csFilter
);
WARN
(
"Attempt to set the clipping window while connected; returning VFW_E_WRONG_STATE.
\n
"
);
return
VFW_E_WRONG_STATE
;
}
filter
->
hWndClippingWindow
=
window
;
LeaveCriticalSection
(
&
filter
->
renderer
.
filter
.
csFilter
);
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