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

[Amine Khaldi]

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

commit da50a61f0f346a64ed6bbf4fde4b95152608ed92
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 18 12:39:13 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 18 12:39:13 2018 +0100

    [MSTASK] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/mstask/CMakeLists.txt   |  4 ++--
 dll/win32/mstask/factory.c        |  3 +++
 dll/win32/mstask/mstask_main.c    |  9 ++++++++-
 dll/win32/mstask/mstask_private.h | 16 +++++-----------
 dll/win32/mstask/precomp.h        | 13 +++++++++++++
 dll/win32/mstask/task.c           |  3 +++
 dll/win32/mstask/task_scheduler.c |  4 +++-
 dll/win32/mstask/task_trigger.c   |  5 ++++-
 media/doc/README.WINE             |  2 +-
 9 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt
index 1d616fb633..de210746d5 100644
--- a/dll/win32/mstask/CMakeLists.txt
+++ b/dll/win32/mstask/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     task.c
     task_scheduler.c
     task_trigger.c
-    mstask_private.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c)
 
@@ -22,5 +22,5 @@ add_library(mstask SHARED
 set_module_type(mstask win32dll)
 target_link_libraries(mstask uuid wine)
 add_importlibs(mstask ole32 msvcrt kernel32 ntdll)
-add_pch(mstask mstask_private.h SOURCE)
+add_pch(mstask precomp.h SOURCE)
 add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/mstask/factory.c b/dll/win32/mstask/factory.c
index 25ec76f391..f85a5f9c11 100644
--- a/dll/win32/mstask/factory.c
+++ b/dll/win32/mstask/factory.c
@@ -17,6 +17,9 @@
  */
 
 #include "mstask_private.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 struct ClassFactoryImpl
 {
diff --git a/dll/win32/mstask/mstask_main.c b/dll/win32/mstask/mstask_main.c
index 512e0b278e..aa6693d1e8 100644
--- a/dll/win32/mstask/mstask_main.c
+++ b/dll/win32/mstask/mstask_main.c
@@ -16,9 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdio.h>
+
 #include "mstask_private.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+
+#include "wine/debug.h"
+
 
-#include <rpcproxy.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 static HINSTANCE hInst;
 LONG dll_ref = 0;
diff --git a/dll/win32/mstask/mstask_private.h b/dll/win32/mstask/mstask_private.h
index b8f5042085..17c20fee43 100644
--- a/dll/win32/mstask/mstask_private.h
+++ b/dll/win32/mstask/mstask_private.h
@@ -21,19 +21,13 @@
 
 #include <stdarg.h>
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <mstask.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "mstask.h"
 
 extern LONG dll_ref DECLSPEC_HIDDEN;
 
diff --git a/dll/win32/mstask/precomp.h b/dll/win32/mstask/precomp.h
new file mode 100644
index 0000000000..06be6b9d7a
--- /dev/null
+++ b/dll/win32/mstask/precomp.h
@@ -0,0 +1,13 @@
+
+#ifndef __MSTASK_PRECOMP_H__
+#define __MSTASK_PRECOMP_H__
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include "mstask_private.h"
+
+#include <wine/debug.h>
+
+#endif /* !__MSTASK_PRECOMP_H__ */
diff --git a/dll/win32/mstask/task.c b/dll/win32/mstask/task.c
index fa4d098f69..97ae8b7b67 100644
--- a/dll/win32/mstask/task.c
+++ b/dll/win32/mstask/task.c
@@ -17,6 +17,9 @@
  */
 
 #include "mstask_private.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 typedef struct
 {
diff --git a/dll/win32/mstask/task_scheduler.c b/dll/win32/mstask/task_scheduler.c
index f2103b9d86..1f367edb3d 100644
--- a/dll/win32/mstask/task_scheduler.c
+++ b/dll/win32/mstask/task_scheduler.c
@@ -16,9 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "corerror.h"
 #include "mstask_private.h"
+#include "wine/debug.h"
 
-#include <corerror.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 typedef struct
 {
diff --git a/dll/win32/mstask/task_trigger.c b/dll/win32/mstask/task_trigger.c
index 9e98232bc8..448cf08708 100644
--- a/dll/win32/mstask/task_trigger.c
+++ b/dll/win32/mstask/task_trigger.c
@@ -16,9 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include "winternl.h"
 #include "mstask_private.h"
+#include "wine/debug.h"
 
-#include <winternl.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 typedef struct
 {
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 79c05ad60f..5a8dc0f250 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -122,7 +122,7 @@ reactos/dll/win32/mspatcha            # Synced to WineStaging-3.3
 reactos/dll/win32/msrle32             # Synced to WineStaging-3.3
 reactos/dll/win32/mssign32            # Synced to WineStaging-3.3
 reactos/dll/win32/mssip32             # Synced to WineStaging-3.3
-reactos/dll/win32/mstask              # Synced to WineStaging-2.9
+reactos/dll/win32/mstask              # Synced to WineStaging-3.3
 reactos/dll/win32/msvcrt20            # Out of sync
 reactos/dll/win32/msvcrt40            # Out of sync
 reactos/dll/win32/msvfw32             # Synced to Wine-3.0