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
5a427e51
Commit
5a427e51
authored
May 10, 2016
by
Piotr Caban
Committed by
Alexandre Julliard
May 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp110: Don't allocate empty buffers in _Locinfo::_Locinfo_ctor.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f8a0f90e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
locale.c
dlls/msvcp90/locale.c
+6
-7
msvcp90.h
dlls/msvcp90/msvcp90.h
+1
-0
No files found.
dlls/msvcp90/locale.c
View file @
5a427e51
...
...
@@ -69,6 +69,7 @@ LCID* __cdecl ___lc_handle_func(void);
#if _MSVCP_VER < 100
#define locale_string basic_string_char
#define locale_string_char_ctor(this) MSVCP_basic_string_char_ctor(this)
#define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str)
#define locale_string_char_copy_ctor(this,copy) MSVCP_basic_string_char_copy_ctor(this,copy)
#define locale_string_char_dtor(this) MSVCP_basic_string_char_dtor(this)
...
...
@@ -76,6 +77,7 @@ LCID* __cdecl ___lc_handle_func(void);
#define locale_string_char_assign(this,assign) MSVCP_basic_string_char_assign(this,assign)
#else
#define locale_string _Yarn_char
#define locale_string_char_ctor(this) _Yarn_char_ctor(this)
#define locale_string_char_ctor_cstr(this,str) _Yarn_char_ctor_cstr(this,str)
#define locale_string_char_copy_ctor(this,copy) _Yarn_char_copy_ctor(this,copy)
#define locale_string_char_dtor(this) _Yarn_char_dtor(this)
...
...
@@ -512,9 +514,6 @@ void* __thiscall _Timevec__Getptr(_Timevec *this)
_Locinfo
*
__cdecl
_Locinfo__Locinfo_ctor_cat_cstr
(
_Locinfo
*
locinfo
,
int
category
,
const
char
*
locstr
)
{
const
char
*
locale
=
NULL
;
#if _MSVCP_VER >= 110
static
const
wchar_t
empty
[]
=
{
'\0'
};
#endif
/* This function is probably modifying more global objects */
FIXME
(
"(%p %d %s) semi-stub
\n
"
,
locinfo
,
category
,
locstr
);
...
...
@@ -523,11 +522,11 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor
throw_exception
(
EXCEPTION_RUNTIME_ERROR
,
"bad locale name"
);
_Lockit_ctor_locktype
(
&
locinfo
->
lock
,
_LOCK_LOCALE
);
locale_string_char_ctor
_cstr
(
&
locinfo
->
days
,
""
);
locale_string_char_ctor
_cstr
(
&
locinfo
->
months
,
""
);
locale_string_char_ctor
(
&
locinfo
->
days
);
locale_string_char_ctor
(
&
locinfo
->
months
);
#if _MSVCP_VER >= 110
locale_string_wchar_ctor
_cstr
(
&
locinfo
->
wdays
,
empty
);
locale_string_wchar_ctor
_cstr
(
&
locinfo
->
wmonths
,
empty
);
locale_string_wchar_ctor
(
&
locinfo
->
wdays
);
locale_string_wchar_ctor
(
&
locinfo
->
wmonths
);
#endif
locale_string_char_ctor_cstr
(
&
locinfo
->
oldlocname
,
setlocale
(
LC_ALL
,
NULL
));
...
...
dlls/msvcp90/msvcp90.h
View file @
5a427e51
...
...
@@ -142,6 +142,7 @@ typedef struct
char
null_str
;
}
_Yarn_char
;
_Yarn_char
*
__thiscall
_Yarn_char_ctor
(
_Yarn_char
*
);
_Yarn_char
*
__thiscall
_Yarn_char_ctor_cstr
(
_Yarn_char
*
,
const
char
*
);
_Yarn_char
*
__thiscall
_Yarn_char_copy_ctor
(
_Yarn_char
*
,
const
_Yarn_char
*
);
const
char
*
__thiscall
_Yarn_char_c_str
(
const
_Yarn_char
*
);
...
...
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