Author: akhaldi Date: Wed Apr 23 14:27:40 2014 New Revision: 62913
URL: http://svn.reactos.org/svn/reactos?rev=62913&view=rev Log: [MSCMS] * Sync with Wine 1.7.17. CORE-8080
Modified: trunk/reactos/dll/win32/mscms/mscms_main.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mscms/mscms_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_main.... ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -53,6 +53,8 @@ DisableThreadLibraryCalls( hinst ); #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); +#else + ERR( "No support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:
Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.c... ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -60,7 +60,7 @@
static DWORD from_bmformat( BMFORMAT format ) { - static int quietfixme = 0; + static BOOL quietfixme = FALSE; TRACE( "bitmap format: 0x%08x\n", format );
switch (format) @@ -71,10 +71,10 @@ case BM_xRGBQUADS: return TYPE_ARGB_8; case BM_xBGRQUADS: return TYPE_ABGR_8; default: - if (quietfixme == 0) + if (!quietfixme) { FIXME("unhandled bitmap format 0x%x\n", format); - quietfixme = 1; + quietfixme = TRUE; } return TYPE_RGB_8; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -111,7 +111,7 @@ reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.17 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.7.1