[MSCMS]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 19 May 2012 11:45:34 +0000 (11:45 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 19 May 2012 11:45:34 +0000 (11:45 +0000)
* Sync to Wine 1.5.4.

svn path=/trunk/; revision=56621

reactos/dll/win32/mscms/CMakeLists.txt
reactos/dll/win32/mscms/profile.c
reactos/media/doc/README.WINE

index 38577be..64a168c 100644 (file)
@@ -2,8 +2,6 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-set_rc_compiler()
-
 spec2def(mscms.dll mscms.spec)
 
 list(APPEND SOURCE
index c4eae9d..b0ffce4 100644 (file)
@@ -253,13 +253,12 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size )
     {
         ret = GetColorDirectoryW( NULL, NULL, &sizeW );
         *size = sizeW / sizeof(WCHAR);
-        return FALSE;
+        return ret;
     }
 
     sizeW = *size * sizeof(WCHAR);
 
     bufferW = HeapAlloc( GetProcessHeap(), 0, sizeW );
-
     if (bufferW)
     {
         if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW )))
@@ -594,11 +593,10 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile
     {
         ret = GetStandardColorSpaceProfileW( NULL, id, NULL, &sizeW );
         *size = sizeW / sizeof(WCHAR);
-        return FALSE;
+        return ret;
     }
 
     profileW = HeapAlloc( GetProcessHeap(), 0, sizeW );
-
     if (profileW)
     {
         if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW )))
@@ -1475,7 +1473,6 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing
             handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL );
         else
         {
-            DWORD size;
             WCHAR *path;
 
             if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA)
index d3f3a37..100b6aa 100644 (file)
@@ -94,7 +94,7 @@ reactos/dll/win32/mprapi          # Synced to Wine-1.3.37
 reactos/dll/win32/msacm32         # Autosync
 reactos/dll/win32/msadp32.acm     # Synced to Wine-1.3.37
 reactos/dll/win32/mscat32         # Synced to Wine-1.3.37
-reactos/dll/win32/mscms           # Synced to Wine-1.3.37
+reactos/dll/win32/mscms           # Synced to Wine-1.5.4
 reactos/dll/win32/mscoree         # Synced to Wine-1.3.37
 reactos/dll/win32/msctf           # Synced to Wine-1.3.37
 reactos/dll/win32/msftedit        # Synced to Wine-1.3.37