[ros-diffs] 01/01: [ICCVID] Sync with Wine 3.0. CORE-14225

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d848f99bf9ec1887e0a2c…
commit d848f99bf9ec1887e0a2c713e258587f4bbb6a04
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Jan 19 00:32:44 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Jan 19 00:32:44 2018 +0100
    [ICCVID] Sync with Wine 3.0. CORE-14225
---
 dll/win32/iccvid/iccvid.c | 10 +++-------
 media/doc/README.WINE     |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dll/win32/iccvid/iccvid.c b/dll/win32/iccvid/iccvid.c
index 96cabe43e0..f588b47c55 100644
--- a/dll/win32/iccvid/iccvid.c
+++ b/dll/win32/iccvid/iccvid.c
@@ -95,10 +95,6 @@ static inline BOOL heap_free(void *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;
@@ -467,7 +463,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf,
int size,
             break;
         }
-    frm_stride = get_stride(out_width, bpp * 8);
+    frm_stride = out_width * bpp;
     frm_ptr = output;
     if(frame.length != size)
@@ -852,9 +848,9 @@ static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info,
LPBITMAPINFO in, L
     if( out )
     {
         memcpy( out, in, size );
-        out->bmiHeader.biBitCount = 24;
         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 size;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 7dfd056e88..6e7bc5cdb1 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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/hnetcfg             # Synced to Wine-3.0
 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/imaadp32.acm        # Synced to WineStaging-2.16
 reactos/dll/win32/imagehlp            # Synced to WineStaging-2.9