system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

msvidc32: Improve trace messages from CRAM_DecompressQuery.

Browse source
This commit is contained in:
Bruno Jesus 2015-08-23 20:48:54 +08:00 committed by Alexandre Julliard
parent 8bf4f9068c
commit 59222af9c5
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dlls/msvidc32/msvideo1.c
View file

@ -299,16 +299,19 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
return ICERR_BADPARAM;
TRACE("planes = %d\n", in->bmiHeader.biPlanes );
TRACE("bpp = %d\n", in->bmiHeader.biBitCount );
TRACE("height = %d\n", in->bmiHeader.biHeight );
TRACE("width = %d\n", in->bmiHeader.biWidth );
TRACE("compr = %x\n", in->bmiHeader.biCompression );
TRACE("in->planes = %d\n", in->bmiHeader.biPlanes );
TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount );
TRACE("in->height = %d\n", in->bmiHeader.biHeight );
TRACE("in->width = %d\n", in->bmiHeader.biWidth );
TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression );
if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) &&
( in->bmiHeader.biCompression != MSVC_MAGIC ) &&
( in->bmiHeader.biCompression != WHAM_MAGIC ) )
{
TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression);
return ICERR_BADFORMAT;
}
if( ( in->bmiHeader.biBitCount != 16 ) &&
( in->bmiHeader.biBitCount != 8 ) )
@ -320,18 +323,21 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
/* output must be same dimensions as input */
if( out )
{
if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount )
return ICERR_BADFORMAT;
if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes )
return ICERR_BADFORMAT;
if( in->bmiHeader.biHeight != out->bmiHeader.biHeight )
return ICERR_BADFORMAT;
if( in->bmiHeader.biWidth != out->bmiHeader.biWidth )
TRACE("out->planes = %d\n", out->bmiHeader.biPlanes );
TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount );
TRACE("out->height = %d\n", out->bmiHeader.biHeight );
TRACE("out->width = %d\n", out->bmiHeader.biWidth );
if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) ||
( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) ||
( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) ||
( in->bmiHeader.biWidth != out->bmiHeader.biWidth ))
{
TRACE("incompatible output requested\n");
return ICERR_BADFORMAT;
}
}
TRACE("OK!\n");
return ICERR_OK;
}