Module: wine Branch: master Commit: 23bf63f9eb7546b4bb4a4bad03c7c83e6bac96b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bf63f9eb7546b4bb4a4bad0...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Mar 31 11:52:07 2020 +0200
ntdll: Use wcscspn() instead of strcspnW().
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 090ca8d96e..f4a92fda49 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -144,7 +144,7 @@ static enum loadorder parse_load_order( const WCHAR *order ) else if (ret == LO_NATIVE) return LO_NATIVE_BUILTIN; break; } - order += strcspnW( order, separatorsW ); + order += wcscspn( order, separatorsW ); } return ret; } @@ -208,7 +208,7 @@ static void add_load_order_set( WCHAR *entry ) while (*entry) { entry += strspnW( entry, separatorsW ); - end = entry + strcspnW( entry, separatorsW ); + end = entry + wcscspn( entry, separatorsW ); if (*end) *end++ = 0; if (*entry) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 65e4088b03..845efbbdbd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -309,6 +309,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcsrchr(s,c) NTDLL_wcsrchr(s,c) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) #define wcslen(s) NTDLL_wcslen(s) +#define wcscspn(s,r) NTDLL_wcscspn(s,r)
/* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )