Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67731: [CRT] Rename __CxxFrameHandler to __CxxFrameHandler3
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 22:30:48 2015 New Revision: 67731 URL: http://svn.reactos.org/svn/reactos?rev=67731&view=rev Log: [CRT] Rename __CxxFrameHandler to __CxxFrameHandler3 Modified: trunk/reactos/lib/sdk/crt/except/arm/ehandler.c Modified: trunk/reactos/lib/sdk/crt/except/arm/ehandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/eha… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/ehandler.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/ehandler.c [iso-8859-1] Thu May 14 22:30:48 2015 @@ -25,7 +25,7 @@ } DWORD -__CxxFrameHandler( +__CxxFrameHandler3( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* ExceptionRegistrationFrame, PCONTEXT context,

1 0

[tkreuzer] 67730: [MSVCRT] - Separate C++ exports per architecture, add ARM exports (that again have different mangling) - Add symbol aliases for ARM C++ exports - Compile in/out functions only on ...
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 21:53:15 2015 New Revision: 67730 URL: http://svn.reactos.org/svn/reactos?rev=67730&view=rev Log: [MSVCRT] - Separate C++ exports per architecture, add ARM exports (that again have different mangling) - Add symbol aliases for ARM C++ exports - Compile in/out functions only on x86 - Add some missing exports for non-x86 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/dll/win32/msvcrt/stubs.c trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec trunk/reactos/dll/win32/msvcrt40/stubs.c trunk/reactos/lib/sdk/crt/except/arm/cpp.s Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Thu May 14 21:53:15 2015 @@ -1,99 +1,179 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor -@ cdecl -arch=win64 -norelay ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor -@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor -@ cdecl -arch=win64 -norelay ??0__non_rtti_object@@QEAA@PEBD@Z(ptr) MSVCRT___non_rtti_object_ctor -@ cdecl -i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor -@ cdecl -arch=win64 -norelay ??0bad_cast@@AEAA@PEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor -@ cdecl -arch=win64 -norelay ??0bad_cast@@QEAA@AEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor -@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_copy_ctor -@ cdecl -arch=win64 -norelay ??0bad_cast@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor -@ cdecl -i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor_charptr -@ cdecl -arch=win64 -norelay ??0bad_cast@@QEAA@PEBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor -@ cdecl -arch=win64 -norelay ??0bad_typeid@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor -@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor -@ cdecl -arch=win64 -norelay ??0bad_typeid@@QEAA@PEBD@Z(ptr) MSVCRT_bad_typeid_ctor -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor -@ cdecl -arch=win64 -norelay ??0exception@@QEAA@AEBQEBD@Z(ptr) MSVCRT_exception_ctor -@ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) __thiscall_MSVCRT_exception_ctor_noalloc -@ cdecl -arch=win64 -norelay ??0exception@@QEAA@AEBQEBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc -@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor -@ cdecl -arch=win64 -norelay ??0exception@@QEAA@AEBV0@@Z(ptr) MSVCRT_exception_copy_ctor -@ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor -@ cdecl -arch=win64 -norelay ??0exception@@QEAA@XZ() MSVCRT_exception_default_ctor -@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor -@ cdecl -arch=win64 -norelay ??1__non_rtti_object@@UEAA@XZ() MSVCRT___non_rtti_object_dtor -@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor -@ cdecl -arch=win64 -norelay ??1bad_cast@@UEAA@XZ() MSVCRT_bad_cast_dtor -@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor -@ cdecl -arch=win64 -norelay ??1bad_typeid@@UEAA@XZ() MSVCRT_bad_typeid_dtor -@ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor -@ cdecl -arch=win64 -norelay ??1exception@@UEAA@XZ() MSVCRT_exception_dtor -@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor -@ cdecl -arch=win64 -norelay ??1type_info@@UEAA@XZ() MSVCRT_type_info_dtor -@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new -@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new -# @ cdecl ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg -@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete -@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals -@ cdecl -arch=win64 -norelay ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_opequals -@ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals -@ cdecl -arch=win64 -norelay ??4bad_cast@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_cast_opequals -@ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals -@ cdecl -arch=win64 -norelay ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_typeid_opequals -@ cdecl -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_opequals -@ cdecl -arch=win64 -norelay ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_exception_opequals -@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opequals_equals -@ cdecl -arch=win64 -norelay ??8type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opequals_equals -@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opnot_equals -@ cdecl -arch=win64 -norelay ??9type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opnot_equals -@ extern ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable -@ extern ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable -@ extern ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable -@ cdecl -i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_vector_dtor -@ cdecl -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_vector_dtor -@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_vector_dtor -@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_vector_dtor -@ cdecl -i386 -norelay ??_Fbad_cast@@QAEXXZ() __thiscall_MSVCRT_bad_cast_default_ctor -@ cdecl -arch=win64 -norelay ??_Fbad_cast@@QEAAXXZ() MSVCRT_bad_cast_default_ctor -@ cdecl -i386 -norelay ??_Fbad_typeid@@QAEXXZ() __thiscall_MSVCRT_bad_typeid_default_ctor -@ cdecl -arch=win64 -norelay ??_Fbad_typeid@@QEAAXXZ() -@ cdecl -i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_scalar_dtor -@ cdecl -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_scalar_dtor -@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_scalar_dtor -@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_scalar_dtor -@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new -@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new -# @ cdecl ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg -@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete -@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ cdecl -norelay __uncaught_exception(ptr) -@ cdecl -arch=win32 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler -@ cdecl -arch=win64 -norelay ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler -@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode -@ cdecl -arch=win32 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler -@ cdecl -arch=win64 -norelay ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler -@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode -@ cdecl -arch=win32 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator -@ cdecl -arch=win64 -norelay ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator -@ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before -@ cdecl -arch=win64 -norelay ?before@type_info@@QEBAHAEBV1@@Z(ptr) MSVCRT_type_info_before -@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name -@ cdecl -arch=win64 -norelay ?name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_name -@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_raw_name -@ cdecl -arch=win64 -norelay ?raw_name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_raw_name -@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler -@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate -@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected -@ cdecl ?terminate@@YAXXZ() MSVCRT_terminate -@ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected -@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception -@ cdecl -arch=x86_64 -stub -norelay ?what@exception@@UEBAPEBDXZ() __thiscall_MSVCRT_what_exception +# **************** x86 C++ functions **************** +@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) +@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(char const *) +@ cdecl -i386 -norelay ??0bad_cast@@AAE@PBQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor # private: __thiscall bad_cast::bad_cast(char const * const *) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor # public: __thiscall bad_cast::bad_cast(char const * const &) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_copy_ctor # public: __thiscall bad_cast::bad_cast(class bad_cast const &) +@ cdecl -i386 -norelay ??0bad_cast@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor_charptr # public: __thiscall bad_cast::bad_cast(char const *) +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor # public: __thiscall bad_typeid::bad_typeid(class bad_typeid const &) +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor # public: __thiscall bad_typeid::bad_typeid(char const *) +@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor # public: __thiscall exception::exception(char const * const &) +@ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) __thiscall_MSVCRT_exception_ctor_noalloc # public: __thiscall exception::exception(char const * const &,int) +@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor # public: __thiscall exception::exception(class exception const &) +@ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor # public: __thiscall exception::exception(void) +@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor # public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void) +@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor # public: virtual __thiscall bad_cast::~bad_cast(void) +@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor # public: virtual __thiscall bad_typeid::~bad_typeid(void) +@ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor # public: virtual __thiscall exception::~exception(void) +@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor # public: virtual __thiscall type_info::~type_info(void) +@ cdecl -i386 ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int) +;@ cdecl -i386 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int) +@ cdecl -i386 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *) +@ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __thiscall __non_rtti_object::operator=(class __non_rtti_object const &) +@ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals # public: class bad_cast & __thiscall bad_cast::operator=(class bad_cast const &) +@ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals # public: class bad_typeid & __thiscall bad_typeid::operator=(class bad_typeid const &) +@ cdecl -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_opequals # public: class exception & __thiscall exception::operator=(class exception const &) +@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opequals_equals # public: int __thiscall type_info::operator==(class type_info const &)const +@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opnot_equals # public: int __thiscall type_info::operator!=(class type_info const &)const +@ extern -i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' +@ extern -i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' +@ extern -i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' +@ extern -i386 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' +@ cdecl -i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_vector_dtor # public: virtual void * __thiscall __non_rtti_object::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_vector_dtor # public: virtual void * __thiscall bad_cast::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_vector_dtor # public: virtual void * __thiscall bad_typeid::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_vector_dtor # public: virtual void * __thiscall exception::`vector deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Fbad_cast@@QAEXXZ() __thiscall_MSVCRT_bad_cast_default_ctor # public: void __thiscall bad_cast::`default constructor closure'(void) +@ cdecl -i386 -norelay ??_Fbad_typeid@@QAEXXZ() __thiscall_MSVCRT_bad_typeid_default_ctor # public: void __thiscall bad_typeid::`default constructor closure'(void) +@ cdecl -i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_scalar_dtor # public: virtual void * __thiscall __non_rtti_object::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_scalar_dtor # public: virtual void * __thiscall bad_cast::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_scalar_dtor # public: virtual void * __thiscall bad_typeid::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_scalar_dtor # public: virtual void * __thiscall exception::`scalar deleting destructor'(unsigned int) +@ cdecl -i386 ??_U@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new[](unsigned int) +;@ cdecl -i386 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int) +@ cdecl -i386 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void *) +@ cdecl -i386 -norelay __uncaught_exception(ptr) +@ cdecl -i386 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) +@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void) +@ cdecl -i386 -norelay ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) +@ cdecl -i386 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) +@ cdecl -i386 -norelay ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) +@ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before # public: int __thiscall type_info::before(class type_info const &)const +@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name # public: char const * __thiscall type_info::name(void)const +@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_raw_name # public: char const * __thiscall type_info::raw_name(void)const +@ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void) +@ cdecl -i386 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) +@ cdecl -i386 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) +@ cdecl -i386 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) +@ cdecl -i386 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) +@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception # public: virtual char const * __thiscall exception::what(void)const + +# **************** win64 C++ functions **************** +@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@PEBD@Z(ptr) MSVCRT___non_rtti_object_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(char const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@AEAA@PEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * __ptr64 const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBQEBD@Z(ptr) MSVCRT_bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const * __ptr64 const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_cast@@QEAA@PEBD@Z(ptr) MSVCRT_bad_cast_ctor_charptr # public: __cdecl bad_cast::bad_cast(char const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_typeid@@QEAA@AEBV0@@Z(ptr) MSVCRT_bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0bad_typeid@@QEAA@PEBD@Z(ptr) MSVCRT_bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const * __ptr64) __ptr64 +@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBD@Z(ptr) MSVCRT_exception_ctor # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBDH@Z(ptr long) MSVCRT_exception_ctor_noalloc # public: __cdecl exception::exception(char const * __ptr64 const & __ptr64,int) __ptr64 +@ cdecl -arch=win64 ??0exception@@QEAA@AEBV0@@Z(ptr) MSVCRT_exception_copy_ctor # public: __cdecl exception::exception(class exception const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??0exception@@QEAA@XZ() MSVCRT_exception_default_ctor # public: __cdecl exception::exception(void) __ptr64 +@ cdecl -arch=win64 ??1__non_rtti_object@@UEAA@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) __ptr64 +@ cdecl -arch=win64 ??1bad_cast@@UEAA@XZ() MSVCRT_bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void) __ptr64 +@ cdecl -arch=win64 ??1bad_typeid@@UEAA@XZ() MSVCRT_bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void) __ptr64 +@ cdecl -arch=win64 ??1exception@@UEAA@XZ() MSVCRT_exception_dtor # public: virtual __cdecl exception::~exception(void) __ptr64 +@ cdecl -arch=win64 ??1type_info@@UEAA@XZ() MSVCRT_type_info_dtor # public: virtual __cdecl type_info::~type_info(void) __ptr64 +@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # void * __ptr64 __cdecl operator new(unsigned __int64) +@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void * __ptr64) +@ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __ptr64 __cdecl __non_rtti_object::operator=(class __non_rtti_object const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??4bad_cast@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_cast_opequals # public: class bad_cast & __ptr64 __cdecl bad_cast::operator=(class bad_cast const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_bad_typeid_opequals # public: class bad_typeid & __ptr64 __cdecl bad_typeid::operator=(class bad_typeid const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr) MSVCRT_exception_opequals # public: class exception & __ptr64 __cdecl exception::operator=(class exception const & __ptr64) __ptr64 +@ cdecl -arch=win64 ??8type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const & __ptr64)const __ptr64 +@ cdecl -arch=win64 ??9type_info@@QEBAHAEBV0@@Z(ptr) MSVCRT_type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const & __ptr64)const __ptr64 +@ extern -arch=win64 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' +@ extern -arch=win64 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' +@ extern -arch=win64 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' +@ extern -arch=win64 ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' +@ cdecl -arch=win64 ??_Fbad_cast@@QEAAXXZ() MSVCRT_bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void) __ptr64 +@ cdecl -arch=win64 ??_Fbad_typeid@@QEAAXXZ() MSVCRT_bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void) __ptr64 +@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new # void * __ptr64 __cdecl operator new[](unsigned __int64) +@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete[](void * __ptr64) +@ cdecl -arch=win64 __uncaught_exception(ptr) +@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned __int64) +@ cdecl -arch=win64 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode # int __cdecl _query_new_mode(void) +@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned __int64)))(unsigned __int64) +@ cdecl -arch=win64 ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) +@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64) +@ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr) MSVCRT_type_info_before # public: int __cdecl type_info::before(class type_info const & __ptr64)const __ptr64 +@ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_name # public: char const * __ptr64 __cdecl type_info::name(void)const __ptr64 +@ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ() MSVCRT_type_info_raw_name # public: char const * __ptr64 __cdecl type_info::raw_name(void)const __ptr64 +@ cdecl -arch=win64 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler # void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void) +@ cdecl -arch=win64 ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) +@ cdecl -arch=win64 ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) +@ cdecl -arch=win64 ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) +@ cdecl -arch=win64 ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) +@ cdecl -arch=win64 -stub ?what@exception@@UEBAPEBDXZ() MSVCRT_what_exception # public: virtual char const * __ptr64 __cdecl exception::what(void)const __ptr64 + +# **************** ARM C++ functions **************** +@ cdecl -arch=arm ??0__non_rtti_object@@QAA@ABV0@@Z() MSVCRT___non_rtti_object_copy_ctor # public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) +@ cdecl -arch=arm ??0__non_rtti_object@@QAA@PBD@Z() MSVCRT___non_rtti_object_ctor #public: __cdecl __non_rtti_object::__non_rtti_object(char const *) +@ cdecl -arch=arm ??0bad_cast@@AAA@PBQBD@Z() MSVCRT_bad_cast_ctor # private: __cdecl bad_cast::bad_cast(char const * const *) +@ cdecl -arch=arm ??0bad_cast@@QAA@ABV0@@Z() MSVCRT_bad_cast_copy_ctor # public: __cdecl bad_cast::bad_cast(class bad_cast const &) +@ cdecl -arch=arm ??0bad_cast@@QAA@PBD@Z() MSVCRT_bad_cast_ctor # public: __cdecl bad_cast::bad_cast(char const *) +@ cdecl -arch=arm ??0bad_typeid@@QAA@ABV0@@Z() MSVCRT_bad_typeid_copy_ctor # public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &) +@ cdecl -arch=arm ??0bad_typeid@@QAA@PBD@Z() MSVCRT_bad_typeid_ctor # public: __cdecl bad_typeid::bad_typeid(char const *) +@ cdecl -arch=arm ??0exception@@QAA@ABQBD@Z() MSVCRT_exception_ctor # public: __cdecl exception::exception(char const * const &) +@ cdecl -arch=arm ??0exception@@QAA@ABQBDH@Z() MSVCRT_exception_ctor_noalloc # public: __cdecl exception::exception(char const * const &,int) +@ cdecl -arch=arm ??0exception@@QAA@ABV0@@Z() MSVCRT_exception_copy_ctor # public: __cdecl exception::exception(class exception const &) +@ cdecl -arch=arm ??0exception@@QAA@XZ() MSVCRT_exception_default_ctor # public: __cdecl exception::exception(void) +@ cdecl -arch=arm ??1__non_rtti_object@@UAA@XZ() MSVCRT___non_rtti_object_dtor # public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) +@ cdecl -arch=arm ??1bad_cast@@UAA@XZ() MSVCRT_bad_cast_dtor # public: virtual __cdecl bad_cast::~bad_cast(void) +@ cdecl -arch=arm ??1bad_typeid@@UAA@XZ() MSVCRT_bad_typeid_dtor # public: virtual __cdecl bad_typeid::~bad_typeid(void) +@ cdecl -arch=arm ??1exception@@UAA@XZ() MSVCRT_exception_dtor # public: virtual __cdecl exception::~exception(void) +@ cdecl -arch=arm ??1type_info@@UAA@XZ() MSVCRT_type_info_dtor # public: virtual __cdecl type_info::~type_info(void) +@ cdecl -arch=arm ??2@YAPAXI@Z() MSVCRT_operator_new # void * __cdecl operator new(unsigned int) +@ cdecl -arch=arm ??2@YAPAXIHPBDH@Z() MSVCRT_operator_new_dbg # void * __cdecl operator new(unsigned int,int,char const *,int) +@ cdecl -arch=arm ??3@YAXPAX@Z() MSVCRT_operator_delete # void __cdecl operator delete(void *) +@ cdecl -arch=arm ??4__non_rtti_object@@QAAAAV0@ABV0@@Z() MSVCRT___non_rtti_object_opequals # public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &) +@ cdecl -arch=arm ??4bad_cast@@QAAAAV0@ABV0@@Z() MSVCRT_bad_cast_opequals # public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &) +@ cdecl -arch=arm ??4bad_typeid@@QAAAAV0@ABV0@@Z() MSVCRT_bad_typeid_opequals # public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &) +@ cdecl -arch=arm ??4exception@@QAAAAV0@ABV0@@Z() MSVCRT_exception_opequals # public: class exception & __cdecl exception::operator=(class exception const &) +@ cdecl -arch=arm ??8type_info@@QBAHABV0@@Z() MSVCRT_type_info_opequals_equals # public: int __cdecl type_info::operator==(class type_info const &)const +@ cdecl -arch=arm ??9type_info@@QBAHABV0@@Z() MSVCRT_type_info_opnot_equals # public: int __cdecl type_info::operator!=(class type_info const &)const +@ extern -arch=arm ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable # const __non_rtti_object::`vftable' +@ extern -arch=arm ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable # const bad_cast::`vftable' +@ extern -arch=arm ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable # const bad_typeid::`vftable' +@ extern -arch=arm ??_7exception@@6B@ MSVCRT_exception_vtable # const exception::`vftable' +@ cdecl -arch=arm ??_Fbad_cast@@QAAXXZ() MSVCRT_bad_cast_default_ctor # public: void __cdecl bad_cast::`default constructor closure'(void) +@ cdecl -arch=arm ??_Fbad_typeid@@QAAXXZ() MSVCRT_bad_typeid_default_ctor # public: void __cdecl bad_typeid::`default constructor closure'(void) +@ cdecl -arch=arm ??_U@YAPAXI@Z() MSVCRT_operator_new # void * __cdecl operator new[](unsigned int) +@ cdecl -arch=arm ??_U@YAPAXIHPBDH@Z() MSVCRT_operator_new_dbg # void * __cdecl operator new[](unsigned int,int,char const *,int) +@ cdecl -arch=arm ??_V@YAXPAX@Z() MSVCRT_operator_delete # void __cdecl operator delete[](void *) +;@ cdecl -arch=arm _CallMemberFunction0() +;@ cdecl -arch=arm _CallMemberFunction1() +;@ cdecl -arch=arm _CallMemberFunction2() +;@ cdecl -arch=arm __ExceptionPtrAssign() +;@ cdecl -arch=arm __ExceptionPtrCompare() +;@ cdecl -arch=arm __ExceptionPtrCopy() +;@ cdecl -arch=arm __ExceptionPtrCopyException() +;@ cdecl -arch=arm __ExceptionPtrCreate() +;@ cdecl -arch=arm __ExceptionPtrCurrentException() +;@ cdecl -arch=arm __ExceptionPtrDestroy() +;@ cdecl -arch=arm __ExceptionPtrRethrow() +;@ cdecl -arch=arm __ExceptionPtrSwap() +;@ cdecl -arch=arm __ExceptionPtrToBool() +@ cdecl -arch=arm __uncaught_exception() +@ cdecl -arch=arm ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) +@ cdecl -arch=arm ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z() MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) +@ cdecl -arch=arm ?_set_new_mode@@YAHH@Z() MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) +@ cdecl -arch=arm ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z() MSVCRT__set_se_translator # void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) +@ cdecl -arch=arm ?before@type_info@@QBAHABV1@@Z() MSVCRT_type_info_before# public: int __cdecl type_info::before(class type_info const &)const +@ cdecl -arch=arm ?name@type_info@@QBAPBDXZ() MSVCRT_type_info_name # public: char const * __cdecl type_info::name(void)const +@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ() MSVCRT_type_info_raw_name # public: char const * __cdecl type_info::raw_name(void)const +@ cdecl -arch=arm ?set_terminate@@YAP6AXXZP6AXXZ@Z() MSVCRT_set_terminate # void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) +@ cdecl -arch=arm ?set_unexpected@@YAP6AXXZP6AXXZ@Z() MSVCRT_set_unexpected # void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) +@ cdecl -arch=arm ?terminate@@YAXXZ() MSVCRT_terminate # void __cdecl terminate(void) +@ cdecl -arch=arm ?unexpected@@YAXXZ() MSVCRT_unexpected # void __cdecl unexpected(void) +@ cdecl -arch=arm ?what@exception@@UBAPBDXZ() MSVCRT_what_exception # public: virtual char const * __cdecl exception::what(void)const + + +# **************** Common functions **************** @ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @@ -119,7 +199,7 @@ @ extern _HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) @ cdecl __CppXcptFilter(long ptr) # stub __CxxCallUnwindDtor # stub __CxxCallUnwindVecDtor @@ -127,6 +207,7 @@ # stub __CxxExceptionFilter @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl -i386 __CxxQueryExceptionSize() # stub -i386 __CxxRegisterExceptionObject @@ -252,16 +333,18 @@ @ cdecl _chdir(str) @ cdecl _chdrive(long) @ cdecl _chgsign(double) +@ cdecl -arch=x86_64,arm _chgsignf(long) @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) -@ cdecl _clearfp() +@ cdecl -arch=i386,x86_64 _clearfp() @ cdecl _close(long) @ cdecl _commit(long) @ extern _commode -@ cdecl _control87(long long) +@ cdecl -arch=i386,x86_64 _control87(long long) @ cdecl _controlfp(long long) @ cdecl _copysign( double double ) +@ cdecl -arch=x86_64,arm _copysignf(long long) @ varargs _cprintf(str) @ cdecl _cputs(str) # stub _cputws @@ -359,6 +442,7 @@ @ cdecl _heapused(ptr ptr) @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) +@ cdecl -arch=x86_64,arm _hypotf(long long) @ cdecl _i64toa(long long ptr long) @ cdecl _i64tow(long long ptr long) @ cdecl _initterm(ptr ptr) @@ -489,9 +573,9 @@ @ cdecl _open_osfhandle(long long) @ extern _osplatform @ extern _osver -@ cdecl _outp(long long) MSVCRT__outp -@ cdecl _outpd(long long) MSVCRT__outpd -@ cdecl _outpw(long long) MSVCRT__outpw +@ cdecl -arch=i386 _outp(long long) MSVCRT__outp +@ cdecl -arch=i386 _outpd(long long) MSVCRT__outpd +@ cdecl -arch=i386 _outpw(long long) MSVCRT__outpw @ cdecl _pclose(ptr) @ extern _pctype @ extern _pgmptr @@ -525,7 +609,7 @@ @ cdecl _set_error_mode(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) -@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) +@ cdecl -norelay _setjmp(ptr) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) @ cdecl -arch=x86_64 -norelay _setjmpex(ptr ptr) @ cdecl _setmaxstdio(long) @@ -690,10 +774,14 @@ @ cdecl abort() @ cdecl abs(long) @ cdecl acos(double) +@ cdecl -arch=x86_64,arm acosf(long) @ cdecl asctime(ptr) @ cdecl asin(double) +@ cdecl -arch=x86_64,arm asinf(long) @ cdecl atan(double) @ cdecl atan2(double double) +@ cdecl -arch=x86_64,arm atan2f(long) +@ cdecl -arch=x86_64,arm atanf(long) @ extern atexit # <-- keep this as an extern, thank you @ cdecl atof(str) @ cdecl atoi(str) @@ -701,18 +789,21 @@ @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) @ cdecl ceil(double) -@ cdecl -arch=x86_64 ceilf(double) +@ cdecl -arch=x86_64,arm ceilf(long) @ cdecl clearerr(ptr) @ cdecl clock() @ cdecl cos(double) -@ cdecl -arch=x86_64 cosf(double) +@ cdecl -arch=x86_64,arm cosf(long) @ cdecl cosh(double) +@ cdecl -arch=x86_64,arm coshf(long) @ cdecl ctime(ptr) @ cdecl difftime(long long) @ cdecl div(long long) @ cdecl exit(long) @ cdecl exp(double) +@ cdecl -arch=x86_64,arm expf(long) @ cdecl fabs(double) +@ cdecl -arch=arm fabsf(double) @ cdecl fclose(ptr) @ cdecl feof(ptr) @ cdecl ferror(ptr) @@ -723,9 +814,9 @@ @ cdecl fgetwc(ptr) @ cdecl fgetws(ptr long ptr) @ cdecl floor(double) -@ cdecl -arch=x86_64 floorf(long) +@ cdecl -arch=x86_64,arm floorf(long) @ cdecl fmod(double double) -@ cdecl -arch=x86_64 fmodf(long) +@ cdecl -arch=x86_64,arm fmodf(long) @ cdecl fopen(str str) @ varargs fprintf(ptr str) @ cdecl fputc(long ptr) @@ -783,8 +874,9 @@ @ cdecl localtime(ptr) @ cdecl log(double) @ cdecl log10(double) -@ cdecl -arch=x86_64 logf(double) -@ cdecl -i386 longjmp(ptr long) +@ cdecl -arch=x86_64,arm log10f(long) +@ cdecl -arch=x86_64,arm logf(long) +@ cdecl longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) @@ -796,9 +888,10 @@ @ cdecl memset(ptr long long) @ cdecl mktime(ptr) @ cdecl modf(double ptr) +@ cdecl -arch=x86_64,arm modff(long ptr) @ cdecl perror(str) @ cdecl pow(double double) -@ cdecl -arch=x86_64 powf(long) +@ cdecl -arch=x86_64,arm powf(long) @ varargs printf(str) @ cdecl putc(long ptr) @ cdecl putchar(long) @@ -814,16 +907,17 @@ @ cdecl rewind(ptr) @ varargs scanf(str) @ cdecl setbuf(ptr ptr) -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr ptr) _setjmp +@ cdecl -arch=x86_64,arm -norelay setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) @ cdecl signal(long long) @ cdecl sin(double) -@ cdecl -arch=x86_64 sinf(long) +@ cdecl -arch=x86_64,arm sinf(long) @ cdecl sinh(double) +@ cdecl -arch=x86_64,arm sinhf(long) @ varargs sprintf(ptr str) @ cdecl sqrt(double) -@ cdecl -arch=x86_64 sqrtf(long) +@ cdecl -arch=x86_64,arm sqrtf(long) @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) @@ -851,7 +945,9 @@ @ varargs swscanf(wstr wstr) @ cdecl system(str) @ cdecl tan(double) +@ cdecl -arch=x86_64,arm tanf(long) @ cdecl tanh(double) +@ cdecl -arch=x86_64,arm tanhf(long) @ cdecl time(ptr) @ cdecl tmpfile() @ cdecl tmpnam(ptr) Modified: trunk/reactos/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/stubs.c [iso-8859-1] Thu May 14 21:53:15 2015 @@ -47,6 +47,7 @@ return( 0 ); } +#ifdef _M_IX86 int MSVCRT__inp( unsigned short port) { @@ -86,3 +87,4 @@ { return _outpd(port, dataword); } +#endif Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Thu May 14 21:53:15 2015 @@ -227,7 +227,7 @@ @ stub ??_Gstrstream@@UAEPAXI@Z # @ stub ??_Gstrstreambuf@@UAEPAXI@Z # @ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler -@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode +@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler @ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator @@ -544,7 +544,7 @@ @ cdecl _close(long) @ cdecl _commit(long) @ extern _commode -@ cdecl _control87(long long) +@ cdecl -arch=i386,x86_64 _control87(long long) @ cdecl _controlfp(long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) @@ -768,7 +768,7 @@ @ cdecl _searchenv(str str ptr) @ stdcall -i386 __seh_longjmp_unwind@4(ptr) _seh_longjmp_unwind @ cdecl _seterrormode(long) -@ cdecl -i386 _setjmp(ptr) +@ cdecl _setjmp(ptr) @ cdecl -i386 _setjmp3(ptr long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) @@ -1024,7 +1024,7 @@ @ cdecl localtime(ptr) @ cdecl log(double) @ cdecl log10(double) -@ cdecl -i386 longjmp(ptr long) +@ cdecl longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Thu May 14 21:53:15 2015 @@ -265,7 +265,7 @@ @ stub ??_Gstrstream@@UAEPAXI@Z @ stub ??_Gstrstreambuf@@UAEPAXI@Z @ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler -@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode +@ cdecl -i386 ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler @ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator @@ -407,7 +407,7 @@ @ stub ?seekp@ostream@@QAEAAV1@J@Z @ stub ?seekp@ostream@@QAEAAV1@JW4seek_dir@ios@@@Z @ stub ?seekpos@streambuf@@UAEJJH@Z -@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler +@ cdecl -i386 ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected @ stub ?setb@streambuf@@IAEXPAD0H@Z @@ -596,7 +596,7 @@ @ cdecl _close(long) @ cdecl _commit(long) @ extern _commode -@ cdecl _control87(long long) +@ cdecl -arch=i386,x86_64 _control87(long long) @ cdecl _controlfp(long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) @@ -833,7 +833,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) @ cdecl _set_error_mode(long) @ cdecl _seterrormode(long) -@ cdecl -i386 _setjmp(ptr) +@ cdecl _setjmp(ptr) @ cdecl -i386 _setjmp3(ptr long) @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @@ -1062,7 +1062,7 @@ @ cdecl localtime(ptr) @ cdecl log(double) @ cdecl log10(double) -@ cdecl -i386 longjmp(ptr long) +@ cdecl longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) Modified: trunk/reactos/dll/win32/msvcrt40/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/stubs.c [iso-8859-1] Thu May 14 21:53:15 2015 @@ -2,6 +2,8 @@ #undef UNIMPLEMENTED #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) + +#ifdef _M_IX86 int MSVCRT__inp( unsigned short port) @@ -42,6 +44,7 @@ { return _outpd(port, dataword); } +#endif // _M_IX86 size_t _heapused( size_t *pUsed, size_t *pCommit ) { Modified: trunk/reactos/lib/sdk/crt/except/arm/cpp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/cpp… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/cpp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/cpp.s [iso-8859-1] Thu May 14 21:53:15 2015 @@ -15,62 +15,55 @@ MACRO DEFINE_ALIAS $FuncName, $Target - IMPORT $Target - NESTED_ENTRY $FuncName - b $Target - NESTED_END $FuncName + LCLS _FuncName + LCLS _Target +_FuncName SETS "|$FuncName|" +_Target SETS "|$Target|" + IMPORT $_FuncName, WEAK $_Target MEND - DEFINE_ALIAS ??0exception@@QAE@ABQBD@Z, MSVCRT_exception_ctor - DEFINE_ALIAS ??0exception@@QAE@ABQBDH@Z, MSVCRT_exception_ctor_noalloc - DEFINE_ALIAS ??0exception@@QAE@ABV0@@Z, MSVCRT_exception_copy_ctor - DEFINE_ALIAS ??0exception@@QAE@XZ, MSVCRT_exception_default_ctor - DEFINE_ALIAS ??1exception@@UAE@XZ, MSVCRT_exception_dtor - DEFINE_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, MSVCRT_exception_opequals - DEFINE_ALIAS ??_Eexception@@UAEPAXI@Z, MSVCRT_exception_vector_dtor - DEFINE_ALIAS ??_Gexception@@UAEPAXI@Z, MSVCRT_exception_scalar_dtor - DEFINE_ALIAS ?what@exception@@UBEPBDXZ, MSVCRT_what_exception - DEFINE_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, MSVCRT_bad_typeid_copy_ctor - DEFINE_ALIAS ??0bad_typeid@@QAE@PBD@Z, MSVCRT_bad_typeid_ctor - DEFINE_ALIAS ??_Fbad_typeid@@QAEXXZ, MSVCRT_bad_typeid_default_ctor - DEFINE_ALIAS ??1bad_typeid@@UAE@XZ, MSVCRT_bad_typeid_dtor - DEFINE_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, MSVCRT_bad_typeid_opequals - DEFINE_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_vector_dtor - DEFINE_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_scalar_dtor - DEFINE_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, MSVCRT___non_rtti_object_copy_ctor - DEFINE_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, MSVCRT___non_rtti_object_ctor - DEFINE_ALIAS ??1__non_rtti_object@@UAE@XZ, MSVCRT___non_rtti_object_dtor - DEFINE_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, MSVCRT___non_rtti_object_opequals - DEFINE_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_vector_dtor - DEFINE_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_scalar_dtor - DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, MSVCRT_bad_cast_ctor - DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, MSVCRT_bad_cast_ctor - DEFINE_ALIAS ??0bad_cast@@QAE@ABV0@@Z, MSVCRT_bad_cast_copy_ctor - DEFINE_ALIAS ??0bad_cast@@QAE@PBD@Z, MSVCRT_bad_cast_ctor_charptr - DEFINE_ALIAS ??_Fbad_cast@@QAEXXZ, MSVCRT_bad_cast_default_ctor - DEFINE_ALIAS ??1bad_cast@@UAE@XZ, MSVCRT_bad_cast_dtor - DEFINE_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, MSVCRT_bad_cast_opequals - DEFINE_ALIAS ??_Ebad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_vector_dtor - DEFINE_ALIAS ??_Gbad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_scalar_dtor - DEFINE_ALIAS ??8type_info@@QBEHABV0@@Z, MSVCRT_type_info_opequals_equals - DEFINE_ALIAS ??9type_info@@QBEHABV0@@Z, MSVCRT_type_info_opnot_equals - DEFINE_ALIAS ?before@type_info@@QBEHABV1@@Z, MSVCRT_type_info_before - DEFINE_ALIAS ??1type_info@@UAE@XZ, MSVCRT_type_info_dtor - DEFINE_ALIAS ?name@type_info@@QBEPBDXZ, MSVCRT_type_info_name - DEFINE_ALIAS ?raw_name@type_info@@QBEPBDXZ, MSVCRT_type_info_raw_name - - DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete - DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new - DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler - DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler - DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler - DEFINE_ALIAS ?_query_new_mode@@YAHXZ, MSVCRT__query_new_mode - DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode - DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator - DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate - DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected - DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate - DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected + DEFINE_ALIAS ??0__non_rtti_object@@QAA@ABV0@@Z, MSVCRT___non_rtti_object_copy_ctor + DEFINE_ALIAS ??0__non_rtti_object@@QAA@PBD@Z, MSVCRT___non_rtti_object_ctor + DEFINE_ALIAS ??0bad_cast@@AAA@PBQBD@Z, MSVCRT_bad_cast_ctor // private: __cdecl bad_cast::bad_cast(char const * const *) + DEFINE_ALIAS ??0bad_cast@@QAA@ABV0@@Z, MSVCRT_bad_cast_copy_ctor // public: __cdecl bad_cast::bad_cast(class bad_cast const &) + DEFINE_ALIAS ??0bad_cast@@QAA@PBD@Z, MSVCRT_bad_cast_ctor // public: __cdecl bad_cast::bad_cast(char const *) + DEFINE_ALIAS ??0bad_typeid@@QAA@ABV0@@Z, MSVCRT_bad_typeid_copy_ctor // public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &) + DEFINE_ALIAS ??0bad_typeid@@QAA@PBD@Z, MSVCRT_bad_typeid_ctor // public: __cdecl bad_typeid::bad_typeid(char const *) + DEFINE_ALIAS ??0exception@@QAA@ABQBD@Z, MSVCRT_exception_ctor // public: __cdecl exception::exception(char const * const &) + DEFINE_ALIAS ??0exception@@QAA@ABQBDH@Z, MSVCRT_exception_ctor_noalloc // public: __cdecl exception::exception(char const * const &,int) + DEFINE_ALIAS ??0exception@@QAA@ABV0@@Z, MSVCRT_exception_copy_ctor // public: __cdecl exception::exception(class exception const &) + DEFINE_ALIAS ??0exception@@QAA@XZ, MSVCRT_exception_default_ctor // public: __cdecl exception::exception(void) + DEFINE_ALIAS ??1__non_rtti_object@@UAA@XZ, MSVCRT___non_rtti_object_dtor // public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) + DEFINE_ALIAS ??1bad_cast@@UAA@XZ, MSVCRT_bad_cast_dtor // public: virtual __cdecl bad_cast::~bad_cast(void) + DEFINE_ALIAS ??1bad_typeid@@UAA@XZ, MSVCRT_bad_typeid_dtor // public: virtual __cdecl bad_typeid::~bad_typeid(void) + DEFINE_ALIAS ??1exception@@UAA@XZ, MSVCRT_exception_dtor // public: virtual __cdecl exception::~exception(void) + DEFINE_ALIAS ??1type_info@@UAA@XZ, MSVCRT_type_info_dtor // public: virtual __cdecl type_info::~type_info(void) + DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new // void * __cdecl operator new(unsigned int) + DEFINE_ALIAS ??2@YAPAXIHPBDH@Z, MSVCRT_operator_new_dbg // void * __cdecl operator new(unsigned int,int,char const *,int) + DEFINE_ALIAS ??3@YAXPAX@Z, MSVCRT_operator_delete // void __cdecl operator delete(void *) + DEFINE_ALIAS ??4__non_rtti_object@@QAAAAV0@ABV0@@Z, MSVCRT___non_rtti_object_opequals // public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &) + DEFINE_ALIAS ??4bad_cast@@QAAAAV0@ABV0@@Z, MSVCRT_bad_cast_opequals // public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &) + DEFINE_ALIAS ??4bad_typeid@@QAAAAV0@ABV0@@Z, MSVCRT_bad_typeid_opequals // public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &) + DEFINE_ALIAS ??4exception@@QAAAAV0@ABV0@@Z, MSVCRT_exception_opequals // public: class exception & __cdecl exception::operator=(class exception const &) + DEFINE_ALIAS ??8type_info@@QBAHABV0@@Z, MSVCRT_type_info_opequals_equals // public: int __cdecl type_info::operator==(class type_info const &)const + DEFINE_ALIAS ??9type_info@@QBAHABV0@@Z, MSVCRT_type_info_opnot_equals // public: int __cdecl type_info::operator!=(class type_info const &)const + DEFINE_ALIAS ??_Fbad_cast@@QAAXXZ, MSVCRT_bad_cast_default_ctor // public: void __cdecl bad_cast::`default constructor closure'(void) + DEFINE_ALIAS ??_Fbad_typeid@@QAAXXZ, MSVCRT_bad_typeid_default_ctor // public: void __cdecl bad_typeid::`default constructor closure'(void) + DEFINE_ALIAS ??_U@YAPAXI@Z, MSVCRT_operator_new // void * __cdecl operator new[](unsigned int) + DEFINE_ALIAS ??_U@YAPAXIHPBDH@Z, MSVCRT_operator_new_dbg // void * __cdecl operator new[](unsigned int,int,char const *,int) + DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete // void __cdecl operator delete[](void *) + DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler // int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) + DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler // int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) + DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode // int __cdecl _set_new_mode(int) + DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator // void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) + DEFINE_ALIAS ?before@type_info@@QBAHABV1@@Z, MSVCRT_type_info_before // public: int __cdecl type_info::before(class type_info const &)const + DEFINE_ALIAS ?name@type_info@@QBAPBDXZ, MSVCRT_type_info_name // public: char const * __cdecl type_info::name(void)const + DEFINE_ALIAS ?raw_name@type_info@@QBAPBDXZ, MSVCRT_type_info_raw_name // public: char const * __cdecl type_info::raw_name(void)const + DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate // void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) + DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected // void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) + DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate // void __cdecl terminate(void) + DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected // void __cdecl unexpected(void) + DEFINE_ALIAS ?what@exception@@UBAPBDXZ, MSVCRT_what_exception // public: virtual char const * __cdecl exception::what(void)const #undef _MSVCRT_ MACRO @@ -108,13 +101,13 @@ GBLS FuncName - EXTERN MSVCRT_operator_delete - __ExportName ??3@YAXPAX@Z - b MSVCRT_operator_delete + //EXTERN MSVCRT_operator_delete + //__ExportName ??3@YAXPAX@Z + //b MSVCRT_operator_delete - EXTERN MSVCRT_operator_new - __ExportName ??_U@YAPAXI@Z - b MSVCRT_operator_new + //EXTERN MSVCRT_operator_new + //__ExportName ??_U@YAPAXI@Z + //b MSVCRT_operator_new END /* EOF */

