01/01: [MSCMS] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8123ffac58d68ee3b5e67…

commit 8123ffac58d68ee3b5e67f32c054808da9519c6f
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 18 12:27:29 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 18 12:27:29 2018 +0100

    [MSCMS] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/mscms/handle.c     | 18 +++++++++---------
 dll/win32/mscms/icc.c        | 18 +++++++++---------
 dll/win32/mscms/mscms_main.c | 22 +++++++++++-----------
 dll/win32/mscms/profile.c    | 34 ++++++++++++++++------------------
 dll/win32/mscms/stub.c       | 18 ++++++++----------
 dll/win32/mscms/transform.c  | 22 ++++++++++------------
 media/doc/README.WINE        |  2 +-
 7 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/dll/win32/mscms/handle.c b/dll/win32/mscms/handle.c
index abef97313e..10334c65b2 100644
--- a/dll/win32/mscms/handle.c
+++ b/dll/win32/mscms/handle.c
@@ -18,18 +18,18 @@
  * 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
 
diff --git a/dll/win32/mscms/icc.c b/dll/win32/mscms/icc.c
index 09c9411089..8cd99c5bca 100644
--- a/dll/win32/mscms/icc.c
+++ b/dll/win32/mscms/icc.c
@@ -18,18 +18,18 @@
  * 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
 
diff --git a/dll/win32/mscms/mscms_main.c b/dll/win32/mscms/mscms_main.c
index 3cffd7ad05..40808c5706 100644
--- a/dll/win32/mscms/mscms_main.c
+++ b/dll/win32/mscms/mscms_main.c
@@ -18,21 +18,21 @@
  * 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);
 
diff --git a/dll/win32/mscms/profile.c b/dll/win32/mscms/profile.c
index eba642d789..f0c40877a1 100644
--- a/dll/win32/mscms/profile.c
+++ b/dll/win32/mscms/profile.c
@@ -18,24 +18,22 @@
  * 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 )
 {
diff --git a/dll/win32/mscms/stub.c b/dll/win32/mscms/stub.c
index 8eb539ed0a..4cd6863f21 100644
--- a/dll/win32/mscms/stub.c
+++ b/dll/win32/mscms/stub.c
@@ -18,18 +18,16 @@
  * 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"
 
diff --git a/dll/win32/mscms/transform.c b/dll/win32/mscms/transform.c
index 0339d7d211..cada3329ac 100644
--- a/dll/win32/mscms/transform.c
+++ b/dll/win32/mscms/transform.c
@@ -18,21 +18,19 @@
  * 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);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 462bd154d6..23caf121d5 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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