[patch] wine-valgrind fix

wine-9999-valdgrind.diff (text/plain), 1.49 KB, created by Bernd Buschinski on 2007-12-21 01:09:52 UTC

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 0c80f83..ee0ce61 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -156,15 +156,15 @@ static inline void mark_block_initialized( void *ptr, SIZE_T size )
 /* mark a block of memory as uninitialized for debugging purposes */
 static inline void mark_block_uninitialized( void *ptr, SIZE_T size )
 {
-#ifdef VALGRIND_MAKE_WRITABLE
-    VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
+#ifdef VALGRIND_MAKE_MEM_UNDEFINED
+    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
 #endif
     if (TRACE_ON(heap) || WARN_ON(heap))
     {
         memset( ptr, ARENA_INUSE_FILLER, size );
-#ifdef VALGRIND_MAKE_WRITABLE
+#ifdef VALGRIND_MAKE_MEM_UNDEFINED
         /* make it uninitialized to valgrind again */
-        VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
+        VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
 #endif
     }
 }
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 993936e..c5d2888 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -937,7 +937,7 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun
 
     stack--;  /* push the stack_layout structure */
 #ifdef HAVE_VALGRIND_MEMCHECK_H
-    VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));
+    VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack));
 #endif
     stack->ret_addr     = (void *)0xdeadbabe;  /* raise_func must not return */
     stack->rec_ptr      = &stack->rec;