ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Two "unknown" parameters of _unDName() turn out to be the output

Browse Source 
string and it length. If possible, use these instead of allocating a
new one. Put the code in _unDNameEx() and call that from _unDName().
This commit is contained in:
Rein Klazes 2004-01-13 22:56:59 +00:00 committed by Alexandre Julliard
parent 3d6eb2db2f
commit 950da26b98
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/msvcrt/main.c
View File

@ -123,30 +123,31 @@ void MSVCRT_I10_OUTPUT(void)
} }
/********************************************************************* /*********************************************************************
* __unDName (MSVCRT.@) * __unDNameEx (MSVCRT.@)
* *
* Demangle a C++ identifier. * Demangle a C++ identifier.
* *
* PARAMS * PARAMS
* unknown [I] Not yet determined * OutStr [O] If not NULL, the place to put the demangled string
* mangled [I] Mangled name of the function * mangled [I] Mangled name of the function
* unknown2 [I] Not yet determined * OutStrLen[I] Length of OutStr
* memget [I] Function to allocate memory with * memget [I] Function to allocate memory with
* memfree [I] Function to free memory with * memfree [I] Function to free memory with
* unknown [?] Unknown, possibly a call back
* flags [I] Flags determining demangled format * flags [I] Flags determining demangled format
* *
* RETURNS * RETURNS
* Success: A string pointing to the unmangled name, allocated with memget. * Success: A string pointing to the unmangled name, allocated with memget.
* Failure: NULL. * Failure: NULL.
*/ */
char* MSVCRT___unDName(int unknown, const char* mangled, int unknown2, char* MSVCRT___unDNameEx(char * OutStr, const char* mangled, int OutStrLen,
MSVCRT_malloc_func memget, MSVCRT_malloc_func memget,
MSVCRT_free_func memfree, MSVCRT_free_func memfree,
unsigned int flags) void * unknown,
unsigned short int flags)
{ {
char* ret; FIXME("(%p,%s,%d,%p,%p,%p,%x) stub!\n",
OutStr, mangled, OutStrLen, memget, memfree, unknown, flags);
FIXME("(%d,%s,%d,%p,%p,%x) stub!\n", unknown, mangled, unknown2, memget, memfree, flags);
/* FIXME: The code in tools/winebuild/msmangle.c is pretty complete and /* FIXME: The code in tools/winebuild/msmangle.c is pretty complete and
* could be used here. * could be used here.
@ -164,17 +165,23 @@ char* MSVCRT___unDName(int unknown, const char* mangled, int unknown2,
* 0x2000 - Unknown, passed by type_info::name() * 0x2000 - Unknown, passed by type_info::name()
*/ */
/* Duplicate the mangled name; for comparisons it doesn't matter anyway */ /* Duplicate the mangled name; for comparisons it doesn't matter anyway */
ret = memget(strlen(mangled) + 1); if( OutStr == NULL) {
strcpy(ret, mangled); OutStrLen = strlen(mangled) + 1;
return ret; OutStr = memget( OutStrLen);
}
strncpy( OutStr, mangled, OutStrLen);
return OutStr;
} }
/********************************************************************* /*********************************************************************
* __unDNameEx (MSVCRT.@) * __unDName (MSVCRT.@)
* Function not really understood but needed to make the DLL work
*/ */
char* MSVCRT___unDNameEx(void) char* MSVCRT___unDName(char * OutStr, const char* mangled, int OutStrLen,
MSVCRT_malloc_func memget,
MSVCRT_free_func memfree,
unsigned short int flags)
{ {
return NULL; return MSVCRT___unDNameEx( OutStr, mangled, OutStrLen, memget, memfree,
NULL, flags);
} }

3
dlls/msvcrt/msvcrt.h
View File

@ -75,7 +75,8 @@ void MSVCRT_operator_delete(void*);
typedef void* (*MSVCRT_malloc_func)(MSVCRT_size_t); typedef void* (*MSVCRT_malloc_func)(MSVCRT_size_t);
typedef void (*MSVCRT_free_func)(void*); typedef void (*MSVCRT_free_func)(void*);
extern char* MSVCRT___unDName(int,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,unsigned int); extern char* MSVCRT___unDName(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,unsigned short int);
extern char* MSVCRT___unDNameEx(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,void *,unsigned short int);
/* Setup and teardown multi threaded locks */ /* Setup and teardown multi threaded locks */
extern void msvcrt_init_mt_locks(void); extern void msvcrt_init_mt_locks(void);

4
dlls/msvcrt/msvcrt.spec
View File

@ -137,8 +137,8 @@
@ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadhandle() kernel32.GetCurrentThread
@ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __threadid() kernel32.GetCurrentThreadId
@ cdecl __toascii(long) MSVCRT___toascii @ cdecl __toascii(long) MSVCRT___toascii
@ cdecl __unDName(long str ptr ptr long) MSVCRT___unDName @ cdecl __unDName(ptr str long ptr ptr long) MSVCRT___unDName
@ cdecl __unDNameEx() MSVCRT___unDNameEx #FIXME @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) MSVCRT___unDNameEx
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv @ extern __wargv MSVCRT___wargv
@ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr)