[MSCMS]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62913

diff --git a/reactos/dll/win32/mscms/mscms_main.c b/reactos/dll/win32/mscms/mscms_main.c
index 6a02175..3cffd7a 100644 (file)
--- a/reactos/dll/win32/mscms/mscms_main.c
+++ b/reactos/dll/win32/mscms/mscms_main.c
@@ -53,6 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
         DisableThreadLibraryCalls( hinst );
 #ifdef HAVE_LCMS2
         cmsSetLogErrorHandler( lcms_error_handler );
+#else
+        ERR( "No support for liblcms2, expect problems\n" );
 #endif
         break;
     case DLL_PROCESS_DETACH:

diff --git a/reactos/dll/win32/mscms/transform.c b/reactos/dll/win32/mscms/transform.c
index b4ad552..5f2e588 100644 (file)
--- a/reactos/dll/win32/mscms/transform.c
+++ b/reactos/dll/win32/mscms/transform.c
@@ -60,7 +60,7 @@ static DWORD from_profile( HPROFILE profile )
 
 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 @@ static DWORD from_bmformat( BMFORMAT format )
     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;
     }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 55a2cf8..9d32813 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -111,7 +111,7 @@ reactos/dll/win32/msacm32             # Synced to Wine-1.7.17
 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