From: Daniel Lehman dlehman25@gmail.com
--- dlls/msvcr120/tests/msvcr120.c | 3 --- dlls/msvcrt/math.c | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 0c5e8128ae4..890fb4916e6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1090,7 +1090,6 @@ static void test_feenv(void) ok(!ret, "feholdexcept returned %x\n", ret); ok(env._Fe_ctl == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env._Fe_ctl = %lx\n", env._Fe_ctl); - todo_wine ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); except = FE_ALL_EXCEPT; ret = p_fesetexceptflag(&except, FE_INEXACT|FE_UNDERFLOW); @@ -1103,7 +1102,6 @@ static void test_feenv(void) ok(!ret, "feholdexcept returned %x\n", ret); ok(env._Fe_ctl == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env._Fe_ctl = %lx\n", env._Fe_ctl); - todo_wine ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat);
except = FE_ALL_EXCEPT; @@ -1113,7 +1111,6 @@ static void test_feenv(void) ok(!ret, "feholdexcept returned %x\n", ret); ok(env._Fe_ctl == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env._Fe_ctl = %lx\n", env._Fe_ctl); - todo_wine ok(env._Fe_stat == (FE_INEXACT|FE_UNDERFLOW), "env._Fe_stat = %lx\n", env._Fe_stat); p__clearfp(); } diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1c1d5227b1b..be345fb7a4a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1568,8 +1568,9 @@ void CDECL _fpreset(void) */ int CDECL feholdexcept(fenv_t *env) { - FIXME( "(%p) stub\n", env ); - return 0; + TRACE( "(%p)\n", env ); + fegetenv(env); + return feclearexcept(FE_ALL_EXCEPT); }
/*********************************************************************