[PATCH] include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition. Take 2.

[Dmitry Timoshkov]

Alexandre Julliard <julliard at winehq.org> wrote:

> gcc -c -I../../../wine/dlls/ntdll -I. -I../../../wine/include -I../../include  -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -gdwarf-2 -gstrict-dwarf -Wpointer-arith -Wlogical-op -I/usr/include/freetype2    -g -O2  -o rtl.o ../../../wine/dlls/ntdll/rtl.c
> In file included from ../../../wine/include/windef.h:252:0,
>                  from ../../../wine/dlls/ntdll/rtl.c:40:
> ../../../wine/include/winnt.h:1185:11: error: duplicate member ___s___
> make[1]: *** [rtl.o] Error 1

Does this version work better?

---
 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;
 
-- 
1.8.2.1