mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-08-29 04:13:32 +00:00
[MSCMS]
* Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62913
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user