From cbf5f03dbbb7156dd2cafd73f74f9da9e651868e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 8 Apr 2015 17:11:42 +0000 Subject: [PATCH] [MSCMS] Sync with Wine Staging 1.7.37. CORE-9246 svn path=/trunk/; revision=67087 --- reactos/dll/win32/mscms/profile.c | 2 +- reactos/media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/mscms/profile.c b/reactos/dll/win32/mscms/profile.c index c142a492ad3..949426fdd5c 100644 --- a/reactos/dll/win32/mscms/profile.c +++ b/reactos/dll/win32/mscms/profile.c @@ -651,7 +651,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); - if (*size < len || !profile) + if (*size < len) { *size = len; SetLastError( ERROR_MORE_DATA ); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index fb1bfe10639..aea96a65fc6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -115,7 +115,7 @@ reactos/dll/win32/msacm32 # Synced to Wine-1.7.27 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