system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 07:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

combase: Build with msvcrt.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/combase/Makefile.in
View file

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

6
dlls/combase/string.c
View file

@ -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) :