1 0

[tkreuzer] 67729: [CRT] setjmp is a macro expanding to _setjmp or _setjmpex. In soviet russia and on ARM builds, the compiler will convert invocation of _setjmp back into a call to setjmp. The comp...
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 21:52:45 2015 New Revision: 67729 URL: http://svn.reactos.org/svn/reactos?rev=67729&view=rev Log: [CRT] setjmp is a macro expanding to _setjmp or _setjmpex. In soviet russia and on ARM builds, the compiler will convert invocation of _setjmp back into a call to setjmp. The compiler handles _setjmp and _setjmpex in the same way, generating code where r0 points to the jump_buf and r1 points to the current functions stack frame (sp on function entry). So make setjmp and _setjmp aliases to _setjmpex and make the latter use r1. Modified: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s Modified: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/arm/set… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s [iso-8859-1] Thu May 14 21:52:45 2015 @@ -12,14 +12,13 @@ /* CODE **********************************************************************/ TEXTAREA - LEAF_ENTRY _setjmp - - mov r1, sp + LEAF_ENTRY _setjmpex /* Store r1 (->Frame) and r4 - r11 */ stmia r0!, {r1,r4-r11} - /* Store r1 (->Sp), lr (->Pc), fp (->Fpscr) */ + /* Store sp (->Sp), lr (->Pc), fp (->Fpscr) */ + mov r1, sp stmia r0!, {r1,lr,fp} /* Store NEON registers */ @@ -35,7 +34,10 @@ /* Return 0 */ mov r0, #0 bx lr - LEAF_END _setjmp + LEAF_END _setjmpex + + IMPORT _setjmp, WEAK _setjmpex + IMPORT setjmp, WEAK _setjmpex LEAF_ENTRY longjmp

