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
c17c5431
Commit
c17c5431
authored
Jun 22, 2015
by
Daniel Lehman
Committed by
Alexandre Julliard
Jun 26, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Set _Locimp vtable in _Locimp ctors (Valgrind).
parent
817db8e3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
locale.c
dlls/msvcp90/locale.c
+14
-5
No files found.
dlls/msvcp90/locale.c
View file @
c17c5431
...
...
@@ -9966,6 +9966,9 @@ istreambuf_iterator_char* __thiscall time_get_char_get_year(const time_get_char
return
call_time_get_char_do_get_year
(
this
,
ret
,
s
,
e
,
base
,
err
,
t
);
}
/* ??_7_Locimp@locale@std@@6B@ */
extern
const
vtable_ptr
MSVCP_locale__Locimp_vtable
;
/* ??0_Locimp@locale@std@@AAE@_N@Z */
/* ??0_Locimp@locale@std@@AEAA@_N@Z */
DEFINE_THISCALL_WRAPPER
(
locale__Locimp_ctor_transparent
,
8
)
...
...
@@ -9975,6 +9978,7 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this,
memset
(
this
,
0
,
sizeof
(
locale__Locimp
));
locale_facet_ctor_refs
(
&
this
->
facet
,
1
);
this
->
facet
.
vtable
=
&
MSVCP_locale__Locimp_vtable
;
this
->
transparent
=
transparent
;
locale_string_char_ctor_cstr
(
&
this
->
name
,
"*"
);
return
this
;
...
...
@@ -10001,6 +10005,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
_Lockit_ctor_locktype
(
&
lock
,
_LOCK_LOCALE
);
memcpy
(
this
,
copy
,
sizeof
(
locale__Locimp
));
locale_facet_ctor_refs
(
&
this
->
facet
,
1
);
this
->
facet
.
vtable
=
&
MSVCP_locale__Locimp_vtable
;
if
(
copy
->
facetvec
)
{
this
->
facetvec
=
MSVCRT_operator_new
(
copy
->
facet_cnt
*
sizeof
(
locale_facet
*
));
if
(
!
this
->
facetvec
)
{
...
...
@@ -10560,11 +10565,6 @@ locale__Locimp* __cdecl locale__Locimp__Makeloc(const _Locinfo *locinfo, categor
return
locimp
;
}
/* ??_7_Locimp@locale@std@@6B@ */
const
vtable_ptr
MSVCP_locale__Locimp_vtable
[]
=
{
(
vtable_ptr
)
THISCALL_NAME
(
locale__Locimp_vector_dtor
)
};
/* ??0locale@std@@AAE@PAV_Locimp@01@@Z */
/* ??0locale@std@@AEAA@PEAV_Locimp@01@@Z */
DEFINE_THISCALL_WRAPPER
(
locale_ctor_locimp
,
8
)
...
...
@@ -11066,6 +11066,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s
DEFINE_RTTI_DATA0
(
locale_facet
,
0
,
".?AVfacet@locale@std@@"
)
DEFINE_RTTI_DATA1
(
locale__Locimp
,
0
,
&
locale_facet_rtti_base_descriptor
,
".?AV_Locimp@locale@std@@"
)
DEFINE_RTTI_DATA1
(
collate_char
,
0
,
&
locale_facet_rtti_base_descriptor
,
".?AV?$collate@D@std@@"
)
DEFINE_RTTI_DATA1
(
collate_wchar
,
0
,
&
locale_facet_rtti_base_descriptor
,
".?AV?$collate@_W@std@@"
)
DEFINE_RTTI_DATA1
(
collate_short
,
0
,
&
locale_facet_rtti_base_descriptor
,
".?AV?$collate@G@std@@"
)
...
...
@@ -11102,6 +11103,13 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC
(
locale_facet__Decref
)
#endif
);
__ASM_VTABLE
(
locale__Locimp
,
VTABLE_ADD_FUNC
(
locale__Locimp_vector_dtor
)
#if _MSVCP_VER >= 110
VTABLE_ADD_FUNC
(
locale_facet__Incref
)
VTABLE_ADD_FUNC
(
locale_facet__Decref
)
#endif
);
__ASM_VTABLE
(
collate_char
,
VTABLE_ADD_FUNC
(
collate_char_vector_dtor
)
#if _MSVCP_VER >= 110
...
...
@@ -11425,6 +11433,7 @@ void init_locale(void *base)
{
#ifdef __x86_64__
init_locale_facet_rtti
(
base
);
init_locale__Locimp_rtti
(
base
);
init_collate_char_rtti
(
base
);
init_collate_wchar_rtti
(
base
);
init_collate_short_rtti
(
base
);
...
...
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