Author: akhaldi
Date: Wed Apr 8 17:11:42 2015
New Revision: 67087
URL:
http://svn.reactos.org/svn/reactos?rev=67087&view=rev
Log:
[MSCMS] Sync with Wine Staging 1.7.37. CORE-9246
Modified:
trunk/reactos/dll/win32/mscms/profile.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mscms/profile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?…
==============================================================================
--- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Wed Apr 8 17:11:42 2015
@@ -651,7 +651,7 @@
lstrcatW( rgbprofile, rgbprofilefile );
len = lstrlenW( rgbprofile ) * sizeof(WCHAR);
- if (*size < len || !profile)
+ if (*size < len)
{
*size = len;
SetLastError( ERROR_MORE_DATA );
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 8 17:11:42 2015
@@ -115,7 +115,7 @@
reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.27
reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.27
reactos/dll/win32/mscat32 # Synced to Wine-1.7.27
-reactos/dll/win32/mscms # Synced to Wine-1.7.27
+reactos/dll/win32/mscms # Synced to WineStaging-1.7.37
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to Wine-1.7.27
reactos/dll/win32/msftedit # Synced to Wine-1.7.27