1 0

[tkreuzer] 67728: [CRT] Don't use _control87 on ARM builds
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 21:52:23 2015 New Revision: 67728 URL: http://svn.reactos.org/svn/reactos?rev=67728&view=rev Log: [CRT] Don't use _control87 on ARM builds Modified: trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/winesup.c Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Thu May 14 21:52:23 2015 @@ -408,10 +408,13 @@ _internal_handle_float(negative, exp, suppress, d, l_prefix || L_prefix, &ap); st = 1; #else +#ifdef _M_ARM + DbgBreakPoint(); +#else fpcontrol = _control87(0, 0); _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - +#endif negexp = (exp < 0); if(negexp) exp = -exp; @@ -423,9 +426,11 @@ expcnt = expcnt*expcnt; } cur = (negexp ? d/cur : d*cur); - +#ifdef _M_ARM + DbgBreakPoint(); +#else _control87(fpcontrol, 0xffffffff); - +#endif st = 1; if (!suppress) { if (L_prefix) _SET_NUMBER_(double); Modified: trunk/reactos/lib/sdk/crt/string/winesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/winesup… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] Thu May 14 21:52:23 2015 @@ -75,11 +75,14 @@ long double cur = 1, expcnt = 10; unsigned fpcontrol; BOOL negexp; - +#ifdef _M_ARM + DbgBreakPoint(); + fpcontrol = _controlfp(0, 0); +#else fpcontrol = _control87(0, 0); _control87(_EM_DENORMAL|_EM_INVALID|_EM_ZERODIVIDE |_EM_OVERFLOW|_EM_UNDERFLOW|_EM_INEXACT, 0xffffffff); - +#endif negexp = (exp < 0); if(negexp) exp = -exp; @@ -92,7 +95,12 @@ } cur = (negexp ? d/cur : d*cur); +#ifdef _M_ARM + DbgBreakPoint(); + _controlfp(fpcontrol, 0xffffffff); +#else _control87(fpcontrol, 0xffffffff); +#endif if (!suppress) { if (l_or_L_prefix) _SET_NUMBER_(double);

