Author: akhaldi
Date: Sat Jun 3 22:29:30 2017
New Revision: 74816
URL:
http://svn.reactos.org/svn/reactos?rev=74816&view=rev
Log:
[MSCMS] Sync with Wine Staging 2.9. CORE-13362
cd55d5d mscms: Fix some spec file entries.
Modified:
trunk/reactos/dll/win32/mscms/mscms.spec
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mscms/mscms.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.spec…
==============================================================================
--- trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] Sat Jun 3 22:29:30 2017
@@ -1,5 +1,5 @@
-@ stdcall AssociateColorProfileWithDeviceA(ptr ptr ptr)
-@ stdcall AssociateColorProfileWithDeviceW(ptr ptr ptr)
+@ stdcall AssociateColorProfileWithDeviceA(str str str)
+@ stdcall AssociateColorProfileWithDeviceW(wstr wstr wstr)
@ stdcall CheckBitmapBits(ptr ptr ptr long long long ptr ptr long)
@ stdcall CheckColors(ptr ptr long long ptr)
@ stdcall CloseColorProfile(ptr)
@@ -12,14 +12,14 @@
@ stdcall CreateProfileFromLogColorSpaceA(ptr ptr)
@ stdcall CreateProfileFromLogColorSpaceW(ptr ptr)
@ stdcall DeleteColorTransform(ptr)
-@ stdcall DisassociateColorProfileFromDeviceA(ptr ptr ptr)
-@ stdcall DisassociateColorProfileFromDeviceW(ptr ptr ptr)
-@ stdcall EnumColorProfilesA(ptr ptr ptr ptr ptr)
-@ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr)
+@ stdcall DisassociateColorProfileFromDeviceA(str str str)
+@ stdcall DisassociateColorProfileFromDeviceW(wstr wstr wstr)
+@ stdcall EnumColorProfilesA(str ptr ptr ptr ptr)
+@ stdcall EnumColorProfilesW(wstr ptr ptr ptr ptr)
@ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long)
@ stdcall GetCMMInfo(ptr long)
-@ stdcall GetColorDirectoryA(ptr ptr ptr)
-@ stdcall GetColorDirectoryW(ptr ptr ptr)
+@ stdcall GetColorDirectoryA(str ptr ptr)
+@ stdcall GetColorDirectoryW(wstr ptr ptr)
@ stdcall GetColorProfileElement(ptr long long ptr ptr ptr)
@ stdcall GetColorProfileElementTag(ptr long ptr)
@ stdcall GetColorProfileFromHandle(ptr ptr ptr)
@@ -29,10 +29,10 @@
@ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr)
@ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr)
@ stdcall GetPS2ColorSpaceArray(ptr long long ptr ptr ptr)
-@ stdcall GetStandardColorSpaceProfileA(ptr long ptr ptr)
-@ stdcall GetStandardColorSpaceProfileW(ptr long ptr ptr)
-@ stdcall InstallColorProfileA(ptr ptr)
-@ stdcall InstallColorProfileW(ptr ptr)
+@ stdcall GetStandardColorSpaceProfileA(str long ptr ptr)
+@ stdcall GetStandardColorSpaceProfileW(wstr long ptr ptr)
+@ stdcall InstallColorProfileA(str str)
+@ stdcall InstallColorProfileW(wstr wstr)
@ stub InternalGetDeviceConfig
@ stub InternalGetPS2CSAFromLCS
@ stub InternalGetPS2ColorRenderingDictionary
@@ -43,19 +43,19 @@
@ stdcall IsColorProfileValid(ptr ptr)
@ stdcall OpenColorProfileA(ptr long long long)
@ stdcall OpenColorProfileW(ptr long long long)
-@ stdcall RegisterCMMA(ptr long ptr)
-@ stdcall RegisterCMMW(ptr long ptr)
+@ stdcall RegisterCMMA(str long str)
+@ stdcall RegisterCMMW(wstr long wstr)
@ stdcall SelectCMM(long)
@ stdcall SetColorProfileElement(ptr long long ptr ptr)
@ stdcall SetColorProfileElementReference(ptr long long)
@ stdcall SetColorProfileElementSize(ptr long long)
@ stdcall SetColorProfileHeader(ptr ptr)
-@ stdcall SetStandardColorSpaceProfileA(ptr long ptr)
-@ stdcall SetStandardColorSpaceProfileW(ptr long ptr)
+@ stdcall SetStandardColorSpaceProfileA(str long str)
+@ stdcall SetStandardColorSpaceProfileW(wstr long wstr)
@ stdcall SpoolerCopyFileEvent(wstr wstr long)
@ stdcall TranslateBitmapBits(ptr ptr long long long long ptr long long ptr long)
@ stdcall TranslateColors(ptr ptr long long ptr long)
-@ stdcall UninstallColorProfileA(ptr ptr long)
-@ stdcall UninstallColorProfileW(ptr ptr long)
-@ stdcall UnregisterCMMA(ptr long)
-@ stdcall UnregisterCMMW(ptr long)
+@ stdcall UninstallColorProfileA(str str long)
+@ stdcall UninstallColorProfileW(wstr wstr long)
+@ stdcall UnregisterCMMA(str long)
+@ stdcall UnregisterCMMW(wstr long)
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] Sat Jun 3 22:29:30 2017
@@ -104,7 +104,7 @@
reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11
reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11
-reactos/dll/win32/mscms # Synced to WineStaging-2.2
+reactos/dll/win32/mscms # Synced to WineStaging-2.9
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to WineStaging-2.2
reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11