Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ICCVID] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71549
This commit is contained in:
Amine Khaldi 2016-06-05 19:11:42 +00:00
parent 8f5987dd7f
commit 8436b905ae
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,6 +95,10 @@ static inline BOOL heap_free( LPVOID ptr )
return HeapFree( GetProcessHeap(), 0, ptr ); return HeapFree( GetProcessHeap(), 0, ptr );
} }
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;
@ -463,7 +467,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
break; break;
} }
frm_stride = out_width * bpp; frm_stride = get_stride(out_width, bpp * 8);
frm_ptr = output; frm_ptr = output;
if(frame.length != size) if(frame.length != size)
@ -848,9 +852,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 = in->bmiHeader.biHeight out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) * in->bmiHeader.biHeight;
* in->bmiHeader.biWidth *4;
return ICERR_OK; return ICERR_OK;
} }
return size; return size;

2
reactos/media/doc/README.WINE
View file

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