1 0

[tkreuzer] 67727: [CRT] add __va_copy for ARM
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 21:52:09 2015 New Revision: 67727 URL: http://svn.reactos.org/svn/reactos?rev=67727&view=rev Log: [CRT] add __va_copy for ARM Modified: trunk/reactos/include/crt/vadefs.h Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Thu May 14 21:52:09 2015 @@ -69,6 +69,7 @@ #endif #define _crt_va_arg(ap,t) (*(t*)((ap += _SLOTSIZEOF(t) + _APALIGN(t,ap)) - _SLOTSIZEOF(t))) #define _crt_va_end(ap) ( ap = (va_list)0 ) +#define __va_copy(d,s) ((void)((d) = (s))) #else //if defined(_M_IA64) || defined(_M_CEE) #error Please implement me #endif

1 0

[hbelusca] 67726: [NTVDM] - Add some early "return" after calls to EmulatorTerminate() - Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows when it is going to quit, so let's do the...
by hbelusca＠svn.reactos.org 14 May '15

14 May '15

Author: hbelusca Date: Thu May 14 21:13:07 2015 New Revision: 67726 URL: http://svn.reactos.org/svn/reactos?rev=67726&view=rev Log: [NTVDM] - Add some early "return" after calls to EmulatorTerminate() - Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows when it is going to quit, so let's do the same. - Put port 61h (and 62h) support in ppi.c (programmable-peripheral-interface). Added: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Thu May 14 21:13:07 2015 @@ -24,6 +24,7 @@ hardware/mouse.c hardware/pic.c hardware/pit.c + hardware/ppi.c hardware/ps2.c hardware/sound/speaker.c hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -454,7 +454,6 @@ /* Stop the VDM */ EmulatorTerminate(); - return; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -78,6 +78,7 @@ { /* We failed everything, stop the VDM */ EmulatorTerminate(); + return; } break; Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -28,9 +28,10 @@ #include "hardware/keyboard.h" #include "hardware/mouse.h" #include "hardware/pic.h" +#include "hardware/pit.h" +#include "hardware/ppi.h" #include "hardware/ps2.h" #include "hardware/sound/speaker.h" -#include "hardware/pit.h" #include "hardware/video/vga.h" #include "vddsup.h" @@ -41,8 +42,7 @@ LPVOID BaseAddress = NULL; BOOLEAN VdmRunning = TRUE; -static BOOLEAN A20Line = FALSE; -static BYTE Port61hState = 0x00; +static BOOLEAN A20Line = FALSE; static HANDLE InputThread = NULL; @@ -149,7 +149,6 @@ /* Stop the VDM */ EmulatorTerminate(); - return; } VOID EmulatorTerminate(VOID) @@ -179,36 +178,6 @@ { DPRINT1("NTVDM: BOP_DEBUGGER\n"); DebugBreak(); -} - -static BYTE WINAPI Port61hRead(USHORT Port) -{ - return Port61hState; -} - -static VOID WINAPI Port61hWrite(USHORT Port, BYTE Data) -{ - // BOOLEAN SpeakerStateChange = FALSE; - BYTE OldPort61hState = Port61hState; - - /* Only the four lowest bytes can be written */ - Port61hState = (Port61hState & 0xF0) | (Data & 0x0F); - - if ((OldPort61hState ^ Port61hState) & 0x01) - { - DPRINT("PIT 2 Gate %s\n", Port61hState & 0x01 ? "on" : "off"); - PitSetGate(2, !!(Port61hState & 0x01)); - // SpeakerStateChange = TRUE; - } - - if ((OldPort61hState ^ Port61hState) & 0x02) - { - /* There were some change for the speaker... */ - DPRINT("Speaker %s\n", Port61hState & 0x02 ? "on" : "off"); - // SpeakerStateChange = TRUE; - } - // if (SpeakerStateChange) SpeakerChange(Port61hState); - SpeakerChange(Port61hState); } static VOID WINAPI PitChan0Out(LPVOID Param, BOOLEAN State) @@ -466,21 +435,18 @@ /* Initialize DMA */ DmaInitialize(); - /* Initialize the PIC, the PIT, the CMOS and the PC Speaker */ + /* Initialize PIC, PIT, CMOS, PC Speaker and PS/2 */ PicInitialize(); + PitInitialize(); - CmosInitialize(); - SpeakerInitialize(); - - /* Set output functions */ PitSetOutFunction(0, NULL, PitChan0Out); PitSetOutFunction(1, NULL, PitChan1Out); PitSetOutFunction(2, NULL, PitChan2Out); - /* Register the I/O Ports */ - RegisterIoPort(CONTROL_SYSTEM_PORT61H, Port61hRead, Port61hWrite); - - /* Initialize the PS/2 port */ + CmosInitialize(); + SpeakerInitialize(); + PpiInitialize(); + PS2Initialize(); /* Initialize the keyboard and mouse and connect them to their PS/2 ports */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Thu May 14 21:13:07 2015 @@ -71,10 +71,6 @@ return Result; } -/* System I/O ports */ -#define CONTROL_SYSTEM_PORT61H 0x61 - - enum { EMULATOR_EXCEPTION_DIVISION_BY_ZERO, Added: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -0,0 +1,85 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ppi.c + * PURPOSE: Programmable Peripheral Interface emulation - + * i8255A-5 compatible + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTES: - Most of its functionality as keyboard controller is replaced + * by the PS/2 controller. + * - This controller is here only for having ports 61h and 62h working. + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "ntvdm.h" +#include "emulator.h" +#include "ppi.h" + +#include "hardware/pit.h" +#include "hardware/sound/speaker.h" + +#include "io.h" + +/* PRIVATE VARIABLES **********************************************************/ + +/*static*/ BYTE Port61hState = 0x00; // Used in emulator.c +static BYTE Port62hState = 0x00; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static BYTE WINAPI PpiReadPort(USHORT Port) +{ + if (Port == PPI_PORT_61H) + return Port61hState; + else if (Port == PPI_PORT_62H) + return Port62hState; + + return 0x00; +} + +static VOID WINAPI Port61hWrite(USHORT Port, BYTE Data) +{ + // BOOLEAN SpeakerStateChange = FALSE; + BYTE OldPort61hState = Port61hState; + + /* Only the four lowest bytes can be written */ + Port61hState = (Port61hState & 0xF0) | (Data & 0x0F); + + if ((OldPort61hState ^ Port61hState) & 0x01) + { + DPRINT("PIT 2 Gate %s\n", Port61hState & 0x01 ? "on" : "off"); + PitSetGate(2, !!(Port61hState & 0x01)); + // SpeakerStateChange = TRUE; + } + + if ((OldPort61hState ^ Port61hState) & 0x02) + { + /* There were some change for the speaker... */ + DPRINT("Speaker %s\n", Port61hState & 0x02 ? "on" : "off"); + // SpeakerStateChange = TRUE; + } + // if (SpeakerStateChange) SpeakerChange(Port61hState); + SpeakerChange(Port61hState); +} + +static VOID WINAPI Port62hWrite(USHORT Port, BYTE Data) +{ + Port62hState = Data; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID PpiInitialize(VOID) +{ + /* Register the I/O Ports */ + // Port 0x60 is now used by the PS/2 controller + RegisterIoPort(PPI_PORT_61H, PpiReadPort, Port61hWrite); + RegisterIoPort(PPI_PORT_62H, PpiReadPort, Port62hWrite); + // Port 0x63 is unused +} + +/* EOF */ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h [iso-8859-1] Thu May 14 21:13:07 2015 @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ppi.h + * PURPOSE: Programmable Peripheral Interface emulation - + * i8255A-5 compatible + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _PPI_H_ +#define _PPI_H_ + +/* DEFINES ********************************************************************/ + +#define PPI_PORT_61H 0x61 +#define PPI_PORT_62H 0x62 + +extern BYTE Port61hState; + +/* FUNCTIONS ******************************************************************/ + +VOID PpiInitialize(VOID); + +#endif // _PPI_H_ + +/* EOF */ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -201,7 +201,7 @@ { /* Stop the VDM */ EmulatorTerminate(); - break; + return; } } } @@ -230,6 +230,7 @@ { /* CPU disabled - Stop the VDM */ EmulatorTerminate(); + return; } /* Update the A20 line setting */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -13,9 +13,6 @@ #include "ntvdm.h" #include "emulator.h" #include "memory.h" - -/* Extra PSDK/NDK Headers */ -#include <ndk/mmfuncs.h> /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Thu May 14 21:13:07 2015 @@ -542,7 +542,8 @@ /* Quit the VDM */ DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n"); - + /* Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows */ + ExitProcess(0); return 0; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Thu May 14 21:13:07 2015 @@ -35,6 +35,7 @@ #define NTOS_MODE_USER #include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/rtltypes.h>

