From 3d393a43bbcb29ae8a921ef5a8996793123225fd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 19 May 2012 11:45:34 +0000 Subject: [PATCH] [MSCMS] * Sync to Wine 1.5.4. svn path=/trunk/; revision=56621 --- reactos/dll/win32/mscms/CMakeLists.txt | 2 -- reactos/dll/win32/mscms/profile.c | 7 ++----- reactos/media/doc/README.WINE | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/mscms/CMakeLists.txt b/reactos/dll/win32/mscms/CMakeLists.txt index 38577be9a08..64a168c6c65 100644 --- a/reactos/dll/win32/mscms/CMakeLists.txt +++ b/reactos/dll/win32/mscms/CMakeLists.txt @@ -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 diff --git a/reactos/dll/win32/mscms/profile.c b/reactos/dll/win32/mscms/profile.c index c4eae9de756..b0ffce45777 100644 --- a/reactos/dll/win32/mscms/profile.c +++ b/reactos/dll/win32/mscms/profile.c @@ -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) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index d3f3a37acb5..100b6aa4e23 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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