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
79843192
Commit
79843192
authored
Oct 27, 2022
by
Bartosz Kosiorek
Committed by
Alexandre Julliard
Oct 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Add _mbcjmstojis_l implementation.
parent
70db739c
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
12 deletions
+28
-12
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
+19
-4
msvcrt.spec
dlls/msvcrt/msvcrt.spec
+1
-1
ucrtbase.spec
dlls/ucrtbase/ucrtbase.spec
+2
-2
mbstring.h
include/msvcrt/mbstring.h
+1
-0
No files found.
dlls/msvcr100/msvcr100.spec
View file @
79843192
...
@@ -1080,7 +1080,7 @@
...
@@ -1080,7 +1080,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/msvcr110/msvcr110.spec
View file @
79843192
...
@@ -1437,7 +1437,7 @@
...
@@ -1437,7 +1437,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/msvcr120/msvcr120.spec
View file @
79843192
...
@@ -1448,7 +1448,7 @@
...
@@ -1448,7 +1448,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/msvcr80/msvcr80.spec
View file @
79843192
...
@@ -752,7 +752,7 @@
...
@@ -752,7 +752,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/msvcr90/msvcr90.spec
View file @
79843192
...
@@ -730,7 +730,7 @@
...
@@ -730,7 +730,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/msvcrt/mbcs.c
View file @
79843192
...
@@ -607,17 +607,24 @@ unsigned int CDECL _mbcjistojms(unsigned int c)
...
@@ -607,17 +607,24 @@ unsigned int CDECL _mbcjistojms(unsigned int c)
}
}
/*********************************************************************
/*********************************************************************
* _mbcjmstojis(MSVCRT.@)
* _mbcjmstojis
_l
(MSVCRT.@)
*
*
* Converts a sjis character to jis.
* Converts a sjis character to jis.
*/
*/
unsigned
int
CDECL
_mbcjmstojis
(
unsigned
int
c
)
unsigned
int
CDECL
_mbcjmstojis
_l
(
unsigned
int
c
,
_locale_t
locale
)
{
{
pthreadmbcinfo
mbcinfo
;
if
(
locale
)
mbcinfo
=
locale
->
mbcinfo
;
else
mbcinfo
=
get_mbcinfo
();
/* Conversion takes place only when codepage is 932.
/* Conversion takes place only when codepage is 932.
In all other cases, c is returned unchanged */
In all other cases, c is returned unchanged */
if
(
get_mbcinfo
()
->
mbcodepage
==
932
)
if
(
mbcinfo
->
mbcodepage
==
932
)
{
{
if
(
_ismbclegal
(
c
)
&&
HIBYTE
(
c
)
<
0xf0
)
if
(
_ismbclegal
_l
(
c
,
locale
)
&&
HIBYTE
(
c
)
<
0xf0
)
{
{
if
(
HIBYTE
(
c
)
>=
0xe0
)
if
(
HIBYTE
(
c
)
>=
0xe0
)
c
-=
0x4000
;
c
-=
0x4000
;
...
@@ -640,6 +647,14 @@ unsigned int CDECL _mbcjmstojis(unsigned int c)
...
@@ -640,6 +647,14 @@ unsigned int CDECL _mbcjmstojis(unsigned int c)
}
}
/*********************************************************************
/*********************************************************************
* _mbcjmstojis(MSVCRT.@)
*/
unsigned
int
CDECL
_mbcjmstojis
(
unsigned
int
c
)
{
return
_mbcjmstojis_l
(
c
,
NULL
);
}
/*********************************************************************
* _mbsdec(MSVCRT.@)
* _mbsdec(MSVCRT.@)
*/
*/
unsigned
char
*
CDECL
_mbsdec
(
const
unsigned
char
*
start
,
const
unsigned
char
*
cur
)
unsigned
char
*
CDECL
_mbsdec
(
const
unsigned
char
*
start
,
const
unsigned
char
*
cur
)
...
...
dlls/msvcrt/msvcrt.spec
View file @
79843192
...
@@ -697,7 +697,7 @@
...
@@ -697,7 +697,7 @@
@ cdecl _mbcjistojms (long)
@ cdecl _mbcjistojms (long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
# stub
_mbcjmstojis_l(long ptr)
@ cdecl
_mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
...
dlls/ucrtbase/ucrtbase.spec
View file @
79843192
...
@@ -595,7 +595,7 @@
...
@@ -595,7 +595,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjistojms_l(long ptr)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbcjmstojis(long)
@
stub _mbcjmstojis_l
@
cdecl _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen(ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbclen_l(ptr ptr)
@ cdecl _mbctohira(long)
@ cdecl _mbctohira(long)
...
@@ -1165,7 +1165,7 @@
...
@@ -1165,7 +1165,7 @@
@ cdecl _o__mbcjistojms(long) _mbcjistojms
@ cdecl _o__mbcjistojms(long) _mbcjistojms
@ cdecl _o__mbcjistojms_l(long ptr) _mbcjistojms_l
@ cdecl _o__mbcjistojms_l(long ptr) _mbcjistojms_l
@ cdecl _o__mbcjmstojis(long) _mbcjmstojis
@ cdecl _o__mbcjmstojis(long) _mbcjmstojis
@
stub _o_
_mbcjmstojis_l
@
cdecl _o__mbcjmstojis_l(long ptr)
_mbcjmstojis_l
@ cdecl _o__mbclen(ptr) _mbclen
@ cdecl _o__mbclen(ptr) _mbclen
@ cdecl _o__mbclen_l(ptr ptr) _mbclen_l
@ cdecl _o__mbclen_l(ptr ptr) _mbclen_l
@ cdecl _o__mbctohira(long) _mbctohira
@ cdecl _o__mbctohira(long) _mbctohira
...
...
include/msvcrt/mbstring.h
View file @
79843192
...
@@ -43,6 +43,7 @@ _ACRTIMP int __cdecl _ismbcl0(unsigned int);
...
@@ -43,6 +43,7 @@ _ACRTIMP int __cdecl _ismbcl0(unsigned int);
_ACRTIMP
int
__cdecl
_ismbcl1
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcl1
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcl2
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcl2
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbclegal
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbclegal
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbclegal_l
(
unsigned
int
,
_locale_t
);
_ACRTIMP
int
__cdecl
_ismbclower
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbclower
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcprint
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcprint
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcpunct
(
unsigned
int
);
_ACRTIMP
int
__cdecl
_ismbcpunct
(
unsigned
int
);
...
...
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