Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

implemented ?name@type_info@@QBEPBDXZ.msvcr and __unDName based on code from Wine

Browse source 
svn path=/trunk/; revision=17246
This commit is contained in:
Steven Edwards 2005-08-09 17:55:47 +00:00
parent 22ad71c0a6
commit 296b3402ac
5 changed files with 1242 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/lib/crt/crt.xml
View file

@ -396,5 +396,6 @@
<file>heap.c</file>
<file>scanf.c</file>
<file>thread.c</file>
<file>undname.c</file>
</directory>
</module>

7
reactos/lib/crt/include/internal/wine/msvcrt.h
View file

@ -125,4 +125,11 @@ extern void msvcrt_free_args(void);
#define _RT_CRNL 252
#define _RT_BANNER 255
typedef void* (*malloc_func_t)(size_t);
typedef void (*free_func_t)(void*);
#define MSVCRT_malloc malloc
#define MSVCRT_free free
VOID STDCALL RtlAssert(PVOID FailedAssertion,PVOID FileName,ULONG LineNumber,PCHAR Message);
extern char* __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int);
#endif /* __WINE_MSVCRT_H */

29
reactos/lib/crt/wine/cpp.c
View file

@ -124,8 +124,7 @@ static void WINAPI EXCEPTION_ctor(exception *_this, const char** name)
if (*name)
{
size_t name_len = strlen(*name) + 1;
// _this->name = MSVCRT_malloc(name_len);
_this->name = malloc(name_len);
_this->name = MSVCRT_malloc(name_len);
memcpy(_this->name, *name, name_len);
_this->do_free = TRUE;
}
@ -188,8 +187,7 @@ void __stdcall MSVCRT_exception_dtor(exception * _this)
{
TRACE("(%p)\n", _this);
_this->vtable = &MSVCRT_exception_vtable;
// if (_this->do_free) MSVCRT_free(_this->name);
if (_this->do_free) free(_this->name);
if (_this->do_free) MSVCRT_free(_this->name);
}
/******************************************************************
@ -537,10 +535,9 @@ void __stdcall MSVCRT_type_info_dtor(type_info * _this)
{
TRACE("(%p)\n", _this);
if (_this->name)
// MSVCRT_free(_this->name);
free(_this->name);
MSVCRT_free(_this->name);
}
#if 0 /* __REACTOS__ */
/******************************************************************
* ?name@type_info@@QBEPBDXZ (MSVCRT.@)
*/
@ -550,16 +547,19 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
if (!_this->name)
{
/* Create and set the demangled name */
char* name = MSVCRT___unDName(0, _this->mangled, 0,
(MSVCRT_malloc_func)malloc,
(MSVCRT_free_func)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);
@ -567,9 +567,8 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
if (_this->name)
{
/* Another thread set this member since we checked above - use it */
// MSVCRT_free(name);
free(name);
}
MSVCRT_free(name);
}
else
_this->name = name;
@ -579,7 +578,7 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
TRACE("(%p) returning %s\n", _this, _this->name);
return _this->name;
}
#endif
/******************************************************************
* ?raw_name@type_info@@QBEPBDXZ (MSVCRT.@)
*/

1219
reactos/lib/crt/wine/undname.c Executable file
View file

File diff suppressed because it is too large Load diff

2
reactos/lib/msvcrt/msvcrt.def
View file

@ -59,7 +59,7 @@ $I10_OUTPUT=MSVCRT_I10_OUTPUT @1
?what@exception@@UBEPBDXZ=__thiscall_MSVCRT_what_exception @51
??1type_info@@UAE@XZ=MSVCRT_type_info_dtor@4
;?name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_name @44
?name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_name @44
;??0bad_cast@@QAE@PBD@Z
;??0bad_cast@@AAE@PBQBD@Z
;??_Fbad_cast@@QAEXXZ