Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
23bf63f9
Commit
23bf63f9
authored
Mar 31, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use wcscspn() instead of strcspnW().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e003b988
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
loadorder.c
dlls/ntdll/loadorder.c
+2
-2
ntdll_misc.h
dlls/ntdll/ntdll_misc.h
+1
-0
No files found.
dlls/ntdll/loadorder.c
View file @
23bf63f9
...
@@ -144,7 +144,7 @@ static enum loadorder parse_load_order( const WCHAR *order )
...
@@ -144,7 +144,7 @@ static enum loadorder parse_load_order( const WCHAR *order )
else
if
(
ret
==
LO_NATIVE
)
return
LO_NATIVE_BUILTIN
;
else
if
(
ret
==
LO_NATIVE
)
return
LO_NATIVE_BUILTIN
;
break
;
break
;
}
}
order
+=
strcspnW
(
order
,
separatorsW
);
order
+=
wcscspn
(
order
,
separatorsW
);
}
}
return
ret
;
return
ret
;
}
}
...
@@ -208,7 +208,7 @@ static void add_load_order_set( WCHAR *entry )
...
@@ -208,7 +208,7 @@ static void add_load_order_set( WCHAR *entry )
while
(
*
entry
)
while
(
*
entry
)
{
{
entry
+=
strspnW
(
entry
,
separatorsW
);
entry
+=
strspnW
(
entry
,
separatorsW
);
end
=
entry
+
strcspnW
(
entry
,
separatorsW
);
end
=
entry
+
wcscspn
(
entry
,
separatorsW
);
if
(
*
end
)
*
end
++
=
0
;
if
(
*
end
)
*
end
++
=
0
;
if
(
*
entry
)
if
(
*
entry
)
{
{
...
...
dlls/ntdll/ntdll_misc.h
View file @
23bf63f9
...
@@ -309,6 +309,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... );
...
@@ -309,6 +309,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... );
#define wcsrchr(s,c) NTDLL_wcsrchr(s,c)
#define wcsrchr(s,c) NTDLL_wcsrchr(s,c)
#define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b)
#define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b)
#define wcslen(s) NTDLL_wcslen(s)
#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 */
/* 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
)
static
inline
void
ascii_to_unicode
(
WCHAR
*
dst
,
const
char
*
src
,
size_t
len
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment