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
d218d82a
Commit
d218d82a
authored
Oct 22, 2013
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 22, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Don't output __ptr64 when UNDNAME_NO_MS_KEYWORDS is used.
parent
47908f7a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
cpp.c
dlls/msvcrt/tests/cpp.c
+1
-0
undname.c
dlls/msvcrt/undname.c
+6
-0
No files found.
dlls/msvcrt/tests/cpp.c
View file @
d218d82a
...
...
@@ -1320,6 +1320,7 @@ static void test_demangle(void)
"?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"
},
/* 126 */
{
"?_Doraise@bad_cast@std@@MEBAXXZ"
,
"protected: virtual void __cdecl std::bad_cast::_Doraise(void)"
,
NULL
,
0x60
},
/* 127 */
{
"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z"
,
"class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)"
,
NULL
,
1
},
/* 128 */
{
"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z"
,
"class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)"
,
NULL
,
2
},
};
int
i
,
num_test
=
(
sizeof
(
test
)
/
sizeof
(
test
[
0
]));
char
*
name
;
...
...
dlls/msvcrt/undname.c
View file @
d218d82a
...
...
@@ -406,9 +406,12 @@ static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char
*
ptr_modif
=
NULL
;
if
(
*
sym
->
current
==
'E'
)
{
if
(
!
(
sym
->
flags
&
UNDNAME_NO_MS_KEYWORDS
))
{
*
ptr_modif
=
"__ptr64"
;
if
(
sym
->
flags
&
UNDNAME_NO_LEADING_UNDERSCORES
)
*
ptr_modif
=
*
ptr_modif
+
2
;
}
sym
->
current
++
;
}
switch
(
*
sym
->
current
++
)
...
...
@@ -431,10 +434,13 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym,
if
(
*
sym
->
current
==
'E'
)
{
if
(
!
(
sym
->
flags
&
UNDNAME_NO_MS_KEYWORDS
))
{
if
(
sym
->
flags
&
UNDNAME_NO_LEADING_UNDERSCORES
)
ptr_modif
=
" ptr64"
;
else
ptr_modif
=
" __ptr64"
;
}
sym
->
current
++
;
}
...
...
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