[ros-diffs] [akhaldi] 60338: [MSVIDC32] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Sep 23 11:37:25 2013
New Revision: 60338

URL: http://svn.reactos.org/svn/reactos?rev=60338&view=rev
Log:
[MSVIDC32]
* Sync with Wine 1.7.1.
CORE-7469

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

Modified: trunk/reactos/dll/win32/msvidc32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/msvidc32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvidc32/CMakeLists.txt	[iso-8859-1] Mon Sep 23 11:37:25 2013
@@ -1,19 +1,16 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_definitions(
     -D__WINESRC__
     -D_WINE)
 
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(msvidc32.dll msvidc32.spec)
 
 list(APPEND SOURCE
     msvideo1.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
 
-add_library(msvidc32 SHARED ${SOURCE})
-
+add_library(msvidc32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(msvidc32 win32dll)
 target_link_libraries(msvidc32 wine)
 add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll)

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] Mon Sep 23 11:37:25 2013
@@ -312,26 +312,26 @@
     if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) &&
         ( in->bmiHeader.biCompression != MSVC_MAGIC ) &&
         ( in->bmiHeader.biCompression != WHAM_MAGIC ) )
-        return ICERR_UNSUPPORTED;
+        return ICERR_BADFORMAT;
 
     if( ( in->bmiHeader.biBitCount != 16 ) &&
         ( in->bmiHeader.biBitCount != 8 ) )
     {
         TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount );
-        return ICERR_UNSUPPORTED;
+        return ICERR_BADFORMAT;
     }
 
     /* output must be same dimensions as input */
     if( out )
     {
         if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount )
-            return ICERR_UNSUPPORTED;
+            return ICERR_BADFORMAT;
         if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes )
-            return ICERR_UNSUPPORTED;
+            return ICERR_BADFORMAT;
         if( in->bmiHeader.biHeight != out->bmiHeader.biHeight )
-            return ICERR_UNSUPPORTED;
+            return ICERR_BADFORMAT;
         if( in->bmiHeader.biWidth != out->bmiHeader.biWidth )
-            return ICERR_UNSUPPORTED;
+            return ICERR_BADFORMAT;
     }
 
     TRACE("OK!\n");
@@ -584,9 +584,6 @@
         DisableThreadLibraryCalls(hModule);
         MSVIDC32_hModule = hModule;
         break;
-
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }

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] Mon Sep 23 11:37:25 2013
@@ -129,7 +129,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        # Autosync
+reactos/dll/win32/msvidc32        # Synced to Wine-1.7.1
 reactos/dll/win32/msxml           # Synced to Wine-1.5.19
 reactos/dll/win32/msxml2          # Synced to Wine-1.5.19
 reactos/dll/win32/msxml3          # Synced to Wine-1.5.26