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
de12cd58
Commit
de12cd58
authored
May 04, 2016
by
Piotr Caban
Committed by
Alexandre Julliard
May 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcr100: Add missing fields to lconv structure.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a8399b38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
locale.c
dlls/msvcrt/locale.c
+8
-8
msvcrt.h
dlls/msvcrt/msvcrt.h
+1
-1
No files found.
dlls/msvcrt/locale.c
View file @
de12cd58
...
...
@@ -769,7 +769,7 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo)
MSVCRT_free
(
locinfo
->
lconv
->
mon_grouping
);
MSVCRT_free
(
locinfo
->
lconv
->
positive_sign
);
MSVCRT_free
(
locinfo
->
lconv
->
negative_sign
);
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
MSVCRT_free
(
locinfo
->
lconv
->
_W_decimal_point
);
MSVCRT_free
(
locinfo
->
lconv
->
_W_thousands_sep
);
MSVCRT_free
(
locinfo
->
lconv
->
_W_int_curr_symbol
);
...
...
@@ -908,7 +908,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
LCID
lcid
[
6
]
=
{
0
},
lcid_tmp
;
unsigned
short
cp
[
6
]
=
{
0
};
char
buf
[
256
];
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
MSVCRT_wchar_t
wbuf
[
256
];
#endif
int
i
,
ret
,
size
;
...
...
@@ -1262,7 +1262,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
return
NULL
;
}
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
i
=
GetLocaleInfoW
(
lcid
[
MSVCRT_LC_MONETARY
],
LOCALE_SINTLSYMBOL
|
LOCALE_NOUSEROVERRIDE
,
wbuf
,
256
);
if
(
i
&&
(
locinfo
->
lconv
->
_W_int_curr_symbol
=
MSVCRT_malloc
(
i
*
sizeof
(
MSVCRT_wchar_t
))))
...
...
@@ -1355,7 +1355,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo
->
lconv
->
p_sign_posn
=
127
;
locinfo
->
lconv
->
n_sign_posn
=
127
;
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
locinfo
->
lconv
->
_W_int_curr_symbol
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_wchar_t
));
locinfo
->
lconv
->
_W_currency_symbol
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_wchar_t
));
locinfo
->
lconv
->
_W_mon_decimal_point
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_wchar_t
));
...
...
@@ -1436,7 +1436,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
return
NULL
;
}
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
i
=
GetLocaleInfoW
(
lcid
[
MSVCRT_LC_NUMERIC
],
LOCALE_SDECIMAL
|
LOCALE_NOUSEROVERRIDE
,
wbuf
,
256
);
if
(
i
&&
(
locinfo
->
lconv
->
_W_decimal_point
=
MSVCRT_malloc
(
i
*
sizeof
(
MSVCRT_wchar_t
))))
...
...
@@ -1475,7 +1475,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo
->
lconv
->
thousands_sep
[
0
]
=
'\0'
;
locinfo
->
lconv
->
grouping
[
0
]
=
'\0'
;
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
locinfo
->
lconv
->
_W_decimal_point
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_wchar_t
[
2
]));
locinfo
->
lconv
->
_W_thousands_sep
=
MSVCRT_malloc
(
sizeof
(
MSVCRT_wchar_t
));
...
...
@@ -1719,7 +1719,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale)
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
negative_sign
,
(
void
**
)
&
newlocinfo
->
lconv
->
negative_sign
);
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
_W_int_curr_symbol
,
(
void
**
)
&
newlocinfo
->
lconv
->
_W_int_curr_symbol
);
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
_W_currency_symbol
,
...
...
@@ -1767,7 +1767,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale)
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
grouping
,
(
void
**
)
&
newlocinfo
->
lconv
->
grouping
);
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
_W_decimal_point
,
(
void
**
)
&
newlocinfo
->
lconv
->
_W_decimal_point
);
swap_pointers
((
void
**
)
&
locinfo
->
lconv
->
_W_thousands_sep
,
...
...
dlls/msvcrt/msvcrt.h
View file @
de12cd58
...
...
@@ -410,7 +410,7 @@ struct MSVCRT_lconv {
char
n_sep_by_space
;
char
p_sign_posn
;
char
n_sign_posn
;
#if _MSVCR_VER >= 1
2
0
#if _MSVCR_VER >= 1
0
0
MSVCRT_wchar_t
*
_W_decimal_point
;
MSVCRT_wchar_t
*
_W_thousands_sep
;
MSVCRT_wchar_t
*
_W_int_curr_symbol
;
...
...
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