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
d496099c
Commit
d496099c
authored
Nov 26, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Nov 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Remove MSVCRT_pthreadmbcinfo type.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d5c0458b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
28 deletions
+26
-28
locale.c
dlls/msvcrt/locale.c
+3
-3
mbcs.c
dlls/msvcrt/mbcs.c
+16
-16
msvcrt.h
dlls/msvcrt/msvcrt.h
+7
-9
No files found.
dlls/msvcrt/locale.c
View file @
d496099c
...
...
@@ -656,7 +656,7 @@ pthreadlocinfo CDECL get_locinfo(void) {
}
/* INTERNAL: returns pthreadmbcinfo struct */
MSVCRT_
pthreadmbcinfo
CDECL
get_mbcinfo
(
void
)
{
pthreadmbcinfo
CDECL
get_mbcinfo
(
void
)
{
thread_data_t
*
data
=
msvcrt_get_thread_data
();
update_thread_locale
(
data
);
return
data
->
mbcinfo
;
...
...
@@ -1139,8 +1139,8 @@ void free_locinfo(pthreadlocinfo locinfo)
MSVCRT_free
(
locinfo
);
}
/* INTERNAL: frees
MSVCRT_
pthreadmbcinfo struct */
void
free_mbcinfo
(
MSVCRT_
pthreadmbcinfo
mbcinfo
)
/* INTERNAL: frees pthreadmbcinfo struct */
void
free_mbcinfo
(
pthreadmbcinfo
mbcinfo
)
{
if
(
!
mbcinfo
)
return
;
...
...
dlls/msvcrt/mbcs.c
View file @
d496099c
...
...
@@ -88,7 +88,7 @@ static const unsigned char mbctombb_932_kana[] = {
static
MSVCRT_wchar_t
msvcrt_mbc_to_wc_l
(
unsigned
int
ch
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
MSVCRT_wchar_t
chW
;
char
mbch
[
2
];
int
n_chars
;
...
...
@@ -210,9 +210,9 @@ int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale)
}
#endif
MSVCRT_threadmbcinfo
*
create_mbcinfo
(
int
cp
,
LCID
lcid
,
MSVCRT_
threadmbcinfo
*
old_mbcinfo
)
threadmbcinfo
*
create_mbcinfo
(
int
cp
,
LCID
lcid
,
threadmbcinfo
*
old_mbcinfo
)
{
MSVCRT_
threadmbcinfo
*
mbcinfo
;
threadmbcinfo
*
mbcinfo
;
int
newcp
;
CPINFO
cpi
;
BYTE
*
bytes
;
...
...
@@ -229,7 +229,7 @@ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *ol
return
old_mbcinfo
;
}
mbcinfo
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_
threadmbcinfo
));
mbcinfo
=
MSVCRT_malloc
(
sizeof
(
threadmbcinfo
));
if
(
!
mbcinfo
)
return
NULL
;
mbcinfo
->
refcount
=
1
;
...
...
@@ -385,7 +385,7 @@ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *ol
int
CDECL
_setmbcp
(
int
cp
)
{
thread_data_t
*
data
=
msvcrt_get_thread_data
();
MSVCRT_
threadmbcinfo
*
mbcinfo
;
threadmbcinfo
*
mbcinfo
;
mbcinfo
=
create_mbcinfo
(
cp
,
-
1
,
get_mbcinfo
());
if
(
!
mbcinfo
)
...
...
@@ -619,7 +619,7 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num)
MSVCRT_size_t
CDECL
_mbsnlen_l
(
const
unsigned
char
*
str
,
MSVCRT_size_t
maxsize
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
MSVCRT_size_t
i
=
0
,
len
=
0
;
if
(
!
locale
)
...
...
@@ -903,7 +903,7 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV
*/
int
CDECL
_mbscmp_l
(
const
unsigned
char
*
str
,
const
unsigned
char
*
cmp
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
str
||
!
cmp
)
return
INT_MAX
;
...
...
@@ -941,7 +941,7 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp, MSVCRT__lo
*/
int
CDECL
_mbsnbicoll_l
(
const
unsigned
char
*
str1
,
const
unsigned
char
*
str2
,
MSVCRT_size_t
len
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -987,7 +987,7 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp)
*/
int
CDECL
_mbsnbcoll_l
(
const
unsigned
char
*
str1
,
const
unsigned
char
*
str2
,
MSVCRT_size_t
len
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -1326,7 +1326,7 @@ unsigned char* CDECL _mbsrchr(const unsigned char* s, unsigned int x)
unsigned
char
*
CDECL
_mbstok_s_l
(
unsigned
char
*
str
,
const
unsigned
char
*
delim
,
unsigned
char
**
ctx
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
unsigned
int
c
;
if
(
!
MSVCRT_CHECK_PMT
(
delim
!=
NULL
))
return
NULL
;
...
...
@@ -1426,7 +1426,7 @@ unsigned int CDECL _mbbtombc(unsigned int c)
*/
int
CDECL
_ismbbkana_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
locale
)
mbcinfo
=
locale
->
mbcinfo
;
...
...
@@ -1640,7 +1640,7 @@ int CDECL _ismbckata(unsigned int c)
*/
int
CDECL
_ismbblead_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -1663,7 +1663,7 @@ int CDECL _ismbblead(unsigned int c)
*/
int
CDECL
_ismbbtrail_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -2723,7 +2723,7 @@ unsigned int CDECL _mbctokata(unsigned int c)
*/
int
CDECL
_ismbcl0_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -2752,7 +2752,7 @@ int CDECL _ismbcl0(unsigned int c)
*/
int
CDECL
_ismbcl1_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
@@ -2781,7 +2781,7 @@ int CDECL _ismbcl1(unsigned int c)
*/
int
CDECL
_ismbcl2_l
(
unsigned
int
c
,
MSVCRT__locale_t
locale
)
{
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
if
(
!
locale
)
mbcinfo
=
get_mbcinfo
();
...
...
dlls/msvcrt/msvcrt.h
View file @
d496099c
...
...
@@ -121,7 +121,7 @@ typedef struct __lc_time_data {
char
data
[
1
];
}
__lc_time_data
;
typedef
struct
MSVCRT_
threadmbcinfostruct
{
typedef
struct
threadmbcinfostruct
{
int
refcount
;
int
mbcodepage
;
int
ismbcodepage
;
...
...
@@ -129,14 +129,12 @@ typedef struct MSVCRT_threadmbcinfostruct {
unsigned
short
mbulinfo
[
6
];
unsigned
char
mbctype
[
257
];
unsigned
char
mbcasemap
[
256
];
}
MSVCRT_threadmbcinfo
;
typedef
struct
MSVCRT_threadmbcinfostruct
*
MSVCRT_pthreadmbcinfo
;
}
threadmbcinfo
;
typedef
struct
MSVCRT_localeinfo_struct
{
pthreadlocinfo
locinfo
;
MSVCRT_
pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
}
MSVCRT__locale_tstruct
,
*
MSVCRT__locale_t
;
typedef
struct
MSVCRT__onexit_table_t
...
...
@@ -194,7 +192,7 @@ struct __thread_data {
void
*
unk4
[
3
];
EXCEPTION_POINTERS
*
xcptinfo
;
int
fpecode
;
MSVCRT_pthreadmbcinfo
mbcinfo
;
pthreadmbcinfo
mbcinfo
;
pthreadlocinfo
locinfo
;
int
locale_flags
;
int
unk5
[
1
];
...
...
@@ -934,11 +932,11 @@ extern MSVCRT__locale_t MSVCRT_locale;
MSVCRT__locale_t
CDECL
get_current_locale_noalloc
(
MSVCRT__locale_t
locale
)
DECLSPEC_HIDDEN
;
void
CDECL
free_locale_noalloc
(
MSVCRT__locale_t
locale
)
DECLSPEC_HIDDEN
;
pthreadlocinfo
CDECL
get_locinfo
(
void
)
DECLSPEC_HIDDEN
;
MSVCRT_
pthreadmbcinfo
CDECL
get_mbcinfo
(
void
)
DECLSPEC_HIDDEN
;
pthreadmbcinfo
CDECL
get_mbcinfo
(
void
)
DECLSPEC_HIDDEN
;
void
__cdecl
MSVCRT__free_locale
(
MSVCRT__locale_t
);
MSVCRT_threadmbcinfo
*
create_mbcinfo
(
int
,
LCID
,
MSVCRT_
threadmbcinfo
*
)
DECLSPEC_HIDDEN
;
threadmbcinfo
*
create_mbcinfo
(
int
,
LCID
,
threadmbcinfo
*
)
DECLSPEC_HIDDEN
;
void
free_locinfo
(
pthreadlocinfo
)
DECLSPEC_HIDDEN
;
void
free_mbcinfo
(
MSVCRT_
pthreadmbcinfo
)
DECLSPEC_HIDDEN
;
void
free_mbcinfo
(
pthreadmbcinfo
)
DECLSPEC_HIDDEN
;
int
__cdecl
__crtLCMapStringA
(
LCID
,
DWORD
,
const
char
*
,
int
,
char
*
,
int
,
unsigned
int
,
int
)
DECLSPEC_HIDDEN
;
int
__cdecl
MSVCRT__write
(
int
,
const
void
*
,
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