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
d5b72bbc
Commit
d5b72bbc
authored
Jan 14, 2014
by
Piotr Caban
Committed by
Alexandre Julliard
Jan 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp110: Fix _Ctypevec structure layout.
parent
08e851f3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
locale.c
dlls/msvcp90/locale.c
+11
-0
msvcp90.h
dlls/msvcp90/msvcp90.h
+5
-0
No files found.
dlls/msvcp90/locale.c
View file @
d5b72bbc
...
...
@@ -631,7 +631,12 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret)
TRACE
(
"
\n
"
);
ret
->
page
=
___lc_codepage_func
();
#if _MSVCP_VER < 110
ret
->
handle
=
___lc_handle_func
()[
LC_COLLATE
];
#else
/* FIXME: use ___lc_locale_name_func() */
ret
->
name
=
NULL
;
#endif
ret
->
delfl
=
TRUE
;
table
=
malloc
(
sizeof
(
short
[
256
]));
if
(
!
table
)
throw_exception
(
EXCEPTION_BAD_ALLOC
,
NULL
);
...
...
@@ -1446,6 +1451,9 @@ void __thiscall ctype_char__Tidy(ctype_char *this)
if
(
this
->
ctype
.
delfl
)
free
((
short
*
)
this
->
ctype
.
table
);
#if _MSVCP_VER >= 110
free
(
this
->
ctype
.
name
);
#endif
}
/* ?classic_table@?$ctype@D@std@@KAPBFXZ */
...
...
@@ -2142,6 +2150,9 @@ void __thiscall ctype_wchar_dtor(ctype_wchar *this)
TRACE
(
"(%p)
\n
"
,
this
);
if
(
this
->
ctype
.
delfl
)
free
((
void
*
)
this
->
ctype
.
table
);
#if _MSVCP_VER >= 110
free
(
this
->
ctype
.
name
);
#endif
}
DEFINE_THISCALL_WRAPPER
(
ctype_wchar_vector_dtor
,
8
)
...
...
dlls/msvcp90/msvcp90.h
View file @
d5b72bbc
...
...
@@ -123,10 +123,15 @@ typedef enum {
}
codecvt_base_result
;
typedef
struct
{
#if _MSVCP_VER < 110
LCID
handle
;
#endif
unsigned
page
;
const
short
*
table
;
int
delfl
;
#if _MSVCP_VER >= 110
wchar_t
*
name
;
#endif
}
_Ctypevec
;
/* class codecvt_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