1 0

[ekohl] 67725: [NTOSKRNL] Create the "Hardware Profiles\0000" key as part of the registry setup. This must be done at this point because the "Hardware Profiles\Current" link will only be created, i...
by ekohl＠svn.reactos.org 14 May '15

14 May '15

Author: ekohl Date: Thu May 14 21:08:42 2015 New Revision: 67725 URL: http://svn.reactos.org/svn/reactos?rev=67725&view=rev Log: [NTOSKRNL] Create the "Hardware Profiles\0000" key as part of the registry setup. This must be done at this point because the "Hardware Profiles\Current" link will only be created, if the "Hardware Profiles\0000" key exists. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu May 14 21:08:42 2015 @@ -444,6 +444,78 @@ /* Return the status */ return (ExpInTextModeSetup ? STATUS_SUCCESS : Status); +} + +static +NTSTATUS +INIT_FUNCTION +CmpCreateHardwareProfile(HANDLE ControlSetHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ProfilesHandle = NULL; + HANDLE ProfileHandle = NULL; + ULONG Disposition; + NTSTATUS Status; + + DPRINT("CmpCreateHardwareProfile()\n"); + + /* Create the Hardware Profiles key */ + RtlInitUnicodeString(&KeyName, L"Hardware Profiles"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ControlSetHandle, + NULL); + Status = NtCreateKey(&ProfilesHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Creating the Hardware Profile key failed\n"); + goto done; + } + + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Create the 0000 key */ + RtlInitUnicodeString(&KeyName, L"0000"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ProfilesHandle, + NULL); + Status = NtCreateKey(&ProfileHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Creating the Hardware Profile\\0000 key failed\n"); + goto done; + } + + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + +done: + if (ProfilesHandle) + NtClose(ProfilesHandle); + + if (ProfileHandle) + NtClose(ProfileHandle); + + DPRINT1("CmpCreateHardwareProfile() done\n"); + + return Status; } NTSTATUS @@ -498,6 +570,11 @@ &Disposition); if (!NT_SUCCESS(Status)) return Status; + /* Create the Hardware Profile keys */ + Status = CmpCreateHardwareProfile(KeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + /* Don't need the handle */ ZwClose(KeyHandle); @@ -583,23 +660,31 @@ goto Cleanup; } - /* Now get the current config */ - RtlInitUnicodeString(&KeyName, L"CurrentConfig"); - Status = NtQueryValueKey(ConfigHandle, - &KeyName, - KeyValueFullInformation, - ValueInfoBuffer, - sizeof(ValueInfoBuffer), - &ResultLength); - - /* Set pointer to buffer */ - ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; - - /* Check if we failed or got a non DWORD-value */ - if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) goto Cleanup; - - /* Get the hadware profile */ - HwProfile = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ + if (!LoaderBlock->RegistryBase) + { + HwProfile = 0; + } + else + { + /* Now get the current config */ + RtlInitUnicodeString(&KeyName, L"CurrentConfig"); + Status = NtQueryValueKey(ConfigHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + + /* Set pointer to buffer */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + + /* Check if we failed or got a non DWORD-value */ + if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) goto Cleanup; + + /* Get the hadware profile */ + HwProfile = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + } /* Open the hardware profile key */ RtlInitUnicodeString(&KeyName, @@ -704,6 +789,8 @@ if (ConfigHandle) NtClose(ConfigHandle); if (ProfileHandle) NtClose(ProfileHandle); if (ParentHandle) NtClose(ParentHandle); + + DPRINT1("CmpCreateControlSet() done\n"); /* Return success */ return STATUS_SUCCESS;

1 0

[tkreuzer] 67724: [LIBSAMPLERATE] Fix build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 20:58:41 2015 New Revision: 67724 URL: http://svn.reactos.org/svn/reactos?rev=67724&view=rev Log: [LIBSAMPLERATE] Fix build Modified: trunk/reactos/lib/3rdparty/libsamplerate/config.h Modified: trunk/reactos/lib/3rdparty/libsamplerate/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/config.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/config.h [iso-8859-1] Thu May 14 20:58:41 2015 @@ -96,10 +96,10 @@ /* #undef HAVE_LIBM */ /* Define if you have C99's lrint function. */ -/* #undef HAVE_LRINT */ +#define HAVE_LRINT 1 /* Define if you have C99's lrintf function. */ -/* #undef HAVE_LRINTF */ +#define HAVE_LRINTF 1 /* Define to 1 if you have the `malloc' function. */ #define HAVE_MALLOC 1

