Alexandre Julliard : ntdll: Use wcsspn() instead of strspnW().

Alexandre Julliard julliard at winehq.org
Tue Mar 31 16:44:22 CDT 2020


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar 31 11:53:34 2020 +0200

ntdll: Use wcsspn() instead of strspnW().

Signed-off-by: Alexandre Julliard <julliard at 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 f4a92fda49..291cc76031 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -130,7 +130,7 @@ static enum loadorder parse_load_order( const WCHAR *order )
 
     while (*order)
     {
-        order += strspnW( order, separatorsW );
+        order += wcsspn( order, separatorsW );
         switch(*order)
         {
         case 'N':  /* native */
@@ -207,7 +207,7 @@ static void add_load_order_set( WCHAR *entry )
 
     while (*entry)
     {
-        entry += strspnW( entry, separatorsW );
+        entry += wcsspn( 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 845efbbdbd..1249acbcdd 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -310,6 +310,7 @@ int    WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... );
 #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b)
 #define wcslen(s) NTDLL_wcslen(s)
 #define wcscspn(s,r) NTDLL_wcscspn(s,r)
+#define wcsspn(s,a) NTDLL_wcsspn(s,a)
 
 /* 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 )




More information about the wine-cvs mailing list