Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ICCVID] Sync with Wine 3.0. CORE-14225

Browse source
This commit is contained in:
Amine Khaldi 2018-01-19 00:32:44 +01:00
parent 7998a3f086
commit d848f99bf9
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/iccvid/iccvid.c
View file

@ -95,10 +95,6 @@ static inline BOOL heap_free(void *mem)
return HeapFree(GetProcessHeap(), 0, mem); return HeapFree(GetProcessHeap(), 0, mem);
} }
static inline int get_stride(int width, int depth)
{
return ((depth * width + 31) >> 3) & ~3;
}
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL; static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL;
@ -467,7 +463,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
break; break;
} }
frm_stride = get_stride(out_width, bpp * 8); frm_stride = out_width * bpp;
frm_ptr = output; frm_ptr = output;
if(frame.length != size) if(frame.length != size)
@ -852,9 +848,9 @@ static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, L
if( out ) if( out )
{ {
memcpy( out, in, size ); memcpy( out, in, size );
out->bmiHeader.biBitCount = 24;
out->bmiHeader.biCompression = BI_RGB; out->bmiHeader.biCompression = BI_RGB;
out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) * in->bmiHeader.biHeight; out->bmiHeader.biSizeImage = in->bmiHeader.biHeight
* in->bmiHeader.biWidth *4;
return ICERR_OK; return ICERR_OK;
} }
return size; return size;

2
media/doc/README.WINE
View file

@ -73,7 +73,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to Wine-3.0
reactos/dll/win32/hlink # Synced to Wine-3.0 reactos/dll/win32/hlink # Synced to Wine-3.0
reactos/dll/win32/hnetcfg # Synced to Wine-3.0 reactos/dll/win32/hnetcfg # Synced to Wine-3.0
reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/httpapi # Synced to WineStaging-2.9
reactos/dll/win32/iccvid # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to Wine-3.0
reactos/dll/win32/ieframe # Synced to WineStaging-2.9 reactos/dll/win32/ieframe # Synced to WineStaging-2.9
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16
reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9