[akhaldi] 71574: [MSVFW32] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Tue Jun  7 10:26:22 2016
New Revision: 71574

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

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

Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_m...
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] Tue Jun  7 10:26:22 2016
@@ -88,6 +88,11 @@
     }
 #undef XX
     return str;
+}
+
+static inline int get_stride(int width, int depth)
+{
+    return ((depth * width + 31) >> 3) & ~3;
 }

static WINE_HIC*        MSVIDEO_FirstHic /* = NULL */;
@@ -442,7 +447,7 @@
             local = ICOpen(fccType, info.fccHandler, wMode);
             if (local != 0)
             {
-                TRACE("Returning %s as defult handler for %s\n",
+                TRACE("Returning %s as default handler for %s\n",
                       wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType));
                 return local;
             }
@@ -711,23 +716,84 @@
    HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
    INT depth,INT dx,INT dy)
 {
-	HIC	tmphic = hic;
-
-	TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy);
-
-	if (!tmphic) {
-		tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS);
-		if (!tmphic)
-			return tmphic;
-	}
-	if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth))
-		dy = dx = 0; /* no resize needed */
+    static const struct
+    {
+        int depth;
+        int compression;
+    }
+    try_depths[] =
+    {
+        { 8, BI_RGB},
+        {16, BI_RGB},
+        {16, BI_BITFIELDS},
+        {24, BI_RGB},
+        {32, BI_RGB},
+    };
+
+    int screen_depth, i;
+    BOOL found = FALSE;
+    HIC tmphic;
+    HDC hdc;
+
+    TRACE("(%p,%p,%p,%d,%d,%d)!\n", hic, lpbiIn, lpbiOut, depth, dx, dy);
+
+    tmphic = hic ? hic : ICLocate(ICTYPE_VIDEO, 0, lpbiIn, NULL, ICMODE_DECOMPRESS);
+    if (!tmphic) return tmphic;
+
+    hdc = GetDC(0);
+    screen_depth = GetDeviceCaps(hdc, BITSPIXEL) * GetDeviceCaps(hdc, PLANES);
+    ReleaseDC(0, hdc);
+
+    if (dx <= 0) dx = lpbiIn->biWidth;
+    if (dy <= 0) dy = lpbiIn->biHeight;
+    if (!depth) depth = screen_depth;

/* Can we decompress it ? */
-	if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0)
+	if (ICDecompressQuery(tmphic, lpbiIn, NULL) != ICERR_OK)
    	goto errout; /* no, sorry */

ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut);
+
+    lpbiOut->biSize = sizeof(BITMAPINFOHEADER);
+    lpbiOut->biWidth = dx;
+    lpbiOut->biHeight = dy;
+    lpbiOut->biPlanes = 1;
+
+    for (i = 0; i < sizeof(try_depths) / sizeof(try_depths[0]); i++)
+    {
+        if (!found && try_depths[i].depth != depth)
+            continue;
+
+        found = TRUE;
+        lpbiOut->biBitCount = try_depths[i].depth;
+        lpbiOut->biCompression = try_depths[i].compression;
+        lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount);
+
+        if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK)
+        {
+            if (try_depths[i].depth == 8)
+                ICDecompressGetPalette(tmphic, lpbiIn, lpbiOut);
+            goto success;
+        }
+    }
+
+    if (!found)
+    {
+        lpbiOut->biBitCount = depth;
+        lpbiOut->biCompression = BI_RGB;
+        lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount);
+        if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK)
+            goto success;
+
+        lpbiOut->biBitCount = screen_depth;
+        lpbiOut->biCompression = BI_RGB;
+        lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount);
+        if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK)
+            goto success;
+    }
+
+    if (ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut))
+        goto errout;

if (lpbiOut->biCompression != 0) {
            FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n",
@@ -738,20 +804,11 @@
    		 lpbiOut->biSize);
       lpbiOut->biSize = sizeof(*lpbiOut);
    }
-	if (!depth) {
-		HDC	hdc;
-
-		hdc = GetDC(0);
-		depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES);
-		ReleaseDC(0,hdc);
-		if (depth==15)	depth = 16;
-		if (depth<8)	depth =  8;
-	}
-	if (lpbiIn->biBitCount == 8)
-		depth = 8;
-
+
+success:
    TRACE("=> %p\n", tmphic);
    return tmphic;
+
 errout:
    if (hic!=tmphic)
    	ICClose(tmphic);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jun  7 10:26:22 2016
@@ -127,7 +127,7 @@
 reactos/dll/win32/mstask              # Synced to WineStaging-1.9.4
 reactos/dll/win32/msvcrt20            # Out of sync
 reactos/dll/win32/msvcrt40            # Out of sync
-reactos/dll/win32/msvfw32             # Synced to WineStaging-1.9.4
+reactos/dll/win32/msvfw32             # Synced to WineStaging-1.9.11
 reactos/dll/win32/msvidc32            # Synced to WineStaging-1.9.4
 reactos/dll/win32/msxml               # Synced to WineStaging-1.9.4
 reactos/dll/win32/msxml2              # Synced to WineStaging-1.9.4