Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ec4a5f63
Commit
ec4a5f63
authored
Nov 07, 2023
by
Bartosz Kosiorek
Committed by
Alexandre Julliard
Nov 10, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Add _mbspbrk_l implementation.
parent
0b63da6a
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
14 deletions
+39
-14
msvcr100.spec
dlls/msvcr100/msvcr100.spec
+1
-1
msvcr110.spec
dlls/msvcr110/msvcr110.spec
+1
-1
msvcr120.spec
dlls/msvcr120/msvcr120.spec
+1
-1
msvcr80.spec
dlls/msvcr80/msvcr80.spec
+1
-1
msvcr90.spec
dlls/msvcr90/msvcr90.spec
+1
-1
mbcs.c
dlls/msvcrt/mbcs.c
+31
-6
msvcrt.spec
dlls/msvcrt/msvcrt.spec
+1
-1
ucrtbase.spec
dlls/ucrtbase/ucrtbase.spec
+2
-2
No files found.
dlls/msvcr100/msvcr100.spec
View file @
ec4a5f63
...
@@ -1174,7 +1174,7 @@
...
@@ -1174,7 +1174,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/msvcr110/msvcr110.spec
View file @
ec4a5f63
...
@@ -1531,7 +1531,7 @@
...
@@ -1531,7 +1531,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/msvcr120/msvcr120.spec
View file @
ec4a5f63
...
@@ -1542,7 +1542,7 @@
...
@@ -1542,7 +1542,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/msvcr80/msvcr80.spec
View file @
ec4a5f63
...
@@ -846,7 +846,7 @@
...
@@ -846,7 +846,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/msvcr90/msvcr90.spec
View file @
ec4a5f63
...
@@ -824,7 +824,7 @@
...
@@ -824,7 +824,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/msvcrt/mbcs.c
View file @
ec4a5f63
...
@@ -150,6 +150,11 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x )
...
@@ -150,6 +150,11 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x )
return
(
unsigned
char
*
)
strchr
(
(
const
char
*
)
s
,
x
);
return
(
unsigned
char
*
)
strchr
(
(
const
char
*
)
s
,
x
);
}
}
static
inline
unsigned
char
*
u_strpbrk
(
const
unsigned
char
*
str
,
const
unsigned
char
*
accept
)
{
return
(
unsigned
char
*
)
strpbrk
((
const
char
*
)
str
,
(
const
char
*
)
accept
);
}
static
inline
unsigned
char
*
u_strrchr
(
const
unsigned
char
*
s
,
unsigned
char
x
)
static
inline
unsigned
char
*
u_strrchr
(
const
unsigned
char
*
s
,
unsigned
char
x
)
{
{
return
(
unsigned
char
*
)
strrchr
(
(
const
char
*
)
s
,
x
);
return
(
unsigned
char
*
)
strrchr
(
(
const
char
*
)
s
,
x
);
...
@@ -2871,25 +2876,45 @@ unsigned char* CDECL _mbsrev(unsigned char* str)
...
@@ -2871,25 +2876,45 @@ unsigned char* CDECL _mbsrev(unsigned char* str)
}
}
/*********************************************************************
/*********************************************************************
* _mbspbrk (MSVCRT.@)
* _mbspbrk
_l
(MSVCRT.@)
*/
*/
unsigned
char
*
CDECL
_mbspbrk
(
const
unsigned
char
*
str
,
const
unsigned
char
*
accept
)
unsigned
char
*
CDECL
_mbspbrk_l
(
const
unsigned
char
*
str
,
const
unsigned
char
*
accept
,
_locale_t
locale
)
{
{
const
unsigned
char
*
p
;
const
unsigned
char
*
p
;
pthreadmbcinfo
mbcinfo
;
if
(
locale
)
mbcinfo
=
locale
->
mbcinfo
;
else
mbcinfo
=
get_mbcinfo
();
if
(
!
mbcinfo
->
ismbcodepage
)
return
u_strpbrk
(
str
,
accept
);
while
(
*
str
)
if
(
!
MSVCRT_CHECK_PMT
(
str
&&
accept
))
return
NULL
;
while
(
*
str
)
{
{
for
(
p
=
accept
;
*
p
;
p
+=
(
_ismbblead
(
*
p
)
?
2
:
1
)
)
for
(
p
=
accept
;
*
p
;
p
+=
(
_ismbblead_l
(
*
p
,
locale
)
?
2
:
1
)
)
{
{
if
(
*
p
==
*
str
)
if
(
*
p
==
*
str
)
if
(
!
_ismbblead
(
*
p
)
||
(
*
(
p
+
1
)
==
*
(
str
+
1
)
)
)
if
(
!
_ismbblead_l
(
*
p
,
locale
)
||
p
[
1
]
==
str
[
1
]
)
return
(
unsigned
char
*
)
str
;
return
(
unsigned
char
*
)
str
;
}
}
str
+=
(
_ismbblead
(
*
str
)
?
2
:
1
);
str
+=
(
_ismbblead
_l
(
*
str
,
locale
)
?
2
:
1
);
}
}
return
NULL
;
return
NULL
;
}
}
/*********************************************************************
* _mbspbrk (MSVCRT.@)
*/
unsigned
char
*
CDECL
_mbspbrk
(
const
unsigned
char
*
str
,
const
unsigned
char
*
accept
)
{
return
_mbspbrk_l
(
str
,
accept
,
NULL
);
}
/*
/*
* Functions depending on locale codepage
* Functions depending on locale codepage
...
...
dlls/msvcrt/msvcrt.spec
View file @
ec4a5f63
...
@@ -795,7 +795,7 @@
...
@@ -795,7 +795,7 @@
# stub _mbsnset_s(ptr long long long)
# stub _mbsnset_s(ptr long long long)
# stub _mbsnset_s_l(ptr long long long ptr)
# stub _mbsnset_s_l(ptr long long long ptr)
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
# stub
_mbspbrk_l(str str ptr)
@ cdecl
_mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
...
dlls/ucrtbase/ucrtbase.spec
View file @
ec4a5f63
...
@@ -690,7 +690,7 @@
...
@@ -690,7 +690,7 @@
@ stub _mbsnset_s
@ stub _mbsnset_s
@ stub _mbsnset_s_l
@ stub _mbsnset_s_l
@ cdecl _mbspbrk(str str)
@ cdecl _mbspbrk(str str)
@
stub _mbspbrk_l
@
cdecl _mbspbrk_l(str str ptr)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr(str long)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrchr_l(str long ptr)
@ cdecl _mbsrev(str)
@ cdecl _mbsrev(str)
...
@@ -1259,7 +1259,7 @@
...
@@ -1259,7 +1259,7 @@
@ stub _o__mbsnset_s
@ stub _o__mbsnset_s
@ stub _o__mbsnset_s_l
@ stub _o__mbsnset_s_l
@ cdecl _o__mbspbrk(str str) _mbspbrk
@ cdecl _o__mbspbrk(str str) _mbspbrk
@
stub _o_
_mbspbrk_l
@
cdecl _o__mbspbrk_l(str str ptr)
_mbspbrk_l
@ cdecl _o__mbsrchr(str long) _mbsrchr
@ cdecl _o__mbsrchr(str long) _mbsrchr
@ cdecl _o__mbsrchr_l(str long ptr) _mbsrchr_l
@ cdecl _o__mbsrchr_l(str long ptr) _mbsrchr_l
@ cdecl _o__mbsrev(str) _mbsrev
@ cdecl _o__mbsrev(str) _mbsrev
...
...
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