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
9b1bd731
Commit
9b1bd731
authored
Oct 06, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/presenter: Return default flags for GetRenderingPrefs().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f79ca651
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
presenter.c
dlls/evr/presenter.c
+12
-2
evr.c
dlls/evr/tests/evr.c
+10
-0
No files found.
dlls/evr/presenter.c
View file @
9b1bd731
...
@@ -61,6 +61,7 @@ struct video_presenter
...
@@ -61,6 +61,7 @@ struct video_presenter
HWND
video_window
;
HWND
video_window
;
MFVideoNormalizedRect
src_rect
;
MFVideoNormalizedRect
src_rect
;
RECT
dst_rect
;
RECT
dst_rect
;
DWORD
rendering_prefs
;
unsigned
int
state
;
unsigned
int
state
;
CRITICAL_SECTION
cs
;
CRITICAL_SECTION
cs
;
};
};
...
@@ -658,9 +659,18 @@ static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayC
...
@@ -658,9 +659,18 @@ static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayC
static
HRESULT
WINAPI
video_presenter_control_GetRenderingPrefs
(
IMFVideoDisplayControl
*
iface
,
DWORD
*
flags
)
static
HRESULT
WINAPI
video_presenter_control_GetRenderingPrefs
(
IMFVideoDisplayControl
*
iface
,
DWORD
*
flags
)
{
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
flags
);
struct
video_presenter
*
presenter
=
impl_from_IMFVideoDisplayControl
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
flags
);
if
(
!
flags
)
return
E_POINTER
;
EnterCriticalSection
(
&
presenter
->
cs
);
*
flags
=
presenter
->
rendering_prefs
;
LeaveCriticalSection
(
&
presenter
->
cs
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
video_presenter_control_SetFullscreen
(
IMFVideoDisplayControl
*
iface
,
BOOL
fullscreen
)
static
HRESULT
WINAPI
video_presenter_control_SetFullscreen
(
IMFVideoDisplayControl
*
iface
,
BOOL
fullscreen
)
...
...
dlls/evr/tests/evr.c
View file @
9b1bd731
...
@@ -979,6 +979,7 @@ static void test_default_presenter(void)
...
@@ -979,6 +979,7 @@ static void test_default_presenter(void)
HWND
hwnd
,
hwnd2
;
HWND
hwnd
,
hwnd2
;
HANDLE
handle
;
HANDLE
handle
;
IUnknown
*
unk
;
IUnknown
*
unk
;
DWORD
flags
;
float
rate
;
float
rate
;
HRESULT
hr
;
HRESULT
hr
;
GUID
iid
;
GUID
iid
;
...
@@ -1016,6 +1017,15 @@ static void test_default_presenter(void)
...
@@ -1016,6 +1017,15 @@ static void test_default_presenter(void)
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFVideoDisplayControl
,
(
void
**
)
&
display_control
);
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFVideoDisplayControl
,
(
void
**
)
&
display_control
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFVideoDisplayControl_GetRenderingPrefs
(
display_control
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
flags
=
123
;
hr
=
IMFVideoDisplayControl_GetRenderingPrefs
(
display_control
,
&
flags
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
flags
,
"Unexpected rendering flags %#x.
\n
"
,
flags
);
IMFVideoDisplayControl_Release
(
display_control
);
IMFVideoDisplayControl_Release
(
display_control
);
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_ACCELERATION_SERVICE
,
&
IID_IDirect3DDeviceManager9
,
(
void
**
)
&
dm
);
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_ACCELERATION_SERVICE
,
&
IID_IDirect3DDeviceManager9
,
(
void
**
)
&
dm
);
...
...
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