Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
a2d24c8a
Commit
a2d24c8a
authored
20 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Now that name undecoration works, fix the type info.
parent
98f94544
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msvcrt/cpp.c
+7
-4
7 additions, 4 deletions
dlls/msvcrt/cpp.c
dlls/msvcrt/tests/cpp.c
+1
-5
1 addition, 5 deletions
dlls/msvcrt/tests/cpp.c
with
8 additions
and
9 deletions
dlls/msvcrt/cpp.c
+
7
−
4
View file @
a2d24c8a
...
...
@@ -565,16 +565,19 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
if
(
!
_this
->
name
)
{
/* Create and set the demangled name */
char
*
name
=
__unDName
(
0
,
_this
->
mangled
,
0
,
(
malloc_func_t
)
MSVCRT_malloc
,
(
free_func_t
)
MSVCRT_free
,
0x2800
);
/* Nota: mangled name in type_info struct always start with a '.', while
* it isn't valid for mangled name.
* Is this '.' really part of the mangled name, or has it some other meaning ?
*/
char
*
name
=
__unDName
(
0
,
_this
->
mangled
+
1
,
0
,
MSVCRT_malloc
,
MSVCRT_free
,
0x2800
);
if
(
name
)
{
unsigned
int
len
=
strlen
(
name
);
/* It seems _unDName may leave blanks at the end of the demangled name */
if
(
name
[
len
]
==
' '
)
while
(
len
&&
name
[
--
len
]
==
' '
)
name
[
len
]
=
'\0'
;
_mlock
(
_EXIT_LOCK2
);
...
...
This diff is collapsed.
Click to expand it.
dlls/msvcrt/tests/cpp.c
+
1
−
5
View file @
a2d24c8a
...
...
@@ -748,11 +748,7 @@ static void test_type_info(void)
name
=
call_func1
(
ptype_info_name
,
&
t1
);
ok
(
name
&&
t1
.
name
&&
!
strcmp
(
name
,
t1
.
name
),
"bad name '%s' for t1
\n
"
,
name
);
todo_wine
{
/* Demangling doesn't work yet, since __unDName() is a stub */
ok
(
t1
.
name
&&
!
strcmp
(
t1
.
name
,
"class test1"
),
"demangled to '%s' for t1
\n
"
,
t1
.
name
);
}
ok
(
t1
.
name
&&
!
strcmp
(
t1
.
name
,
"class test1"
),
"demangled to '%s' for t1
\n
"
,
t1
.
name
);
call_func1
(
ptype_info_dtor
,
&
t1
);
/* before */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment