Author: akhaldi
Date: Wed Apr 23 14:51:47 2014
New Revision: 62920
URL:
http://svn.reactos.org/svn/reactos?rev=62920&view=rev
Log:
[MSVIDC32]
* Sync with Wine 1.7.17.
CORE-8080
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] Wed Apr 23 14:51:47 2014
@@ -71,7 +71,7 @@
typedef struct Msvideo1Context {
DWORD dwMagic;
- int mode_8bit; /* if it's not 8-bit, it's 16-bit */
+ BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */
} Msvideo1Context;
static void
@@ -374,12 +374,12 @@
TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount);
if( in->bmiHeader.biBitCount == 8 )
- info->mode_8bit = 1;
+ info->mode_8bit = TRUE;
else if( in->bmiHeader.biBitCount == 16 )
- info->mode_8bit = 0;
+ info->mode_8bit = FALSE;
else
{
- info->mode_8bit = 0;
+ info->mode_8bit = FALSE;
FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount);
}
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] Wed Apr 23 14:51:47 2014
@@ -132,7 +132,7 @@
reactos/dll/win32/msvcrt20 # Out of sync
reactos/dll/win32/msvcrt40 # Out of sync
reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1
-reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1
+reactos/dll/win32/msvidc32 # Synced to Wine-1.7.17
reactos/dll/win32/msxml # Synced to Wine-1.7.1
reactos/dll/win32/msxml2 # Synced to Wine-1.7.1
reactos/dll/win32/msxml3 # Synced to Wine-1.7.1