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
80064d78
Commit
80064d78
authored
Feb 16, 2004
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Feb 16, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Take palette into account while responding on
ICM_DECOMPRESS_GETFORMAT.
parent
8e7f81c4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
16 deletions
+25
-16
iccvid.c
dlls/iccvid/iccvid.c
+9
-3
msvideo1.c
dlls/msvidc32/msvideo1.c
+9
-3
msrle32.c
dlls/msvideo/msrle32/msrle32.c
+5
-9
msvideo_main.c
dlls/msvideo/msvideo_main.c
+2
-1
No files found.
dlls/iccvid/iccvid.c
View file @
80064d78
...
...
@@ -783,20 +783,26 @@ LRESULT ICCVID_DecompressQuery( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO
LRESULT
ICCVID_DecompressGetFormat
(
ICCVID_Info
*
info
,
LPBITMAPINFO
in
,
LPBITMAPINFO
out
)
{
DWORD
size
;
TRACE
(
"ICM_DECOMPRESS_GETFORMAT %p %p %p
\n
"
,
info
,
in
,
out
);
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
ICCVID_MAGIC
)
)
return
ICERR_BADPARAM
;
size
=
in
->
bmiHeader
.
biSize
;
if
(
in
->
bmiHeader
.
biBitCount
<=
8
)
size
+=
in
->
bmiHeader
.
biClrUsed
*
sizeof
(
RGBQUAD
);
if
(
out
)
{
memcpy
(
out
,
in
,
size
of
(
BITMAPINFO
)
);
memcpy
(
out
,
in
,
size
);
out
->
bmiHeader
.
biCompression
=
BI_RGB
;
out
->
bmiHeader
.
biSizeImage
=
in
->
bmiHeader
.
biHeight
*
in
->
bmiHeader
.
biWidth
*
4
;
return
ICERR_OK
;
}
return
sizeof
(
BITMAPINFO
);
return
size
;
}
LRESULT
ICCVID_DecompressBegin
(
ICCVID_Info
*
info
,
LPBITMAPINFO
in
,
LPBITMAPINFO
out
)
...
...
dlls/msvidc32/msvideo1.c
View file @
80064d78
...
...
@@ -346,21 +346,27 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
static
LRESULT
CRAM_DecompressGetFormat
(
Msvideo1Context
*
info
,
LPBITMAPINFO
in
,
LPBITMAPINFO
out
)
{
DWORD
size
;
TRACE
(
"ICM_DECOMPRESS_GETFORMAT %p %p %p
\n
"
,
info
,
in
,
out
);
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
CRAM_MAGIC
)
)
return
ICERR_BADPARAM
;
size
=
in
->
bmiHeader
.
biSize
;
if
(
in
->
bmiHeader
.
biBitCount
<=
8
)
size
+=
in
->
bmiHeader
.
biClrUsed
*
sizeof
(
RGBQUAD
);
if
(
out
)
{
memcpy
(
out
,
in
,
size
of
(
BITMAPINFO
)
);
memcpy
(
out
,
in
,
size
);
out
->
bmiHeader
.
biCompression
=
BI_RGB
;
out
->
bmiHeader
.
biSizeImage
=
in
->
bmiHeader
.
biHeight
*
in
->
bmiHeader
.
biWidth
*
4
;
out
->
bmiHeader
.
biBitCount
=
in
->
bmiHeader
.
biBitCount
;
return
ICERR_OK
;
}
return
size
of
(
BITMAPINFO
)
;
return
size
;
}
LRESULT
CRAM_DecompressBegin
(
Msvideo1Context
*
info
,
LPBITMAPINFO
in
,
LPBITMAPINFO
out
)
...
...
dlls/msvideo/msrle32/msrle32.c
View file @
80064d78
...
...
@@ -1551,7 +1551,7 @@ static LRESULT CompressEnd(CodecInfo *pi)
static
LRESULT
DecompressGetFormat
(
CodecInfo
*
pi
,
LPCBITMAPINFOHEADER
lpbiIn
,
LPBITMAPINFOHEADER
lpbiOut
)
{
int
size
;
DWORD
size
;
TRACE
(
"(%p,%p,%p)
\n
"
,
pi
,
lpbiIn
,
lpbiOut
);
...
...
@@ -1566,19 +1566,15 @@ static LRESULT DecompressGetFormat(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
size
=
lpbiIn
->
biSize
;
if
(
lpbiIn
->
biBitCount
<=
8
)
size
+=
lpbiIn
->
biClrUsed
*
sizeof
(
RGBQUAD
);
if
(
lpbiOut
!=
NULL
)
{
memcpy
(
lpbiOut
,
lpbiIn
,
size
);
lpbiOut
->
biBitCount
=
32
;
lpbiOut
->
biCompression
=
BI_RGB
;
lpbiOut
->
biSizeImage
=
DIBWIDTHBYTES
(
*
lpbiOut
)
*
lpbiOut
->
biHeight
;
lpbiOut
->
biClrImportant
=
0
;
if
(
lpbiOut
->
biBitCount
<=
8
&&
lpbiOut
->
biClrUsed
==
0
)
lpbiOut
->
biClrUsed
=
1
<<
lpbiOut
->
biBitCount
;
else
lpbiOut
->
biClrUsed
=
0
;
return
size
;
return
ICERR_OK
;
}
else
return
size
;
}
...
...
dlls/msvideo/msvideo_main.c
View file @
80064d78
...
...
@@ -575,7 +575,8 @@ HIC VFWAPI ICGetDisplayFormat(
{
HIC
tmphic
=
hic
;
FIXME
(
"(%p,%p,%p,%d,%d,%d),stub!
\n
"
,
hic
,
lpbiIn
,
lpbiOut
,
depth
,
dx
,
dy
);
TRACE
(
"(%p,%p,%p,%d,%d,%d)!
\n
"
,
hic
,
lpbiIn
,
lpbiOut
,
depth
,
dx
,
dy
);
if
(
!
tmphic
)
{
tmphic
=
ICLocate
(
ICTYPE_VIDEO
,
0
,
lpbiIn
,
NULL
,
ICMODE_DECOMPRESS
);
if
(
!
tmphic
)
...
...
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