Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVIDC32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60338
This commit is contained in:
Amine Khaldi 2013-09-23 11:37:25 +00:00
parent 03236f55bb
commit 82d7133b7d
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/msvidc32/CMakeLists.txt
View file

@ -1,19 +1,16 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_WINE) -D_WINE)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msvidc32.dll msvidc32.spec) spec2def(msvidc32.dll msvidc32.spec)
list(APPEND SOURCE list(APPEND SOURCE
msvideo1.c msvideo1.c
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def) ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
add_library(msvidc32 SHARED ${SOURCE}) add_library(msvidc32 SHARED ${SOURCE} rsrc.rc)
set_module_type(msvidc32 win32dll) set_module_type(msvidc32 win32dll)
target_link_libraries(msvidc32 wine) target_link_libraries(msvidc32 wine)
add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll) add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll)

15
reactos/dll/win32/msvidc32/msvideo1.c
View file

@ -312,26 +312,26 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) &&
( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) &&
( in->bmiHeader.biCompression != WHAM_MAGIC ) ) ( in->bmiHeader.biCompression != WHAM_MAGIC ) )
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
if( ( in->bmiHeader.biBitCount != 16 ) && if( ( in->bmiHeader.biBitCount != 16 ) &&
( in->bmiHeader.biBitCount != 8 ) ) ( in->bmiHeader.biBitCount != 8 ) )
{ {
TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount ); TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount );
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
} }
/* output must be same dimensions as input */ /* output must be same dimensions as input */
if( out ) if( out )
{ {
if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount )
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes )
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) if( in->bmiHeader.biHeight != out->bmiHeader.biHeight )
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) if( in->bmiHeader.biWidth != out->bmiHeader.biWidth )
return ICERR_UNSUPPORTED; return ICERR_BADFORMAT;
} }
TRACE("OK!\n"); TRACE("OK!\n");
@ -584,9 +584,6 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
DisableThreadLibraryCalls(hModule); DisableThreadLibraryCalls(hModule);
MSVIDC32_hModule = hModule; MSVIDC32_hModule = hModule;
break; break;
case DLL_PROCESS_DETACH:
break;
} }
return TRUE; return TRUE;
} }

2
reactos/media/doc/README.WINE
View file

@ -129,7 +129,7 @@ reactos/dll/win32/mstask # Synced to Wine-1.7.1
reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt20 # Out of sync
reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync
reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 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/msxml # Synced to Wine-1.5.19
reactos/dll/win32/msxml2 # 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 reactos/dll/win32/msxml3 # Synced to Wine-1.5.26