Module: wine Branch: master Commit: 1f4f07c026d3ee5bc006b111e15f9c23bb9e41b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4f07c026d3ee5bc006b111e1... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:58:25 2012 +0200 msvcp90: Added _Nomemory implementation. --- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d883307..6247616 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -447,6 +447,13 @@ const char* __thiscall MSVCP_failure_what(failure *this) DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +/* ?_Nomemory(a)std@@YAXXZ */ +void __cdecl _Nomemory(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c544ff5..742f162 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2664,7 +2664,7 @@ @ cdecl -arch=win64 ?_Narrow_s@?$ctype(a)G@std@@QEBAPEBGPEBG0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ thiscall -arch=win32 ?_Narrow_s@?$ctype(a)_W@std@@QBEPB_WPB_W0DPADI(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ cdecl -arch=win64 ?_Narrow_s@?$ctype(a)_W@std@@QEBAPEB_WPEB_W0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s -@ stub ?_Nomemory(a)std@@YAXXZ +@ cdecl ?_Nomemory(a)std@@YAXXZ() _Nomemory # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB # extern -arch=win64 ?_Oneplusroot2low@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB