Alexandre Julliard : server: Fix 64-bit alignment of the context structure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 27f2a35742d481f1c90287e5c4968ba91c15f165
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=27f2a35742d481f1c90287e5c4...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Apr  1 19:56:09 2010 +0200

server: Fix 64-bit alignment of the context structure.

---

 include/wine/server_protocol.h |    8 ++++----
 server/protocol.def            |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 1a20438..edb2d9d 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -142,10 +142,10 @@ typedef struct
     {
         struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs;
         struct { unsigned __int64 rip, rbp, rsp;
-                 unsigned int cs, ss, flags; } x86_64_regs;
+                 unsigned int cs, ss, flags, __pad; } x86_64_regs;
         struct { unsigned __int64 fir;
-                 unsigned int psr; } alpha_regs;
-        struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs;
+                 unsigned int psr, __pad; } alpha_regs;
+        struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs;
         struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs;
     } ctl;
     union
@@ -5418,6 +5418,6 @@ union generic_reply
     struct set_cursor_reply set_cursor_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 397
+#define SERVER_PROTOCOL_VERSION 398
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index 0aa8f6c..4aaff10 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -158,10 +158,10 @@ typedef struct
     {
         struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs;
         struct { unsigned __int64 rip, rbp, rsp;
-                 unsigned int cs, ss, flags; } x86_64_regs;
+                 unsigned int cs, ss, flags, __pad; } x86_64_regs;
         struct { unsigned __int64 fir;
-                 unsigned int psr; } alpha_regs;
-        struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs;
+                 unsigned int psr, __pad; } alpha_regs;
+        struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs;
         struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs;
     } ctl;  /* selected by SERVER_CTX_CONTROL */
     union