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
5fc94f0a
Commit
5fc94f0a
authored
Apr 10, 2014
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Apr 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix loading of an empty picture from a non-statable stream.
parent
f20045c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
olepicture.c
dlls/oleaut32/olepicture.c
+6
-1
olepicture.c
dlls/oleaut32/tests/olepicture.c
+0
-2
No files found.
dlls/oleaut32/olepicture.c
View file @
5fc94f0a
...
...
@@ -1390,12 +1390,17 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
}
headerread
+=
xread
;
xread
=
0
;
if
(
!
memcmp
(
&
(
header
[
0
]),
"lt
\0\0
"
,
4
)
&&
(
statfailed
||
(
header
[
1
]
+
headerread
<=
statstg
.
cbSize
.
QuadPart
)))
{
if
(
toread
!=
0
&&
toread
!=
header
[
1
])
FIXME
(
"varying lengths of image data (prev=%u curr=%u), only last one will be used
\n
"
,
toread
,
header
[
1
]);
toread
=
header
[
1
];
if
(
statfailed
)
{
statstg
.
cbSize
.
QuadPart
=
header
[
1
]
+
8
;
statfailed
=
FALSE
;
}
if
(
toread
==
0
)
break
;
}
else
{
if
(
!
memcmp
(
&
(
header
[
0
]),
"GIF8"
,
4
)
||
/* GIF header */
...
...
dlls/oleaut32/tests/olepicture.c
View file @
5fc94f0a
...
...
@@ -1226,9 +1226,7 @@ static void test_load_save_empty_picture(void)
pic
=
NULL
;
hr
=
pOleLoadPicture
(
stream
,
0
,
FALSE
,
&
IID_IPicture
,
(
void
**
)
&
pic
);
todo_wine
ok
(
hr
==
S_OK
,
"OleLoadPicture error %#x
\n
"
,
hr
);
todo_wine
ok
(
pic
!=
NULL
,
"picture should not be not NULL
\n
"
);
if
(
pic
!=
NULL
)
{
...
...
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