Module: wine Branch: master Commit: 2f9fdec310a69aa0d8773c923fd58df1b40a83ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9fdec310a69aa0d8773c923f...
Author: Sebastian Lackner sebastian@fds-team.de Date: Fri Jun 20 15:23:04 2014 +0200
server: Remove output_debug_string request.
---
include/wine/server_protocol.h | 24 +----------------------- server/debugger.c | 20 +------------------- server/protocol.def | 13 ------------- server/request.h | 5 ----- server/trace.c | 14 -------------- 5 files changed, 2 insertions(+), 74 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d69ad3..a5ecb20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,12 +115,6 @@ typedef union struct { int code; - data_size_t length; - client_ptr_t string; - } output_string; - struct - { - int code; int error; int type; } rip_info; @@ -2261,19 +2255,6 @@ struct get_exception_status_reply
-struct output_debug_string_request -{ - struct request_header __header; - data_size_t length; - client_ptr_t string; -}; -struct output_debug_string_reply -{ - struct reply_header __header; -}; - - - struct continue_debug_event_request { struct request_header __header; @@ -5171,7 +5152,6 @@ enum request REQ_wait_debug_event, REQ_queue_exception_event, REQ_get_exception_status, - REQ_output_debug_string, REQ_continue_debug_event, REQ_debug_process, REQ_debug_break, @@ -5433,7 +5413,6 @@ union generic_request struct wait_debug_event_request wait_debug_event_request; struct queue_exception_event_request queue_exception_event_request; struct get_exception_status_request get_exception_status_request; - struct output_debug_string_request output_debug_string_request; struct continue_debug_event_request continue_debug_event_request; struct debug_process_request debug_process_request; struct debug_break_request debug_break_request; @@ -5693,7 +5672,6 @@ union generic_reply struct wait_debug_event_reply wait_debug_event_reply; struct queue_exception_event_reply queue_exception_event_reply; struct get_exception_status_reply get_exception_status_reply; - struct output_debug_string_reply output_debug_string_reply; struct continue_debug_event_reply continue_debug_event_reply; struct debug_process_reply debug_process_reply; struct debug_break_reply debug_break_reply; @@ -5862,6 +5840,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; };
-#define SERVER_PROTOCOL_VERSION 454 +#define SERVER_PROTOCOL_VERSION 455
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 0bb9fb8..3315f6e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -209,13 +209,6 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) return 1; }
-static int fill_output_debug_string_event( struct debug_event *event, const void *arg ) -{ - const debug_event_t *data = arg; - event->data.output_string = data->output_string; - return 1; -} - typedef int (*fill_event_func)( struct debug_event *event, const void *arg );
#define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ @@ -228,8 +221,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = fill_exit_thread_event, /* EXIT_THREAD_DEBUG_EVENT */ fill_exit_process_event, /* EXIT_PROCESS_DEBUG_EVENT */ fill_load_dll_event, /* LOAD_DLL_DEBUG_EVENT */ - fill_unload_dll_event, /* UNLOAD_DLL_DEBUG_EVENT */ - fill_output_debug_string_event /* OUTPUT_DEBUG_STRING_EVENT */ + fill_unload_dll_event /* UNLOAD_DLL_DEBUG_EVENT */ };
@@ -695,16 +687,6 @@ DECL_HANDLER(get_exception_status) } }
-/* send an output string to the debugger */ -DECL_HANDLER(output_debug_string) -{ - debug_event_t data; - - data.output_string.string = req->string; - data.output_string.length = req->length; - generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); -} - /* simulate a breakpoint in a process */ DECL_HANDLER(debug_break) { diff --git a/server/protocol.def b/server/protocol.def index fec5e75..61b9ed5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -130,12 +130,6 @@ typedef union } unload_dll; struct { - int code; /* OUTPUT_DEBUG_STRING_EVENT */ - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ - } output_string; - struct - { int code; /* RIP_EVENT */ int error; /* ??? */ int type; /* ??? */ @@ -1728,13 +1722,6 @@ enum char_info_mode @END
-/* Send an output string to the debugger */ -@REQ(output_debug_string) - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ -@END - - /* Continue a debug event */ @REQ(continue_debug_event) process_id_t pid; /* process id to continue */ diff --git a/server/request.h b/server/request.h index 8e35b0d..e25e327 100644 --- a/server/request.h +++ b/server/request.h @@ -194,7 +194,6 @@ DECL_HANDLER(next_thread); DECL_HANDLER(wait_debug_event); DECL_HANDLER(queue_exception_event); DECL_HANDLER(get_exception_status); -DECL_HANDLER(output_debug_string); DECL_HANDLER(continue_debug_event); DECL_HANDLER(debug_process); DECL_HANDLER(debug_break); @@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_wait_debug_event, (req_handler)req_queue_exception_event, (req_handler)req_get_exception_status, - (req_handler)req_output_debug_string, (req_handler)req_continue_debug_event, (req_handler)req_debug_process, (req_handler)req_debug_break, @@ -1228,9 +1226,6 @@ C_ASSERT( sizeof(struct queue_exception_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_request) == 16 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index b792494..0887daf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,11 +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 OUTPUT_DEBUG_STRING_EVENT: - fprintf( stderr, "%s{output_string", prefix ); - dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",len=%u}", event.output_string.length ); - break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, event.rip_info.error, event.rip_info.type ); @@ -2174,12 +2169,6 @@ static void dump_get_exception_status_reply( const struct get_exception_status_r dump_varargs_context( " context=", cur_size ); }
-static void dump_output_debug_string_request( const struct output_debug_string_request *req ) -{ - fprintf( stderr, " length=%u", req->length ); - dump_uint64( ", string=", &req->string ); -} - static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4184,7 +4173,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_wait_debug_event_request, (dump_func)dump_queue_exception_event_request, (dump_func)dump_get_exception_status_request, - (dump_func)dump_output_debug_string_request, (dump_func)dump_continue_debug_event_request, (dump_func)dump_debug_process_request, (dump_func)dump_debug_break_request, @@ -4444,7 +4432,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_reply, NULL, NULL, - NULL, (dump_func)dump_debug_break_reply, NULL, (dump_func)dump_read_process_memory_reply, @@ -4700,7 +4687,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "wait_debug_event", "queue_exception_event", "get_exception_status", - "output_debug_string", "continue_debug_event", "debug_process", "debug_break",