Alexandre Julliard : mstask: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: da15e5cb37a4951baf44627750622f950a384532
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=da15e5cb37a4951baf44627750622f950a384532

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 13 08:47:12 2019 +0200

mstask: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mstask/Makefile.in      | 2 ++
 dlls/mstask/mstask_private.h | 3 +--
 dlls/mstask/task.c           | 6 +++---
 dlls/mstask/task_scheduler.c | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in
index 086d3c0..7febde2 100644
--- a/dlls/mstask/Makefile.in
+++ b/dlls/mstask/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = mstask.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	factory.c \
 	mstask_main.c \
diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h
index dbaf543..aed4c80 100644
--- a/dlls/mstask/mstask_private.h
+++ b/dlls/mstask/mstask_private.h
@@ -20,7 +20,6 @@
 #define __MSTASK_PRIVATE_H__
 
 #include "wine/heap.h"
-#include "wine/unicode.h"
 
 extern LONG dll_ref DECLSPEC_HIDDEN;
 
@@ -38,7 +37,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src)
     WCHAR *dst;
     unsigned len;
     if (!src) return NULL;
-    len = (strlenW(src) + 1) * sizeof(WCHAR);
+    len = (lstrlenW(src) + 1) * sizeof(WCHAR);
     if ((dst = heap_alloc(len))) memcpy(dst, src, len);
     return dst;
 }
diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c
index 6ab9263..a15e016 100644
--- a/dlls/mstask/task.c
+++ b/dlls/mstask/task.c
@@ -1813,10 +1813,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLES
 
     TRACE("(%p, %p)\n", iface, file_name);
 
-    *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR));
+    *file_name = CoTaskMemAlloc((lstrlenW(This->task_name) + 1) * sizeof(WCHAR));
     if (!*file_name) return E_OUTOFMEMORY;
 
-    strcpyW(*file_name, This->task_name);
+    lstrcpyW(*file_name, This->task_name);
     return S_OK;
 }
 
@@ -1893,7 +1893,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task)
 
     TRACE("(%s, %p)\n", debugstr_w(name), task);
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);
diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c
index ebf25d0..54ca360 100644
--- a/dlls/mstask/task_scheduler.c
+++ b/dlls/mstask/task_scheduler.c
@@ -423,7 +423,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWST
 
     TRACE("%p, %s\n", iface, debugstr_w(name));
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);
@@ -467,7 +467,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, L
 
     TRACE("%p, %s, %p\n", iface, debugstr_w(name), item);
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);