msvcrt: Fix x87 FPU status register assignment detection.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51579Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix x87 FPU status register assignment detection.
62d26937 · Piotr Caban · Alexandre Julliard · 2cc98b72 · 62d26937
Commit 62d26937 authored Aug 09, 2021 by Piotr Caban Committed by Alexandre Julliard Aug 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

math.c dlls/msvcrt/math.c +4 -1

No files found.
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -35,6 +35,7 @@
 * ====================================================
 */

+#include <assert.h>
 #include <complex.h>
 #include <stdio.h>
 #include <fenv.h>
@@ -5321,7 +5322,7 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask,
        if (*cw & _IC_AFFINE) newcw |= 0x1000;
    }

-    if (oldsw != newsw && newsw)
+    if (oldsw != newsw && (newsw & 0x3f))
    {
        struct {
            WORD control_word;
@@ -5338,6 +5339,8 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask,
            WORD unused5;
        } fenv;

+        assert(cw);
+
        __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) );
        fenv.control_word = newcw;
        fenv.status_word = newsw;