niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

msvidc32: Enable compilation with long types.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-15 07:30:47 +01:00 • committed by Alexandre Julliard
parent 4d9519f5e2
commit 16873ae059
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/msvidc32/Makefile.in
View file

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msvidc32.dll MODULE = msvidc32.dll
IMPORTS = user32 IMPORTS = user32

22
dlls/msvidc32/msvideo1.c
View file

@ -306,15 +306,15 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
TRACE("in->planes = %d\n", in->bmiHeader.biPlanes ); TRACE("in->planes = %d\n", in->bmiHeader.biPlanes );
TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount ); TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount );
TRACE("in->height = %d\n", in->bmiHeader.biHeight ); TRACE("in->height = %ld\n", in->bmiHeader.biHeight );
TRACE("in->width = %d\n", in->bmiHeader.biWidth ); TRACE("in->width = %ld\n", in->bmiHeader.biWidth );
TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression ); TRACE("in->compr = 0x%lx\n", in->bmiHeader.biCompression );
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 ) )
{ {
TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression); TRACE("can't do 0x%lx compression\n", in->bmiHeader.biCompression);
return ICERR_BADFORMAT; return ICERR_BADFORMAT;
} }
@ -330,8 +330,8 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
{ {
TRACE("out->planes = %d\n", out->bmiHeader.biPlanes ); TRACE("out->planes = %d\n", out->bmiHeader.biPlanes );
TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount );
TRACE("out->height = %d\n", out->bmiHeader.biHeight ); TRACE("out->height = %ld\n", out->bmiHeader.biHeight );
TRACE("out->width = %d\n", out->bmiHeader.biWidth ); TRACE("out->width = %ld\n", out->bmiHeader.biWidth );
if ((in->bmiHeader.biBitCount != out->bmiHeader.biBitCount) && if ((in->bmiHeader.biBitCount != out->bmiHeader.biBitCount) &&
(in->bmiHeader.biBitCount != 16 || out->bmiHeader.biBitCount != 24)) (in->bmiHeader.biBitCount != 16 || out->bmiHeader.biBitCount != 24))
@ -444,7 +444,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD
LONG width, height, stride, sz; LONG width, height, stride, sz;
void *output; void *output;
TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size);
if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
return ICERR_BADPARAM; return ICERR_BADPARAM;
@ -490,7 +490,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW
LONG width, height, stride, sz; LONG width, height, stride, sz;
void *output; void *output;
TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size);
if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
return ICERR_BADPARAM; return ICERR_BADPARAM;
@ -559,7 +559,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
Msvideo1Context *info = (Msvideo1Context *) dwDriverId; Msvideo1Context *info = (Msvideo1Context *) dwDriverId;
LRESULT r = ICERR_UNSUPPORTED; LRESULT r = ICERR_UNSUPPORTED;
TRACE("%ld %p %04x %08lx %08lx\n", dwDriverId, hdrvr, msg, lParam1, lParam2); TRACE("%Id %p %04x %08Ix %08Ix\n", dwDriverId, hdrvr, msg, lParam1, lParam2);
switch( msg ) switch( msg )
{ {
@ -653,7 +653,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
break; break;
default: default:
FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); FIXME("Unknown message: %04x %Id %Id\n", msg, lParam1, lParam2);
} }
return r; return r;
@ -664,7 +664,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
*/ */
BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
{ {
TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);
switch (dwReason) switch (dwReason)
{ {