[akhaldi] 69990: [MSVIDC32] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Sat Nov 21 10:05:28 2015
New Revision: 69990

URL: http://svn.reactos.org/svn/reactos?rev=69990&view=rev
Log:
[MSVIDC32] Sync with Wine Staging 1.7.55. CORE-10536

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

Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo…
==============================================================================
--- trunk/reactos/dll/win32/msvidc32/msvideo1.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvidc32/msvideo1.c	[iso-8859-1] Sat Nov 21 10:05:28 2015
@@ -303,16 +303,19 @@
     if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
         return ICERR_BADPARAM;
 
-    TRACE("planes = %d\n", in->bmiHeader.biPlanes );
-    TRACE("bpp    = %d\n", in->bmiHeader.biBitCount );
-    TRACE("height = %d\n", in->bmiHeader.biHeight );
-    TRACE("width  = %d\n", in->bmiHeader.biWidth );
-    TRACE("compr  = %x\n", in->bmiHeader.biCompression );
+    TRACE("in->planes  = %d\n", in->bmiHeader.biPlanes );
+    TRACE("in->bpp     = %d\n", in->bmiHeader.biBitCount );
+    TRACE("in->height  = %d\n", in->bmiHeader.biHeight );
+    TRACE("in->width   = %d\n", in->bmiHeader.biWidth );
+    TRACE("in->compr   = 0x%x\n", in->bmiHeader.biCompression );
 
     if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) &&
         ( in->bmiHeader.biCompression != MSVC_MAGIC ) &&
         ( in->bmiHeader.biCompression != WHAM_MAGIC ) )
+    {
+        TRACE("can't do 0x%x compression\n",
in->bmiHeader.biCompression);
         return ICERR_BADFORMAT;
+    }
 
     if( ( in->bmiHeader.biBitCount != 16 ) &&
         ( in->bmiHeader.biBitCount != 8 ) )
@@ -324,18 +327,21 @@
     /* output must be same dimensions as input */
     if( out )
     {
-        if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount )
+        TRACE("out->planes = %d\n", out->bmiHeader.biPlanes );
+        TRACE("out->bpp    = %d\n", out->bmiHeader.biBitCount );
+        TRACE("out->height = %d\n", out->bmiHeader.biHeight );
+        TRACE("out->width  = %d\n", out->bmiHeader.biWidth );
+        if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) ||
+          ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) ||
+          ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) ||
+          ( in->bmiHeader.biWidth != out->bmiHeader.biWidth ))
+        {
+            TRACE("incompatible output requested\n");
             return ICERR_BADFORMAT;
-        if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes )
-            return ICERR_BADFORMAT;
-        if( in->bmiHeader.biHeight != out->bmiHeader.biHeight )
-            return ICERR_BADFORMAT;
-        if( in->bmiHeader.biWidth != out->bmiHeader.biWidth )
-            return ICERR_BADFORMAT;
+        }
     }
 
     TRACE("OK!\n");
-
     return ICERR_OK;
 }
 
@@ -556,12 +562,15 @@
         break;
 
     case ICM_COMPRESS_QUERY:
+        r = ICERR_BADFORMAT;
+        /* fall through */
+    case ICM_COMPRESS_GET_FORMAT:
+    case ICM_COMPRESS_END:
+    case ICM_COMPRESS:
         FIXME("compression not implemented\n");
-        r = ICERR_BADFORMAT;
         break;
 
     case ICM_CONFIGURE:
-        r = ICERR_UNSUPPORTED;
         break;
 
     default:

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] Sat Nov 21 10:05:28 2015
@@ -129,7 +129,7 @@
 reactos/dll/win32/msvcrt20            # Out of sync
 reactos/dll/win32/msvcrt40            # Out of sync
 reactos/dll/win32/msvfw32             # Synced to WineStaging-1.7.55
-reactos/dll/win32/msvidc32            # Synced to WineStaging-1.7.47
+reactos/dll/win32/msvidc32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/msxml               # Synced to WineStaging-1.7.47
 reactos/dll/win32/msxml2              # Synced to WineStaging-1.7.47
 reactos/dll/win32/msxml3              # Synced to WineStaging-1.7.47