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
a7b9948f
Commit
a7b9948f
authored
Dec 04, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Dec 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Use _configthreadlocale arguments definition from public header.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
79e950bb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
locale.c
dlls/msvcrt/locale.c
+4
-4
msvcrt.h
dlls/msvcrt/msvcrt.h
+0
-3
locale.h
include/msvcrt/locale.h
+12
-0
No files found.
dlls/msvcrt/locale.c
View file @
a7b9948f
...
...
@@ -2052,12 +2052,12 @@ int CDECL _configthreadlocale(int type)
thread_data_t
*
data
=
msvcrt_get_thread_data
();
int
ret
;
ret
=
(
data
->
locale_flags
&
LOCALE_THREAD
?
MSVCRT_
_ENABLE_PER_THREAD_LOCALE
:
MSVCRT_
_DISABLE_PER_THREAD_LOCALE
);
ret
=
(
data
->
locale_flags
&
LOCALE_THREAD
?
_ENABLE_PER_THREAD_LOCALE
:
_DISABLE_PER_THREAD_LOCALE
);
if
(
type
==
MSVCRT_
_ENABLE_PER_THREAD_LOCALE
)
if
(
type
==
_ENABLE_PER_THREAD_LOCALE
)
data
->
locale_flags
|=
LOCALE_THREAD
;
else
if
(
type
==
MSVCRT_
_DISABLE_PER_THREAD_LOCALE
)
else
if
(
type
==
_DISABLE_PER_THREAD_LOCALE
)
data
->
locale_flags
&=
~
LOCALE_THREAD
;
else
if
(
type
)
ret
=
-
1
;
...
...
dlls/msvcrt/msvcrt.h
View file @
a7b9948f
...
...
@@ -296,9 +296,6 @@ extern FILE MSVCRT__iob[];
#define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF)
#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1
#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
_locale_t
CDECL
get_current_locale_noalloc
(
_locale_t
locale
)
DECLSPEC_HIDDEN
;
void
CDECL
free_locale_noalloc
(
_locale_t
locale
)
DECLSPEC_HIDDEN
;
pthreadlocinfo
CDECL
get_locinfo
(
void
)
DECLSPEC_HIDDEN
;
...
...
include/msvcrt/locale.h
View file @
a7b9948f
...
...
@@ -68,6 +68,18 @@ struct lconv
struct
tm
;
#ifndef _CONFIG_LOCALE_SWT
#define _CONFIG_LOCALE_SWT
#define _ENABLE_PER_THREAD_LOCALE 0x1
#define _DISABLE_PER_THREAD_LOCALE 0x2
#define _ENABLE_PER_THREAD_LOCALE_GLOBAL 0x10
#define _DISABLE_PER_THREAD_LOCALE_GLOBAL 0x20
#define _ENABLE_PER_THREAD_LOCALE_NEW 0x100
#define _DISABLE_PER_THREAD_LOCALE_NEW 0x200
#endif
#ifdef __cplusplus
extern
"C"
{
#endif
...
...
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