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

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a4d45019bfd088afda843...

commit 0a4d45019bfd088afda84337743ee1e9d852871d
Author:     Amine Khaldi [e-mail]
AuthorDate: Fri Mar 9 12:51:19 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Fri Mar 9 12:51:19 2018 +0100

[COMCAT] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/comcat/comcat_main.c | 8 +++-----
 dll/win32/comcat/version.rc    | 2 +-
 media/doc/README.WINE          | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dll/win32/comcat/comcat_main.c b/dll/win32/comcat/comcat_main.c
index 9417b0be2d..345cf67e0b 100644
--- a/dll/win32/comcat/comcat_main.c
+++ b/dll/win32/comcat/comcat_main.c
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define WIN32_NO_STATUS
+#include <stdarg.h>

-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
+#include "windef.h"
+#include "winbase.h"

/***********************************************************************
  *		DllCanUnloadNow (COMCAT.@)
diff --git a/dll/win32/comcat/version.rc b/dll/win32/comcat/version.rc
index 1d5d15e0ce..017fa4571a 100644
--- a/dll/win32/comcat/version.rc
+++ b/dll/win32/comcat/version.rc
@@ -21,4 +21,4 @@
 #define WINE_FILENAME_STR "comcat.dll"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""

-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 4a0befc476..1386ed960a 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -53,7 +53,7 @@ reactos/dll/win32/bcrypt              # Synced to WineStaging-1.9.23
 reactos/dll/win32/browseui            # Out of sync
 reactos/dll/win32/cabinet             # Synced to WineStaging-3.3
 reactos/dll/win32/clusapi             # Synced to WineStaging-3.3
-reactos/dll/win32/comcat              # Synced to WineStaging-2.9
+reactos/dll/win32/comcat              # Synced to WineStaging-3.3
 reactos/dll/win32/comctl32            # Synced to Wine-3.0
 reactos/dll/win32/comdlg32            # Synced to Wine-3.0
 reactos/dll/win32/compstui            # Synced to WineStaging-2.9