Eric Pouech : Suppress some false-positives reported by valgrind.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jan 27 09:19:17 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 2e0b5336f60376b1ef9e570fca9e144a6bb96b53
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2e0b5336f60376b1ef9e570fca9e144a6bb96b53

Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date:   Fri Jan 27 16:17:51 2006 +0100

Suppress some false-positives reported by valgrind.

---

 dlls/ntdll/signal_i386.c |    1 +
 server/console.c         |    9 ++++++++-
 server/fd.c              |    1 +
 server/request.c         |    1 +
 4 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index fcdccfd..5169727 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -742,6 +742,7 @@ inline static void save_context( CONTEXT
 {
     struct ntdll_thread_regs * const regs = ntdll_get_thread_regs();
 
+    memset(context, 0, sizeof(*context));
     context->ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
     context->Eax          = EAX_sig(sigcontext);
     context->Ebx          = EBX_sig(sigcontext);
diff --git a/server/console.c b/server/console.c
index f6b97bd..57a5804 100644
--- a/server/console.c
+++ b/server/console.c
@@ -265,7 +265,6 @@ static struct object *create_console_inp
 static struct screen_buffer *create_console_output( struct console_input *console_input )
 {
     struct screen_buffer *screen_buffer;
-    struct console_renderer_event evt;
     int	i;
 
     if (!(screen_buffer = alloc_object( &screen_buffer_ops ))) return NULL;
@@ -302,10 +301,12 @@ static struct screen_buffer *create_cons
 
     if (!console_input->active)
     {
+        struct console_renderer_event evt;
 	console_input->active = (struct screen_buffer*)grab_object( screen_buffer );
 
 	/* generate the initial events */
 	evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT;
+        memset(&evt.u, 0, sizeof(evt.u));
 	console_input_events_append( console_input->evt, &evt );
 
 	evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT;
@@ -351,6 +352,7 @@ int free_console( struct process *proces
 	/* all processes have terminated... tell the renderer to terminate too */
 	struct console_renderer_event evt;
 	evt.event = CONSOLE_RENDERER_EXIT_EVENT;
+        memset(&evt.u, 0, sizeof(evt.u));
 	console_input_events_append( console->evt, &evt );
     }
     release_object( console );
@@ -600,6 +602,7 @@ static int set_console_input_info( const
 
     if (!(console = console_input_get( req->handle, CONSOLE_WRITE ))) goto error;
 
+    memset(&evt.u, 0, sizeof(evt.u));
     if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB)
     {
 	struct screen_buffer *screen_buffer;
@@ -739,6 +742,7 @@ static int set_console_output_info( stru
 {
     struct console_renderer_event evt;
 
+    memset(&evt.u, 0, sizeof(evt.u));
     if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM)
     {
 	if (req->cursor_size < 1 || req->cursor_size > 100)
@@ -1067,6 +1071,7 @@ static int write_console_output( struct 
     {
         struct console_renderer_event evt;
         evt.event = CONSOLE_RENDERER_UPDATE_EVENT;
+        memset(&evt.u, 0, sizeof(evt.u));
         evt.u.update.top    = y + x / screen_buffer->width;
         evt.u.update.bottom = y + (x + i - 1) / screen_buffer->width;
         console_input_events_append( screen_buffer->input->evt, &evt );
@@ -1117,6 +1122,7 @@ static int fill_console_output( struct s
     {
         struct console_renderer_event evt;
         evt.event = CONSOLE_RENDERER_UPDATE_EVENT;
+        memset(&evt.u, 0, sizeof(evt.u));
         evt.u.update.top    = y;
         evt.u.update.bottom = (y * screen_buffer->width + x + count - 1) / screen_buffer->width;
         console_input_events_append( screen_buffer->input->evt, &evt );
@@ -1230,6 +1236,7 @@ static void scroll_console_output( obj_h
 
     /* FIXME: this could be enhanced, by signalling scroll */
     evt.event = CONSOLE_RENDERER_UPDATE_EVENT;
+    memset(&evt.u, 0, sizeof(evt.u));
     evt.u.update.top    = min(ysrc, ydst);
     evt.u.update.bottom = max(ysrc, ydst) + h - 1;
     console_input_events_append( screen_buffer->input->evt, &evt );
diff --git a/server/fd.c b/server/fd.c
index ed98821..36cbe2a 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -384,6 +384,7 @@ static inline void set_fd_epoll_events( 
     }
 
     ev.events = events;
+    memset(&ev.data, 0, sizeof(ev.data));
     ev.data.u32 = user;
 
     if (epoll_ctl( epoll_fd, ctl, fd->unix_fd, &ev ) == -1)
diff --git a/server/request.c b/server/request.c
index 4793cb4..f1580d2 100644
--- a/server/request.c
+++ b/server/request.c
@@ -750,6 +750,7 @@ void open_master_socket(void)
             }
 
             /* signal parent */
+            dummy = 0;
             write( sync_pipe[1], &dummy, 1 );
             close( sync_pipe[1] );
             break;




More information about the wine-cvs mailing list