Sebastian Lackner : server: Get rid of RIP_EVENT union elements.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9696ea506309b4ee4b72c456085a785b5d59c2f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9696ea506309b4ee4b72c45608...

Author: Sebastian Lackner 
Date:   Mon Jun 23 03:02:31 2014 +0200

server: Get rid of RIP_EVENT union elements.

---

include/wine/server_protocol.h | 8 +-------
 server/debugger.c              | 2 +-
 server/protocol.def            | 6 ------
 server/trace.c                 | 4 ----
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index a5ecb20..57ab839 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -112,12 +112,6 @@ typedef union
         int          __pad;
         mod_handle_t base;
     } unload_dll;
-    struct
-    {
-        int          code;
-        int          error;
-        int          type;
-    } rip_info;
 } debug_event_t;

@@ -5840,6 +5834,6 @@ union generic_reply
     struct set_suspend_context_reply set_suspend_context_reply;
 };

-#define SERVER_PROTOCOL_VERSION 455
+#define SERVER_PROTOCOL_VERSION 456

#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/debugger.c b/server/debugger.c
index 3ccec29..374f2ad 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -211,7 +211,7 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg )

typedef int (*fill_event_func)( struct debug_event *event, const void *arg );

-#define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT  /* RIP_EVENT not supported */
+#define NB_DEBUG_EVENTS UNLOAD_DLL_DEBUG_EVENT

static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] =
 {
diff --git a/server/protocol.def b/server/protocol.def
index 61b9ed5..a8c1fb9 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -128,12 +128,6 @@ typedef union
         int          __pad;
         mod_handle_t base;       /* base address of the dll */
     } unload_dll;
-    struct
-    {
-        int          code;       /* RIP_EVENT */
-        int          error;      /* ??? */
-        int          type;       /* ??? */
-    } rip_info;
 } debug_event_t;

/* supported CPU types */
diff --git a/server/trace.c b/server/trace.c
index 0887daf..4834354 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -712,10 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size )
         dump_uint64( ",base=", &event.unload_dll.base );
         fputc( '}', stderr );
         break;
-    case RIP_EVENT:
-        fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix,
-                 event.rip_info.error, event.rip_info.type );
-        break;
     case 0:  /* zero is the code returned on timeouts */
         fprintf( stderr, "%s{}", prefix );
         break;