André Hentschel : msvcr90/tests: Add more ARM forwards and use them in tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7ae776c26b767989a7f43d88a657f2f5b5e0b630
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7ae776c26b767989a7f43d88a6...

Author: André Hentschel <nerv(a)dawncrow.de>
Date:   Tue Aug 27 23:52:38 2013 +0200

msvcr90/tests: Add more ARM forwards and use them in tests.

---

 dlls/msvcr90/msvcr90.spec    |    5 +++++
 dlls/msvcr90/tests/msvcr90.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index d5eebb4..04fa199 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -28,6 +28,7 @@
 @ cdecl -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_typeid@@UEAA(a)XZ
 @ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) msvcrt.??1exception@@UAE(a)XZ
 @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ
+@ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ
 @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ
 @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ
 @ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) MSVCR90_operator_new
@@ -44,8 +45,10 @@
 @ cdecl -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0(a)AEBV0@@Z
 @ thiscall -arch=i386 ??4exception(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0(a)ABV0@@Z
 @ cdecl -arch=win64 ??4exception(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0(a)AEBV0@@Z
+@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z
 @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z
 @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z
+@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z
 @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z
 @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z
 @ extern ??_7__non_rtti_object(a)std@@6B@ msvcrt.??_7__non_rtti_object@@6B@
@@ -83,6 +86,7 @@
 @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K(a)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)
+@ cdecl -arch=arm ?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z
 @ thiscall -arch=i386 ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z
 @ cdecl -arch=win64 ?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z
 @ varargs -arch=win32 ?_open@@YAHPBDHH(a)Z(str long) msvcrt._open
@@ -111,6 +115,7 @@
 @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z
 @ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z  # public: char const * __thiscall type_info::name(struct __type_info_node *)const
 @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z  # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64
+@ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBAPBDXZ
 @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ
 @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ
 @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ(a)Z
diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c
index fa2b445..2a3124d 100644
--- a/dlls/msvcr90/tests/msvcr90.c
+++ b/dlls/msvcr90/tests/msvcr90.c
@@ -315,8 +315,13 @@ static BOOL init(void)
     }
     else
     {
+#ifdef __arm__
+        SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z");
+        SET(ptype_info_dtor, "??1type_info@@UAA(a)XZ");
+#else
         SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z");
         SET(ptype_info_dtor, "??1type_info@@UAE(a)XZ");
+#endif
     }
 
     hkernel32 = GetModuleHandleA("kernel32.dll");