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
77e04e22
Commit
77e04e22
authored
Oct 02, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/presenter: Keep video window handle.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
69e777c8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
presenter.c
dlls/evr/presenter.c
+15
-4
evr.c
dlls/evr/tests/evr.c
+2
-5
No files found.
dlls/evr/presenter.c
View file @
77e04e22
...
...
@@ -58,6 +58,7 @@ struct video_presenter
IDirect3DDeviceManager9
*
device_manager
;
UINT
reset_token
;
HWND
video_window
;
unsigned
int
state
;
CRITICAL_SECTION
cs
;
};
...
...
@@ -497,16 +498,26 @@ static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplay
static
HRESULT
WINAPI
video_presenter_control_SetVideoWindow
(
IMFVideoDisplayControl
*
iface
,
HWND
window
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
window
);
struct
video_presenter
*
presenter
=
impl_from_IMFVideoDisplayControl
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
window
);
EnterCriticalSection
(
&
presenter
->
cs
);
presenter
->
video_window
=
window
;
LeaveCriticalSection
(
&
presenter
->
cs
);
return
S_OK
;
}
static
HRESULT
WINAPI
video_presenter_control_GetVideoWindow
(
IMFVideoDisplayControl
*
iface
,
HWND
*
window
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
window
);
struct
video_presenter
*
presenter
=
impl_from_IMFVideoDisplayControl
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
window
);
*
window
=
presenter
->
video_window
;
return
S_OK
;
}
static
HRESULT
WINAPI
video_presenter_control_RepaintVideo
(
IMFVideoDisplayControl
*
iface
)
...
...
dlls/evr/tests/evr.c
View file @
77e04e22
...
...
@@ -1056,20 +1056,17 @@ static void test_default_presenter(void)
hwnd2
=
hwnd
;
hr
=
IMFVideoDisplayControl_GetVideoWindow
(
display_control
,
&
hwnd2
);
todo_wine
{
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hwnd2
==
NULL
,
"Unexpected window %p.
\n
"
,
hwnd2
);
}
hr
=
IMFVideoDisplayControl_SetVideoWindow
(
display_control
,
hwnd
);
todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hwnd2
=
NULL
;
hr
=
IMFVideoDisplayControl_GetVideoWindow
(
display_control
,
&
hwnd2
);
todo_wine
{
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hwnd2
==
hwnd
,
"Unexpected window %p.
\n
"
,
hwnd2
);
}
hr
=
IDirect3DDeviceManager9_CloseDeviceHandle
(
dm
,
handle
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
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