combase: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-05-28 07:39:37 +02:00
parent ff5d625943
commit 6e2241a331
2 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,8 @@
MODULE = combase.dll MODULE = combase.dll
IMPORTS = advapi32 ole32 uuid IMPORTS = advapi32 ole32 uuid
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
roapi.c \ roapi.c \
string.c string.c

View File

@ -17,11 +17,11 @@
*/ */
#include <string.h> #include <string.h>
#include <wchar.h>
#include "windows.h" #include "windows.h"
#include "winerror.h" #include "winerror.h"
#include "hstring.h" #include "hstring.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(winstring); 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++) 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; break;
} }
return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : 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--) 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; break;
} }
return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) :