1 0

[tkreuzer] 67723: [D3DX9_36/WINED3D] Partly revert previous changes, bringing back copysignf. Add global defines copysignf=_copysignf, since we have that now.
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 20:45:56 2015 New Revision: 67723 URL: http://svn.reactos.org/svn/reactos?rev=67723&view=rev Log: [D3DX9_36/WINED3D] Partly revert previous changes, bringing back copysignf. Add global defines copysignf=_copysignf, since we have that now. Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/math.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/utils.c Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Thu May 14 20:45:56 2015 @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] Thu May 14 20:45:56 2015 @@ -2118,7 +2118,7 @@ { int exp = 0, origexp; float tmp = fabsf(in); - int sign = (in < 0); + int sign = (copysignf(1, in) < 0); unsigned int mantissa; unsigned short ret; Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Thu May 14 20:45:56 2015 @@ -2,7 +2,8 @@ add_definitions( -D__WINESRC__ -D_USE_MATH_DEFINES - -DUSE_WIN32_OPENGL) + -DUSE_WIN32_OPENGL + -Dcopysignf=_copysignf) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Thu May 14 20:45:56 2015 @@ -3987,7 +3987,7 @@ { int idx = 1; - if (value < 0.0f) + if (copysignf(1.0f, value) < 0.0f) ++idx; /* Be sure to allocate a buffer of at least 17 characters for the result

1 0

