Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c678bdd7
Commit
c678bdd7
authored
Jun 08, 2010
by
Jörg Höhle
Committed by
Alexandre Julliard
Jul 28, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvidc: ICDecompressQuery returns ICERR_BADFORMAT on error.
parent
aab254a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
msvfw.c
dlls/msvfw32/tests/msvfw.c
+1
-1
msvideo1.c
dlls/msvidc32/msvideo1.c
+6
-6
No files found.
dlls/msvfw32/tests/msvfw.c
View file @
c678bdd7
...
@@ -183,7 +183,7 @@ static void test_Locate(void)
...
@@ -183,7 +183,7 @@ static void test_Locate(void)
bi
.
biCompression
=
mmioFOURCC
(
'm'
,
's'
,
'v'
,
'c'
);
bi
.
biCompression
=
mmioFOURCC
(
'm'
,
's'
,
'v'
,
'c'
);
err
=
ICDecompressQuery
(
h
,
&
bi
,
&
bo
);
err
=
ICDecompressQuery
(
h
,
&
bi
,
&
bo
);
todo_wine
ok
(
err
==
ICERR_BADFORMAT
,
"Query msvc->RGB16: %d
\n
"
,
err
);
ok
(
err
==
ICERR_BADFORMAT
,
"Query msvc->RGB16: %d
\n
"
,
err
);
ok
(
ICClose
(
h
)
==
ICERR_OK
,
"ICClose failed
\n
"
);
ok
(
ICClose
(
h
)
==
ICERR_OK
,
"ICClose failed
\n
"
);
}
}
...
...
dlls/msvidc32/msvideo1.c
View file @
c678bdd7
...
@@ -308,26 +308,26 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
...
@@ -308,26 +308,26 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
if
(
(
in
->
bmiHeader
.
biCompression
!=
CRAM_MAGIC
)
&&
if
(
(
in
->
bmiHeader
.
biCompression
!=
CRAM_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
MSVC_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
MSVC_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
WHAM_MAGIC
)
)
(
in
->
bmiHeader
.
biCompression
!=
WHAM_MAGIC
)
)
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
if
(
(
in
->
bmiHeader
.
biBitCount
!=
16
)
&&
if
(
(
in
->
bmiHeader
.
biBitCount
!=
16
)
&&
(
in
->
bmiHeader
.
biBitCount
!=
8
)
)
(
in
->
bmiHeader
.
biBitCount
!=
8
)
)
{
{
TRACE
(
"can't do %d bpp
\n
"
,
in
->
bmiHeader
.
biBitCount
);
TRACE
(
"can't do %d bpp
\n
"
,
in
->
bmiHeader
.
biBitCount
);
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
}
}
/* output must be same dimensions as input */
/* output must be same dimensions as input */
if
(
out
)
if
(
out
)
{
{
if
(
in
->
bmiHeader
.
biBitCount
!=
out
->
bmiHeader
.
biBitCount
)
if
(
in
->
bmiHeader
.
biBitCount
!=
out
->
bmiHeader
.
biBitCount
)
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
if
(
in
->
bmiHeader
.
biPlanes
!=
out
->
bmiHeader
.
biPlanes
)
if
(
in
->
bmiHeader
.
biPlanes
!=
out
->
bmiHeader
.
biPlanes
)
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
if
(
in
->
bmiHeader
.
biHeight
!=
out
->
bmiHeader
.
biHeight
)
if
(
in
->
bmiHeader
.
biHeight
!=
out
->
bmiHeader
.
biHeight
)
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
if
(
in
->
bmiHeader
.
biWidth
!=
out
->
bmiHeader
.
biWidth
)
if
(
in
->
bmiHeader
.
biWidth
!=
out
->
bmiHeader
.
biWidth
)
return
ICERR_
UNSUPPORTED
;
return
ICERR_
BADFORMAT
;
}
}
TRACE
(
"OK!
\n
"
);
TRACE
(
"OK!
\n
"
);
...
...
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