commit b8ae3f073bafadf48b8ce0985010a63dfd3ccd6e
author Alexandre Julliard <julliard@winehq.org> Thu Aug 27 16:38:47 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 27 16:49:53 2009 +0200
tree bdd5139552d677d63137bfb2a766a91b992ab7da
parent 0223f71dc7f5c3bfab724aa39d2e7585b379b68c

ntdll: Fix handling of the duplicate MxCsr entry in the x86_64 context.

server/protocol.def

diff --git a/server/protocol.def b/server/protocol.def
index d6b282a..9748931 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -159,7 +159,7 @@
     {
         struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs;
         struct { unsigned __int64 rip, rbp, rsp;
-                 unsigned int cs, ss, flags, mxcsr; } x86_64_regs;
+                 unsigned int cs, ss, flags; } x86_64_regs;
         struct { unsigned __int64 fir;
                  unsigned int psr; } alpha_regs;
         struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs;

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index 38a20b7..511c460 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -457,9 +457,8 @@
             dump_uint64( ",rip=", &ctx.ctl.x86_64_regs.rip );
             dump_uint64( ",rbp=", &ctx.ctl.x86_64_regs.rbp );
             dump_uint64( ",rsp=", &ctx.ctl.x86_64_regs.rsp );
-            fprintf( stderr, ",cs=%04x,ss=%04x,flags=%08x,mxcsr=%08x",
-                     ctx.ctl.x86_64_regs.cs, ctx.ctl.x86_64_regs.ss,
-                     ctx.ctl.x86_64_regs.flags, ctx.ctl.x86_64_regs.mxcsr );
+            fprintf( stderr, ",cs=%04x,ss=%04x,flags=%08x",
+                     ctx.ctl.x86_64_regs.cs, ctx.ctl.x86_64_regs.ss, ctx.ctl.x86_64_regs.flags );
         }
         if (ctx.flags & SERVER_CTX_INTEGER)
         {