Dmitry Timoshkov : include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition.
Alexandre Julliard
julliard at winehq.org
Tue Apr 30 12:51:27 CDT 2013
Module: wine
Branch: master
Commit: 10476af6268de52f98112d47264ac4f4f7f5dc3b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10476af6268de52f98112d47264ac4f4f7f5dc3b
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Tue Apr 30 18:12:47 2013 +0900
include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition.
---
dlls/ntdll/rtl.c | 1 +
dlls/ntdll/signal_x86_64.c | 2 +-
include/winnt.h | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 34869e7..bbcd454 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -34,6 +34,7 @@
#include <netinet/in.h>
#endif
#include "ntstatus.h"
+#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define WIN32_NO_STATUS
#define USE_WS_PREFIX
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 7d2b8d5..f5a8ec9 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2574,7 +2574,7 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt
static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A val )
{
*(&context->u.s.Xmm0 + reg) = val;
- if (ctx_ptr) ctx_ptr->u1.FloatingContext[reg] = &context->u.s.Xmm0 + reg;
+ if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = &context->u.s.Xmm0 + reg;
}
static int get_opcode_size( struct opcode op )
diff --git a/include/winnt.h b/include/winnt.h
index bdfa464..6911f1c 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1158,8 +1158,8 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS
PM128A Xmm13;
PM128A Xmm14;
PM128A Xmm15;
- } DUMMYSTRUCTNAME1;
- } DUMMYUNIONNAME1;
+ } DUMMYSTRUCTNAME;
+ } DUMMYUNIONNAME;
union
{
@@ -1182,7 +1182,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS
PULONG64 R13;
PULONG64 R14;
PULONG64 R15;
- } DUMMYSTRUCTNAME2;
+ } DUMMYSTRUCTNAME;
} DUMMYUNIONNAME2;
} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS;
More information about the wine-cvs
mailing list