[MSVIDC32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:51:47 +0000 (14:51 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:51:47 +0000 (14:51 +0000)
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62920

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

index 981c6f4..bfa413c 100644 (file)
@@ -71,7 +71,7 @@ typedef BYTE uint8_t;
 
 typedef struct Msvideo1Context {
     DWORD dwMagic;
 
 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 
 } Msvideo1Context;
 
 static void 
@@ -374,12 +374,12 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB
 
     TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount);
     if( in->bmiHeader.biBitCount == 8 )
 
     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 )
     else if( in->bmiHeader.biBitCount == 16 )
-        info->mode_8bit = 0;
+        info->mode_8bit = FALSE;
     else
     {
     else
     {
-        info->mode_8bit = 0;
+        info->mode_8bit = FALSE;
         FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount);
     }
 
         FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount);
     }
 
index 38b56f1..2472e2d 100644 (file)
@@ -132,7 +132,7 @@ reactos/dll/win32/mstask              # Synced to Wine-1.7.1
 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/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
 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