[MSCMS] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:27:29 +0000 (12:27 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:27:29 +0000 (12:27 +0100)
dll/win32/mscms/handle.c
dll/win32/mscms/icc.c
dll/win32/mscms/mscms_main.c
dll/win32/mscms/profile.c
dll/win32/mscms/stub.c
dll/win32/mscms/transform.c
media/doc/README.WINE

index abef973..10334c6 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/debug.h>
+#include "config.h"
+#include "wine/debug.h"
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "icm.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "icm.h"
 
-//#include "mscms_priv.h"
+#include "mscms_priv.h"
 
 #ifdef HAVE_LCMS2
 
index 09c9411..8cd99c5 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#include "config.h"
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winternl.h"
-//#include "icm.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/winternl.h"
+#include "icm.h"
 
-//#include "mscms_priv.h"
+#include "mscms_priv.h"
 
 #ifdef HAVE_LCMS2
 
index 3cffd7a..40808c5 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#include "config.h"
 
-//#include "wine/port.h"
-#include <wine/debug.h>
-#include <wine/library.h>
+#include "wine/port.h"
+#include "wine/debug.h"
+#include "wine/library.h"
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "icm.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "icm.h"
 
-//#include "mscms_priv.h"
+#include "mscms_priv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mscms);
 
index eba642d..f0c4087 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <config.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-//#include "shlwapi.h"
-#include <icm.h>
-
-//#include "mscms_priv.h"
+#include "config.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "icm.h"
+
+#include "mscms_priv.h"
 
 static void basename( LPCWSTR path, LPWSTR name )
 {
index 8eb539e..4cd6863 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "config.h"
+#include "wine/debug.h"
 
-#include <config.h>
-#include <wine/debug.h>
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <icm.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "icm.h"
 
 #include "mscms_priv.h"
 
index 0339d7d..cada332 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "config.h"
+#include "wine/debug.h"
 
-#include <config.h>
-#include <wine/debug.h>
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "icm.h"
 
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <icm.h>
-
-//#include "mscms_priv.h"
+#include "mscms_priv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mscms);
 
index 462bd15..23caf12 100644 (file)
@@ -104,7 +104,7 @@ reactos/dll/win32/msacm32             # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32.drv         # Synced to WineStaging-3.3
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-3.3
 reactos/dll/win32/mscat32             # Synced to WineStaging-3.3
-reactos/dll/win32/mscms               # Synced to WineStaging-2.9
+reactos/dll/win32/mscms               # Synced to WineStaging-3.3
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to WineStaging-2.9
 reactos/dll/win32/msftedit            # Synced to WineStaging-2.9