Author: akhaldi
Date: Sat May 19 11:45:34 2012
New Revision: 56621
URL: http://svn.reactos.org/svn/reactos?rev=56621&view=rev
Log:
[MSCMS]
* Sync to Wine 1.5.4.
Modified:
trunk/reactos/dll/win32/mscms/CMakeLists.txt
trunk/reactos/dll/win32/mscms/profile.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/CMakeLists.txt?rev=56621&r1=56620&r2=56621&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Sat May 19
11:45:34 2012
@@ -1,8 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-set_rc_compiler()
spec2def(mscms.dll mscms.spec)
Modified: trunk/reactos/dll/win32/mscms/profile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?rev=56621&r1=56620&r2=56621&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Sat May 19 11:45:34
2012
@@ -253,13 +253,12 @@
{
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 @@
{
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 @@
handle = CreateFileW( profile->pProfileData, flags, sharing, NULL,
creation, 0, NULL );
else
{
- DWORD size;
WCHAR *path;
if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() ==
ERROR_MORE_DATA)
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=56621&r1=56620&r2=56621&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 11:45:34 2012
@@ -94,7 +94,7 @@
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
