[PATCH 1/1] Add type_info::name_internal_method() as alias for ::name()
Nikolay Sivov
nsivov at codeweavers.com
Mon Jan 31 13:47:06 CST 2011
---
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcr90/tests/msvcr90.c | 72 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 9080ba1..1fe9982 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -260,7 +260,7 @@
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K at Z(wstr wstr wstr long long) msvcrt._invalid_parameter
@ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *)
@ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64)
-@ stub -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::_name_internal_method(struct __type_info_node *)const
+@ thiscall -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z(ptr) msvcrt.?name at type_info@@QBEPBDXZ
@ stub -arch=win64 ?_name_internal_method at type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::_name_internal_method(struct __type_info_node * __ptr64)const __ptr64
@ varargs -arch=win32 ?_open@@YAHPBDHH at Z(str long) msvcrt._open
@ varargs -arch=win64 ?_open@@YAHPEBDHH at Z(str long) msvcrt._open
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 76c25e7..b21deaf 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -83,7 +83,7 @@
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K at Z(wstr wstr wstr long long) msvcrt._invalid_parameter
@ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *)
@ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64)
-@ stub -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::_name_internal_method(struct __type_info_node *)const
+@ thiscall -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z(ptr) msvcrt.?name at type_info@@QBEPBDXZ
@ stub -arch=win64 ?_name_internal_method at type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::_name_internal_method(struct __type_info_node * __ptr64)const __ptr64
@ varargs -arch=win32 ?_open@@YAHPBDHH at Z(str long) msvcrt._open
@ varargs -arch=win64 ?_open@@YAHPEBDHH at Z(str long) msvcrt._open
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 49b7139..d8809fe 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -83,7 +83,7 @@
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K at Z(wstr wstr wstr long long) msvcrt._invalid_parameter
@ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *)
@ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64)
-@ stub -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::_name_internal_method(struct __type_info_node *)const
+@ thiscall -arch=win32 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z(ptr) msvcrt.?name at type_info@@QBEPBDXZ
@ stub -arch=win64 ?_name_internal_method at type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::_name_internal_method(struct __type_info_node * __ptr64)const __ptr64
@ varargs -arch=win32 ?_open@@YAHPBDHH at Z(str long) msvcrt._open
@ varargs -arch=win64 ?_open@@YAHPEBDHH at Z(str long) msvcrt._open
diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c
index d4a7262..64b4145 100644
--- a/dlls/msvcr90/tests/msvcr90.c
+++ b/dlls/msvcr90/tests/msvcr90.c
@@ -79,6 +79,17 @@ static void* (__cdecl *p_realloc_crt)(void*, size_t);
static void* (__cdecl *p_malloc)(size_t);
static void (__cdecl *p_free)(void*);
+/* type info */
+typedef struct __type_info
+{
+ void *vtable;
+ char *name;
+ char mangled[16];
+} type_info;
+
+static char* (WINAPI *p_type_info_name_internal_method)(type_info*);
+static void (WINAPI *ptype_info_dtor)(type_info*);
+
static void* (WINAPI *pEncodePointer)(void *);
static int cb_called[4];
@@ -91,6 +102,36 @@ static inline int almost_equal_f(float f1, float f2)
/* ########## */
+/* thiscall emulation */
+/* Emulate a __thiscall */
+#ifdef _MSC_VER
+static inline void* do_call_func1(void *func, void *_this)
+{
+ volatile void* retval = 0;
+ __asm
+ {
+ push ecx
+ mov ecx, _this
+ call func
+ mov retval, eax
+ pop ecx
+ }
+ return (void*)retval;
+}
+#else
+static void* do_call_func1(void *func, void *_this)
+{
+ void *ret, *dummy;
+ __asm__ __volatile__ ("call *%2"
+ : "=a" (ret), "=c" (dummy)
+ : "g" (func), "1" (_this)
+ : "edx", "memory" );
+ return ret;
+}
+#endif
+
+#define call_func1(x,y) do_call_func1((void*)x,(void*)y)
+
static void __cdecl test_invalid_parameter_handler(const wchar_t *expression,
const wchar_t *function, const wchar_t *file,
unsigned line, uintptr_t arg)
@@ -786,6 +827,33 @@ if (0)
p_free(mem);
}
+#ifdef __i386__
+static void test_typeinfo(void)
+{
+ static type_info t1 = { NULL, NULL,{'.','?','A','V','t','e','s','t','1','@','@',0,0,0,0,0 } };
+ char *name;
+
+ if (!p_type_info_name_internal_method)
+ {
+ win_skip("public: char const * __thiscall type_info::_name_internal_method(struct \
+ __type_info_node *)const not supported\n");
+ return;
+ }
+
+ /* name */
+ t1.name = NULL;
+ name = call_func1(p_type_info_name_internal_method, &t1);
+ ok(name && t1.name && !strcmp(name, t1.name), "bad name '%s' for t1\n", name);
+
+ ok(t1.name && !strcmp(t1.name, "class test1"), "demangled to '%s' for t1\n", t1.name);
+ call_func1(ptype_info_dtor, &t1);
+}
+#else
+static void test_typeinfo(void)
+{
+}
+#endif
+
START_TEST(msvcr90)
{
HMODULE hcrt;
@@ -824,6 +892,9 @@ START_TEST(msvcr90)
p_realloc_crt = (void*) GetProcAddress(hcrt, "_realloc_crt");
p_malloc = (void*) GetProcAddress(hcrt, "malloc");
p_free = (void*)GetProcAddress(hcrt, "free");
+ p_type_info_name_internal_method = (void*)GetProcAddress(hcrt,
+ "?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z");
+ ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UAE at XZ");
hkernel32 = GetModuleHandleA("kernel32.dll");
pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer");
@@ -841,4 +912,5 @@ START_TEST(msvcr90)
test__sopen_s();
test__wsopen_s();
test__realloc_crt();
+ test_typeinfo();
}
--
1.5.6.5
--------------090806010709000303090808--
More information about the wine-patches
mailing list