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
7eaac918
Commit
7eaac918
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 IBasicVideo::GetVideoSize().
parent
bf45b87a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletion
+10
-1
videorenderer.c
dlls/quartz/tests/videorenderer.c
+2
-0
vmr7.c
dlls/quartz/tests/vmr7.c
+2
-0
vmr9.c
dlls/quartz/tests/vmr9.c
+2
-0
window.c
dlls/quartz/window.c
+4
-1
No files found.
dlls/quartz/tests/videorenderer.c
View file @
7eaac918
...
...
@@ -2807,6 +2807,8 @@ static void test_basic_video(void)
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
NULL
,
&
height
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
&
width
,
&
height
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoPaletteEntries
(
video
,
0
,
1
,
NULL
,
&
l
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/tests/vmr7.c
View file @
7eaac918
...
...
@@ -2824,6 +2824,8 @@ static void test_basic_video(void)
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
NULL
,
&
height
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
&
width
,
&
height
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoPaletteEntries
(
video
,
0
,
1
,
NULL
,
&
l
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/tests/vmr9.c
View file @
7eaac918
...
...
@@ -3860,6 +3860,8 @@ static void test_basic_video(void)
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
NULL
,
&
height
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoSize
(
video
,
&
width
,
&
height
);
ok
(
hr
==
VFW_E_NOT_CONNECTED
,
"Got hr %#lx.
\n
"
,
hr
);
hr
=
IBasicVideo_GetVideoPaletteEntries
(
video
,
0
,
1
,
NULL
,
&
l
);
ok
(
hr
==
E_POINTER
,
"Got hr %#lx.
\n
"
,
hr
);
...
...
dlls/quartz/window.c
View file @
7eaac918
...
...
@@ -1138,13 +1138,16 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa
static
HRESULT
WINAPI
basic_video_GetVideoSize
(
IBasicVideo
*
iface
,
LONG
*
width
,
LONG
*
height
)
{
struct
video_window
*
window
=
impl_from_IBasicVideo
(
iface
);
const
BITMAPINFOHEADER
*
bitmap_header
=
get_bitmap_header
(
window
)
;
const
BITMAPINFOHEADER
*
bitmap_header
;
TRACE
(
"window %p, width %p, height %p.
\n
"
,
window
,
width
,
height
);
if
(
!
width
||
!
height
)
return
E_POINTER
;
if
(
!
window
->
pPin
->
peer
)
return
VFW_E_NOT_CONNECTED
;
bitmap_header
=
get_bitmap_header
(
window
);
*
width
=
bitmap_header
->
biWidth
;
*
height
=
bitmap_header
->
biHeight
;
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