[tkreuzer] 67722: [CRT] Update / improve math.h a bit
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 20:21:14 2015 New Revision: 67722 URL: http://svn.reactos.org/svn/reactos?rev=67722&view=rev Log: [CRT] Update / improve math.h a bit Modified: trunk/reactos/include/c++/cmath trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/c++/cmath URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/cmath?rev=… ============================================================================== --- trunk/reactos/include/c++/cmath [iso-8859-1] (original) +++ trunk/reactos/include/c++/cmath [iso-8859-1] Thu May 14 20:21:14 2015 @@ -1,6 +1,7 @@ //Standard C++ math declarations #pragma once +#define _CMATH_ #include <math.h> Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Thu May 14 20:21:14 2015 @@ -226,6 +226,10 @@ #ifndef _CRT_OBSOLETE #define _CRT_OBSOLETE(_NewItem) +#endif + +#ifndef _CRT_JIT_INTRINSIC +#define _CRT_JIT_INTRINSIC #endif Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=677… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Thu May 14 20:21:14 2015 @@ -1,25 +1,19 @@ /** * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. */ #ifndef _INC_MATH #define _INC_MATH #include "crtdefs.h" -struct _exception; - #pragma pack(push,_CRT_PACKING) #ifdef __cplusplus extern "C" { #endif -#if defined(__GNUC__) -/* Some 3rd party code needs the declaration of C99 functions */ -#include "mingw_math.h" -#endif +typedef float float_t; +typedef double double_t; #ifndef _EXCEPTION_DEFINED #define _EXCEPTION_DEFINED @@ -37,7 +31,10 @@ struct _complex { double x,y; }; -#endif +#if !__STDC__ && !defined(__cplusplus) +#define complex _complex +#endif /* __STDC__ */ +#endif /* _COMPLEX_DEFINED */ #define _DOMAIN 1 #define _SING 2 @@ -45,191 +42,236 @@ #define _UNDERFLOW 4 #define _TLOSS 5 #define _PLOSS 6 + #define EDOM 33 #define ERANGE 34 - _CRTIMP extern double _HUGE; + _CRTIMP extern double const _HUGE; #define HUGE_VAL _HUGE + +#ifndef _HUGE_ENUF +#define _HUGE_ENUF 1e+300 +#endif +#define INFINITY ((float)(_HUGE_ENUF * _HUGE_ENUF)) +#define HUGE_VALD ((double)INFINITY) +#define HUGE_VALF ((float)INFINITY) +#define HUGE_VALL ((long double)INFINITY) +#define NAN ((float)(INFINITY * 0.0F)) + +#define _DENORM (-2) +#define _FINITE (-1) +#define _INFCODE 1 +#define _NANCODE 2 + +#define FP_INFINITE _INFCODE +#define FP_NAN _NANCODE +#define FP_NORMAL _FINITE +#define FP_SUBNORMAL _DENORM +#define FP_ZERO 0 + +#ifndef __cplusplus #define _matherrl _matherr +#endif #ifndef _CRT_ABS_DEFINED #define _CRT_ABS_DEFINED - int __cdecl abs(_In_ int x); - long __cdecl labs(_In_ long x); -#endif - - double __cdecl acos(_In_ double x); - double __cdecl asin(_In_ double x); - double __cdecl atan(_In_ double x); - double __cdecl atan2(_In_ double y, _In_ double x); - double __cdecl cos(_In_ double x); - double __cdecl cosh(_In_ double x); - double __cdecl exp(_In_ double x); - double __cdecl fabs(_In_ double x); - double __cdecl fmod(_In_ double x, _In_ double y); - double __cdecl log(_In_ double x); - double __cdecl log10(_In_ double x); - double __cdecl pow(_In_ double x, double y); - double __cdecl sin(_In_ double x); - double __cdecl sinh(_In_ double x); - double __cdecl sqrt(_In_ double x); - double __cdecl tan(_In_ double x); - double __cdecl tanh(_In_ double x); +_Check_return_ int __cdecl abs(_In_ int x); +_Check_return_ long __cdecl labs(_In_ long x); +_Check_return_ long long __cdecl llabs(_In_ long long x); +#endif + +_Check_return_ double __cdecl acos(_In_ double x); +_Check_return_ double __cdecl asin(_In_ double x); +_Check_return_ double __cdecl atan(_In_ double x); +_Check_return_ double __cdecl atan2(_In_ double y, _In_ double x); +_Check_return_ double __cdecl cos(_In_ double x); +_Check_return_ double __cdecl cosh(_In_ double x); +_Check_return_ double __cdecl exp(_In_ double x); +_Check_return_ _CRT_JIT_INTRINSIC double __cdecl fabs(_In_ double x); +_Check_return_ double __cdecl fmod(_In_ double x, _In_ double y); +_Check_return_ double __cdecl log(_In_ double x); +_Check_return_ double __cdecl log10(_In_ double x); +_Check_return_ double __cdecl pow(_In_ double x, double y); +_Check_return_ double __cdecl sin(_In_ double x); +_Check_return_ double __cdecl sinh(_In_ double x); +_Check_return_ _CRT_JIT_INTRINSIC double __cdecl sqrt(_In_ double x); +_Check_return_ double __cdecl tan(_In_ double x); +_Check_return_ double __cdecl tanh(_In_ double x); #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED - int __cdecl _matherr(_Inout_ struct _exception *except); +int __CRTDECL _matherr(_Inout_ struct _exception *except); #endif #ifndef _CRT_ATOF_DEFINED #define _CRT_ATOF_DEFINED - - _Check_return_ - _CRTIMP - double - __cdecl - atof( - _In_z_ const char *str); - - _Check_return_ - _CRTIMP - double - __cdecl - _atof_l( - _In_z_ const char *str, - _In_opt_ _locale_t locale); - +_Check_return_ _CRTIMP double __cdecl atof(_In_z_ const char *str); +_Check_return_ _CRTIMP double __cdecl _atof_l(_In_z_ const char *str, _In_opt_ _locale_t locale); // vista+ #endif /* _CRT_ATOF_DEFINED */ #ifndef _SIGN_DEFINED #define _SIGN_DEFINED - _Check_return_ _CRTIMP double __cdecl _copysign(_In_ double x, _In_ double sgn); - _Check_return_ _CRTIMP double __cdecl _chgsign(_In_ double x); -#endif - - _CRTIMP double __cdecl _cabs(_In_ struct _complex a); - _CRTIMP double __cdecl ceil(_In_ double x); - _CRTIMP double __cdecl floor(_In_ double x); - _CRTIMP double __cdecl frexp(_In_ double x, _Out_ int *y); - _CRTIMP double __cdecl _hypot(_In_ double x, _In_ double y); - _CRTIMP double __cdecl _j0(_In_ double x); - _CRTIMP double __cdecl _j1(_In_ double x); - _CRTIMP double __cdecl _jn(_In_ int x, _In_ double y); - _CRTIMP double __cdecl ldexp(_In_ double x, _In_ int y); - _CRTIMP double __cdecl modf(_In_ double x, _Out_ double *y); - _CRTIMP double __cdecl _y0(_In_ double x); - _CRTIMP double __cdecl _y1(_In_ double x); - _CRTIMP double __cdecl _yn(_In_ int x, _In_ double y); - _CRTIMP float __cdecl _hypotf(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP double __cdecl _copysign(_In_ double x, _In_ double sgn); +_Check_return_ _CRTIMP double __cdecl _chgsign(_In_ double x); +#endif + +_Check_return_ _CRTIMP double __cdecl _cabs(_In_ struct _complex a); +_Check_return_ _CRTIMP double __cdecl _hypot(_In_ double x, _In_ double y); +_Check_return_ _CRTIMP double __cdecl _j0(_In_ double x); +_Check_return_ _CRTIMP double __cdecl _j1(_In_ double x); +_Check_return_ _CRTIMP double __cdecl _jn(_In_ int x, _In_ double y); +_Check_return_ _CRTIMP double __cdecl _nextafter(_In_ double x, _In_ double y); +_Check_return_ _CRTIMP double __cdecl _y0(_In_ double x); +_Check_return_ _CRTIMP double __cdecl _y1(_In_ double x); +_Check_return_ _CRTIMP double __cdecl _yn(_In_ int x, _In_ double y); +_Check_return_ _CRTIMP double __cdecl ceil(_In_ double x); +_Check_return_ _CRTIMP double __cdecl floor(_In_ double x); +_Check_return_ _CRTIMP double __cdecl frexp(_In_ double x, _Out_ int *y); +_Check_return_ _CRTIMP double __cdecl ldexp(_In_ double x, _In_ int y); +_Check_return_ _CRTIMP double __cdecl modf(_In_ double x, _Out_ double *y); #if defined(__i386__) || defined(_M_IX86) - _CRTIMP int __cdecl _set_SSE2_enable(_In_ int flag); +_Check_return_ _CRTIMP int __cdecl _set_SSE2_enable(_In_ int flag); #endif #if defined(__x86_64) || defined(_M_AMD64) - _CRTIMP float __cdecl _copysignf(_In_ float x, _In_ float sgn); - _CRTIMP float __cdecl _chgsignf(_In_ float x); - _CRTIMP float __cdecl _logbf(_In_ float x); - _CRTIMP float __cdecl _nextafterf(_In_ float x, _In_ float y); - _CRTIMP int __cdecl _finitef(_In_ float x); - _CRTIMP int __cdecl _isnanf(_In_ float x); - _CRTIMP int __cdecl _fpclassf(_In_ float x); -#endif +_Check_return_ _CRTIMP float __cdecl _nextafterf(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP int __cdecl _isnanf(_In_ float x); +_Check_return_ _CRTIMP int __cdecl _fpclassf(_In_ float x); +#endif + +#if defined(__x86_64) || defined(_M_AMD64) || \ + defined(__arm__) || defined(_M_ARM) || \ + defined(__arm64__) || defined(_M_ARM64) +_Check_return_ _CRTIMP int __cdecl _finitef(_In_ float x); +_Check_return_ _CRTIMP float __cdecl _logbf(_In_ float x); +#endif /* _M_AMD64 || _M_ARM || _M_ARM64 */ #if defined(__ia64__) || defined (_M_IA64) - _CRTIMP float __cdecl fabsf(_In_ float x); - _CRTIMP float __cdecl ldexpf(_In_ float x, _In_ int y); - _CRTIMP long double __cdecl tanl(_In_ long double x); +_Check_return_ _CRTIMP float __cdecl ldexpf(_In_ float x, _In_ int y); +_Check_return_ _CRTIMP long double __cdecl tanl(_In_ long double x); #else - __CRT_INLINE float __cdecl fabsf(_In_ float x) { return ((float)fabs((double)x)); } - __CRT_INLINE float __cdecl ldexpf(_In_ float x, _In_ int expn) { return (float)ldexp(x, expn); } - __CRT_INLINE long double tanl(_In_ long double x) { return (tan((double)x)); } -#endif - -#if (_WIN32_WINNT >= 0x600) && \ - (defined(__x86_64) || defined(_M_AMD64) || \ - defined (__ia64__) || defined (_M_IA64)) - - _CRTIMP float __cdecl acosf(_In_ float x); - _CRTIMP float __cdecl asinf(_In_ float x); - _CRTIMP float __cdecl atanf(_In_ float x); - _CRTIMP float __cdecl atan2f(_In_ float x, _In_ float y); - _CRTIMP float __cdecl ceilf(_In_ float x); - _CRTIMP float __cdecl cosf(_In_ float x); - _CRTIMP float __cdecl coshf(_In_ float x); - _CRTIMP float __cdecl expf(_In_ float x); - _CRTIMP float __cdecl floorf(_In_ float x); - _CRTIMP float __cdecl fmodf(_In_ float x, _In_ float y); - _CRTIMP float __cdecl logf(_In_ float x); - _CRTIMP float __cdecl log10f(_In_ float x); - _CRTIMP float __cdecl modff(_In_ float x, _Out_ float *y); - _CRTIMP float __cdecl powf(_In_ float b, _In_ float e); - _CRTIMP float __cdecl sinf(_In_ float x); - _CRTIMP float __cdecl sinhf(_In_ float x); - _CRTIMP float __cdecl sqrtf(_In_ float x); - _CRTIMP float __cdecl tanf(_In_ float x); - _CRTIMP float __cdecl tanhf(_In_ float x); - +_Check_return_ __CRT_INLINE float __CRTDECL ldexpf(_In_ float x, _In_ int y) { return (float)ldexp(x, y); } +_Check_return_ __CRT_INLINE long double __CRTDECL tanl(_In_ long double x) { return (tan((double)x)); } +#endif + +#if defined(__ia64__) || defined(_M_IA64) || \ + defined(__arm__) || defined(_M_ARM) || \ + defined(__arm64__) || defined(_M_ARM64) +_Check_return_ _CRT_JIT_INTRINSIC _CRTIMP float __cdecl fabsf(_In_ float x); #else - - __CRT_INLINE float acosf(_In_ float x) { return ((float)acos((double)x)); } - __CRT_INLINE float asinf(_In_ float x) { return ((float)asin((double)x)); } - __CRT_INLINE float atanf(_In_ float x) { return ((float)atan((double)x)); } - __CRT_INLINE float atan2f(_In_ float x, _In_ float y) { return ((float)atan2((double)x,(double)y)); } - __CRT_INLINE float ceilf(_In_ float x) { return ((float)ceil((double)x)); } - __CRT_INLINE float cosf(_In_ float x) { return ((float)cos((double)x)); } - __CRT_INLINE float coshf(_In_ float x) { return ((float)cosh((double)x)); } - __CRT_INLINE float expf(_In_ float x) { return ((float)exp((double)x)); } - __CRT_INLINE float floorf(_In_ float x) { return ((float)floor((double)x)); } - __CRT_INLINE float fmodf(_In_ float x, _In_ float y) { return ((float)fmod((double)x,(double)y)); } - __CRT_INLINE float logf(_In_ float x) { return ((float)log((double)x)); } - __CRT_INLINE float log10f(_In_ float x) { return ((float)log10((double)x)); } - __CRT_INLINE float modff(_In_ float x, _Out_ float *y) { - double _Di,_Df = modf((double)x,&_Di); - *y = (float)_Di; - return ((float)_Df); - } - __CRT_INLINE float powf(_In_ float x, _In_ float y) { return ((float)pow((double)x,(double)y)); } - __CRT_INLINE float sinf(_In_ float x) { return ((float)sin((double)x)); } - __CRT_INLINE float sinhf(_In_ float x) { return ((float)sinh((double)x)); } - __CRT_INLINE float sqrtf(_In_ float x) { return ((float)sqrt((double)x)); } - __CRT_INLINE float tanf(_In_ float x) { return ((float)tan((double)x)); } - __CRT_INLINE float tanhf(_In_ float x) { return ((float)tanh((double)x)); } - -#endif - - __CRT_INLINE long double acosl(_In_ long double x) { return (acos((double)x)); } - __CRT_INLINE long double asinl(_In_ long double x) { return (asin((double)x)); } - __CRT_INLINE long double atanl(_In_ long double x) { return (atan((double)x)); } - __CRT_INLINE long double atan2l(_In_ long double y, _In_ long double x) { return (atan2((double)y, (double)x)); } - __CRT_INLINE long double ceill(_In_ long double x) { return (ceil((double)x)); } - __CRT_INLINE long double cosl(_In_ long double x) { return (cos((double)x)); } - __CRT_INLINE long double coshl(_In_ long double x) { return (cosh((double)x)); } - __CRT_INLINE long double expl(_In_ long double x) { return (exp((double)x)); } - __CRT_INLINE long double floorl(_In_ long double x) { return (floor((double)x)); } - __CRT_INLINE long double fmodl(_In_ long double x, _In_ long double y) { return (fmod((double)x, (double)y)); } - __CRT_INLINE long double frexpl(_In_ long double x, _Out_ int *y) { return (frexp((double)x, y)); } - __CRT_INLINE long double logl(_In_ long double x) { return (log((double)x)); } - __CRT_INLINE long double log10l(_In_ long double x) { return (log10((double)x)); } - __CRT_INLINE long double powl(_In_ long double x, _In_ long double y) { return (pow((double)x, (double)y)); } - __CRT_INLINE long double sinl(_In_ long double x) { return (sin((double)x)); } - __CRT_INLINE long double sinhl(_In_ long double x) { return (sinh((double)x)); } - __CRT_INLINE long double sqrtl(_In_ long double x) { return (sqrt((double)x)); } - __CRT_INLINE long double tanhl(_In_ long double x) {return (tanh((double)x)); } - __CRT_INLINE long double __cdecl fabsl(_In_ long double x) { return fabs((double)x); } - __CRT_INLINE long double _chgsignl(_In_ long double _Number) { return _chgsign((double)(_Number)); } - __CRT_INLINE long double _copysignl(_In_ long double _Number, _In_ long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } - __CRT_INLINE long double _hypotl(_In_ long double x, _In_ long double y) { return _hypot((double)(x),(double)(y)); } - __CRT_INLINE float frexpf(_In_ float x, _Out_ int *y) { return ((float)frexp((double)x,y)); } - __CRT_INLINE long double ldexpl(_In_ long double x, _In_ int y) { return ldexp((double)x, y); } - __CRT_INLINE long double modfl(_In_ long double x, _Out_ long double *y) { - double _Di,_Df = modf((double)x,&_Di); - *y = (long double)_Di; - return (_Df); - } - -#ifndef NO_OLDNAMES +_Check_return_ __CRT_INLINE float __CRTDECL fabsf(_In_ float x) { return ((float)fabs((double)x)); } +#endif /* _M_IA64 || _M_ARM || _M_ARM64 */ + +#if defined(_CRTBLD) || \ + defined(__x86_64) || defined(_M_AMD64) || \ + defined(__ia64__) || defined(_M_IA64) || \ + defined(__arm__) || defined(_M_ARM) || \ + defined(__arm64__) || defined(_M_ARM64) +_Check_return_ _CRTIMP float __cdecl _chgsignf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl _copysignf(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP float __cdecl _hypotf(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP float __cdecl acosf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl asinf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl atanf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl atan2f(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP float __cdecl ceilf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl cosf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl coshf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl expf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl floorf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl fmodf(_In_ float x, _In_ float y); +_Check_return_ _CRTIMP float __cdecl logf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl log10f(_In_ float x); +_Check_return_ _CRTIMP float __cdecl modff(_In_ float x, _Out_ float *y); +_Check_return_ _CRTIMP float __cdecl powf(_In_ float b, _In_ float e); +_Check_return_ _CRTIMP float __cdecl sinf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl sinhf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl sqrtf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl tanf(_In_ float x); +_Check_return_ _CRTIMP float __cdecl tanhf(_In_ float x); +#else +#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_ARM)) +/* Make sure intrinsics don't get in our way */ +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(acosf,asinf,atanf,atan2f,ceilf,cosf,coshf,expf,floorf,fmodf,logf,log10f,log10f,powf,sinf,sinhf,sqrtf,tanf,tanhf) +#endif /* _MSC_VER */ +_Check_return_ __CRT_INLINE float _chgsignf(_In_ float x) { return (float)_chgsign((double)x); } +_Check_return_ __CRT_INLINE float _copysignf(_In_ float x, _In_ float y) { return (float)_copysign((double)x, (double)y); } +_Check_return_ __CRT_INLINE float _hypotf(_In_ float x, _In_ float y) { return (float)_hypot((double)x, (double)y); } +_Check_return_ __CRT_INLINE float acosf(_In_ float x) { return (float)acos((double)x); } +_Check_return_ __CRT_INLINE float asinf(_In_ float x) { return (float)asin((double)x); } +_Check_return_ __CRT_INLINE float atanf(_In_ float x) { return (float)atan((double)x); } +_Check_return_ __CRT_INLINE float atan2f(_In_ float x, _In_ float y) { return (float)atan2((double)x,(double)y); } +_Check_return_ __CRT_INLINE float ceilf(_In_ float x) { return (float)ceil((double)x); } +_Check_return_ __CRT_INLINE float cosf(_In_ float x) { return (float)cos((double)x); } +_Check_return_ __CRT_INLINE float coshf(_In_ float x) { return (float)cosh((double)x); } +_Check_return_ __CRT_INLINE float expf(_In_ float x) { return (float)exp((double)x); } +_Check_return_ __CRT_INLINE float floorf(_In_ float x) { return (float)floor((double)x); } +_Check_return_ __CRT_INLINE float fmodf(_In_ float x, _In_ float y) { return (float)fmod((double)x,(double)y); } +_Check_return_ __CRT_INLINE float logf(_In_ float x) { return (float)log((double)x); } +_Check_return_ __CRT_INLINE float log10f(_In_ float x) { return (float)log10((double)x); } +_Check_return_ __CRT_INLINE float modff(_In_ float x, _Out_ float *y) { double _Di,_Df = modf((double)x,&_Di); *y = (float)_Di; return (float)_Df; } +_Check_return_ __CRT_INLINE float powf(_In_ float x, _In_ float y) { return (float)pow((double)x,(double)y); } +_Check_return_ __CRT_INLINE float sinf(_In_ float x) { return (float)sin((double)x); } +_Check_return_ __CRT_INLINE float sinhf(_In_ float x) { return (float)sinh((double)x); } +_Check_return_ __CRT_INLINE float sqrtf(_In_ float x) { return (float)sqrt((double)x); } +_Check_return_ __CRT_INLINE float tanf(_In_ float x) { return (float)tan((double)x); } +_Check_return_ __CRT_INLINE float tanhf(_In_ float x) { return (float)tanh((double)x); } +#endif +_Check_return_ __CRT_INLINE double hypot(_In_ double x, _In_ double y) { return _hypot(x, y); } +_Check_return_ __CRT_INLINE float hypotf(_In_ float x, _In_ float y) { return _hypotf(x, y); } +_Check_return_ __CRT_INLINE float frexpf(_In_ float x, _Out_ int *y) { return ((float)frexp((double)x,y)); } + +/* long double equals double, so just use inline wrappers */ +_Check_return_ __CRT_INLINE long double acosl(_In_ long double x) { return (acos((double)x)); } +_Check_return_ __CRT_INLINE long double asinl(_In_ long double x) { return (asin((double)x)); } +_Check_return_ __CRT_INLINE long double atanl(_In_ long double x) { return (atan((double)x)); } +_Check_return_ __CRT_INLINE long double atan2l(_In_ long double y, _In_ long double x) { return (atan2((double)y, (double)x)); } +_Check_return_ __CRT_INLINE long double ceill(_In_ long double x) { return (ceil((double)x)); } +_Check_return_ __CRT_INLINE long double cosl(_In_ long double x) { return (cos((double)x)); } +_Check_return_ __CRT_INLINE long double coshl(_In_ long double x) { return (cosh((double)x)); } +_Check_return_ __CRT_INLINE long double expl(_In_ long double x) { return (exp((double)x)); } +_Check_return_ __CRT_INLINE long double fabsl(_In_ long double x) { return fabs((double)x); } +_Check_return_ __CRT_INLINE long double floorl(_In_ long double x) { return (floor((double)x)); } +_Check_return_ __CRT_INLINE long double fmodl(_In_ long double x, _In_ long double y) { return (fmod((double)x, (double)y)); } +_Check_return_ __CRT_INLINE long double frexpl(_In_ long double x, _Out_ int *y) { return (frexp((double)x, y)); } +_Check_return_ __CRT_INLINE long double hypotl(_In_ long double x, _In_ long double y) { return _hypot((double)x, (double)y); } +_Check_return_ __CRT_INLINE long double logl(_In_ long double x) { return (log((double)x)); } +_Check_return_ __CRT_INLINE long double log10l(_In_ long double x) { return (log10((double)x)); } +_Check_return_ __CRT_INLINE long double powl(_In_ long double x, _In_ long double y) { return (pow((double)x, (double)y)); } +_Check_return_ __CRT_INLINE long double sinl(_In_ long double x) { return (sin((double)x)); } +_Check_return_ __CRT_INLINE long double sinhl(_In_ long double x) { return (sinh((double)x)); } +_Check_return_ __CRT_INLINE long double sqrtl(_In_ long double x) { return (sqrt((double)x)); } +_Check_return_ __CRT_INLINE long double tanhl(_In_ long double x) {return (tanh((double)x)); } +_Check_return_ __CRT_INLINE long double _chgsignl(_In_ long double number) { return _chgsign((double)number); } +_Check_return_ __CRT_INLINE long double _copysignl(_In_ long double number, _In_ long double sign) { return _copysign((double)number, (double)sign); } +_Check_return_ __CRT_INLINE long double _hypotl(_In_ long double x, _In_ long double y) { return _hypot((double)x, (double)y); } +_Check_return_ __CRT_INLINE long double ldexpl(_In_ long double x, _In_ int y) { return ldexp((double)x, y); } +_Check_return_ __CRT_INLINE long double modfl(_In_ long double x, _Out_ long double *y) { return (long double)modf((double)x, (double *)y); } + +/* Support for some functions, not exported in MSVCRT */ +_Check_return_ __CRT_INLINE double round(_In_ double x) { return (x < 0) ? ceil(x - 0.5f) : floor(x + 0.5); } +_Check_return_ __CRT_INLINE float roundf(_In_ float x) { return (x < 0) ? ceilf(x - 0.5f) : floorf(x + 0.5); } +_Check_return_ __CRT_INLINE long double roundl(_In_ long double x) { return (x < 0) ? ceill(x - 0.5f) : floorl(x + 0.5); } +_Check_return_ __CRT_INLINE long lround(_In_ double x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long lroundf(_In_ float x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long lroundl(_In_ long double x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llround(_In_ double x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llroundf(_In_ float x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llroundl(_In_ long double x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE double rint(_In_ double x) { return round(x); } +_Check_return_ __CRT_INLINE float rintf(_In_ float x) { return roundf(x); } +_Check_return_ __CRT_INLINE long double rintl(_In_ long double x) { return roundl(x); } +_Check_return_ __CRT_INLINE long lrint(_In_ double x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long lrintf(_In_ float x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long lrintl(_In_ long double x) { return (long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llrint(_In_ double x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llrintf(_In_ float x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } +_Check_return_ __CRT_INLINE long long llrintl(_In_ long double x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } + +#ifndef NO_OLDNAMES /* !__STDC__ */ #define DOMAIN _DOMAIN #define SING _SING @@ -238,35 +280,82 @@ #define TLOSS _TLOSS #define PLOSS _PLOSS #define matherr _matherr +//_CRTIMP extern double HUGE; #define HUGE _HUGE - // _CRTIMP double __cdecl cabs(struct _complex x); - #define cabs _cabs - - _CRTIMP double __cdecl hypot(_In_ double x, _In_ double y); - _CRTIMP double __cdecl j0(_In_ double x); - _CRTIMP double __cdecl j1(_In_ double x); - _CRTIMP double __cdecl jn(_In_ int x, _In_ double y); - _CRTIMP double __cdecl y0(_In_ double x); - _CRTIMP double __cdecl y1(_In_ double x); - _CRTIMP double __cdecl yn(_In_ int x, _In_ double y); - __CRT_INLINE float __cdecl hypotf(_In_ float x, _In_ float y) { return (float) hypot(x, y); } +//_CRT_NONSTDC_DEPRECATE(_cabs) _CRTIMP double __cdecl cabs(_In_ struct _complex x); +#define cabs _cabs + +_CRT_NONSTDC_DEPRECATE(_j0) _CRTIMP double __cdecl j0(_In_ double x); +_CRT_NONSTDC_DEPRECATE(_j1) _CRTIMP double __cdecl j1(_In_ double x); +_CRT_NONSTDC_DEPRECATE(_jn) _CRTIMP double __cdecl jn(_In_ int x, _In_ double y); +_CRT_NONSTDC_DEPRECATE(_y0) _CRTIMP double __cdecl y0(_In_ double x); +_CRT_NONSTDC_DEPRECATE(_y1) _CRTIMP double __cdecl y1(_In_ double x); +_CRT_NONSTDC_DEPRECATE(_yn) _CRTIMP double __cdecl yn(_In_ int x, _In_ double y); #endif /* NO_OLDNAMES */ #ifdef __cplusplus } +#ifndef _CMATH_ extern "C++" { - template<class _Ty> inline _Ty _Pow_int(_Ty x,int y) { - unsigned int _N; - if(y >= 0) _N = (unsigned int)y; - else _N = (unsigned int)(-y); - for(_Ty _Z = _Ty(1);;x *= x) { - if((_N & 1)!=0) _Z *= x; - if((_N >>= 1)==0) return (y < 0 ? _Ty(1) / _Z : _Z); - } - } + +//inline long abs(_In_ long x) { return labs(x); } +_Check_return_ inline double abs(_In_ double x) throw() { return fabs(x); } + +_Check_return_ inline float abs(_In_ float x) throw() { return fabsf(x); } +_Check_return_ inline float acos(_In_ float x) throw() { return acosf(x); } +_Check_return_ inline float asin(_In_ float x) throw() { return asinf(x); } +_Check_return_ inline float atan(_In_ float x) throw() { return atanf(x); } +_Check_return_ inline float atan2(_In_ float y, _In_ float x) throw() { return atan2f(y, x); } +_Check_return_ inline float ceil(_In_ float x) throw() { return ceilf(x); } +_Check_return_ inline float copysign(_In_ float x, _In_ float y) throw() { return _copysignf(x, y); } +_Check_return_ inline float cos(_In_ float x) throw() { return cosf(x); } +_Check_return_ inline float cosh(_In_ float x) throw() { return coshf(x); } +_Check_return_ inline float exp(_In_ float x) throw() { return expf(x); } +_Check_return_ inline float fabs(_In_ float x) throw() { return fabsf(x); } +_Check_return_ inline float floor(_In_ float x) throw() { return floorf(x); } +_Check_return_ inline float fmod(_In_ float x, _In_ float y) throw() { return fmodf(x, y); } +_Check_return_ inline float frexp(_In_ float x, _Out_ int * y) throw() { return frexpf(x, y); } +_Check_return_ inline float hypot(_In_ float x, _In_ float y) throw() { return _hypotf(x, y); } +_Check_return_ inline float ldexp(_In_ float x, _In_ int y) throw() { return ldexpf(x, y); } +_Check_return_ inline float log(_In_ float x) throw() { return logf(x); } +_Check_return_ inline float log10(_In_ float x) throw() { return log10f(x); } +_Check_return_ inline float modf(_In_ float x, _Out_ float * y) throw() { return modff(x, y); } +_Check_return_ inline float pow(_In_ float x, _In_ float y) throw() { return powf(x, y); } +_Check_return_ inline float sin(_In_ float x) throw() { return sinf(x); } +_Check_return_ inline float sinh(_In_ float x) throw() { return sinhf(x); } +_Check_return_ inline float sqrt(_In_ float x) throw() { return sqrtf(x); } +_Check_return_ inline float tan(_In_ float x) throw() { return tanf(x); } +_Check_return_ inline float tanh(_In_ float x) throw() { return tanhf(x); } + +_Check_return_ inline long double abs(_In_ long double x) throw() { return fabsl(x); } +_Check_return_ inline long double acos(_In_ long double x) throw() { return acosl(x); } +_Check_return_ inline long double asin(_In_ long double x) throw() { return asinl(x); } +_Check_return_ inline long double atan(_In_ long double x) throw() { return atanl(x); } +_Check_return_ inline long double atan2(_In_ long double y, _In_ long double x) throw() { return atan2l(y, x); } +_Check_return_ inline long double ceil(_In_ long double x) throw() { return ceill(x); } +_Check_return_ inline long double copysign(_In_ long double x, _In_ long double y) throw() { return _copysignl(x, y); } +_Check_return_ inline long double cos(_In_ long double x) throw() { return cosl(x); } +_Check_return_ inline long double cosh(_In_ long double x) throw() { return coshl(x); } +_Check_return_ inline long double exp(_In_ long double x) throw() { return expl(x); } +_Check_return_ inline long double fabs(_In_ long double x) throw() { return fabsl(x); } +_Check_return_ inline long double floor(_In_ long double x) throw() { return floorl(x); } +_Check_return_ inline long double fmod(_In_ long double x, _In_ long double y) throw() { return fmodl(x, y); } +_Check_return_ inline long double frexp(_In_ long double x, _Out_ int * y) throw() { return frexpl(x, y); } +_Check_return_ inline long double hypot(_In_ long double x, _In_ long double y) throw() { return hypotl(x, y); } +_Check_return_ inline long double ldexp(_In_ long double x, _In_ int y) throw() { return ldexpl(x, y); } +_Check_return_ inline long double log(_In_ long double x) throw() { return logl(x); } +_Check_return_ inline long double log10(_In_ long double x) throw() { return log10l(x); } +_Check_return_ inline long double modf(_In_ long double x, _Out_ long double * y) throw() { return modfl(x, y); } +_Check_return_ inline long double pow(_In_ long double x, _In_ long double y) throw() { return powl(x, y); } +_Check_return_ inline long double sin(_In_ long double x) throw() { return sinl(x); } +_Check_return_ inline long double sinh(_In_ long double x) throw() { return sinhl(x); } +_Check_return_ inline long double sqrt(_In_ long double x) throw() { return sqrtl(x); } +_Check_return_ inline long double tan(_In_ long double x) throw() { return tanl(x); } +_Check_return_ inline long double tanh(_In_ long double x) throw() { return tanhl(x); } } -#endif +#endif /* !_CMATH_ */ +#endif /* __cplusplus */ #pragma pack(pop)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs