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

Author: akhaldi
Date: Sun Jun  5 19:11:42 2016
New Revision: 71549

URL: http://svn.reactos.org/svn/reactos?rev=71549&view=rev
Log:
[ICCVID] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/iccvid/iccvid.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/iccvid/iccvid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] Sun Jun  5 19:11:42 2016
@@ -95,6 +95,10 @@
     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;
@@ -463,7 +467,7 @@
             break;
         }
 
-    frm_stride = out_width * bpp;
+    frm_stride = get_stride(out_width, bpp * 8);
     frm_ptr = output;
 
     if(frame.length != size)
@@ -848,9 +852,9 @@
     if( out )
     {
         memcpy( out, in, size );
+        out->bmiHeader.biBitCount = 24;
         out->bmiHeader.biCompression = BI_RGB;
-        out->bmiHeader.biSizeImage = in->bmiHeader.biHeight
-                                   * in->bmiHeader.biWidth *4;
+        out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) *
in->bmiHeader.biHeight;
         return ICERR_OK;
     }
     return size;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jun  5 19:11:42 2016
@@ -73,7 +73,7 @@
 reactos/dll/win32/hlink               # Synced to WineStaging-1.9.4
 reactos/dll/win32/hnetcfg             # Synced to WineStaging-1.9.11
 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/imaadp32.acm        # Synced to WineStaging-1.9.4
 reactos/dll/win32/imagehlp            # Synced to WineStaging-1.9.4