Alexandre Julliard : combase: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue May 28 07:39:37 2019 +0200

combase: Build with msvcrt.

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

---

 dlls/combase/Makefile.in | 2 ++
 dlls/combase/string.c    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index df051ad..0f3c9f8 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = combase.dll
 IMPORTS   = advapi32 ole32 uuid
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	roapi.c \
 	string.c
diff --git a/dlls/combase/string.c b/dlls/combase/string.c
index dfbe368..2092e43 100644
--- a/dlls/combase/string.c
+++ b/dlls/combase/string.c
@@ -17,11 +17,11 @@
  */
 
 #include <string.h>
+#include <wchar.h>
 
 #include "windows.h"
 #include "winerror.h"
 #include "hstring.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(winstring);
@@ -427,7 +427,7 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out)
     }
     for (start = 0; start < priv1->length; start++)
     {
-        if (!memchrW(priv2->buffer, priv1->buffer[start], priv2->length))
+        if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length))
             break;
     }
     return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) :
@@ -454,7 +454,7 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out)
     }
     for (len = priv1->length; len > 0; len--)
     {
-        if (!memchrW(priv2->buffer, priv1->buffer[len - 1], priv2->length))
+        if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length))
             break;
     }
     return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) :