January 2010 - Wine-commits

Alexandre Julliard : ntdll: Simplify the checking of heap pointers when debugging is not enabled.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: d387a34d96b5d77f225f86f0420c456d03c05a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d387a34d96b5d77f225f86f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:30:52 2010 +0100 ntdll: Simplify the checking of heap pointers when debugging is not enabled. --- dlls/ntdll/heap.c | 94 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 63 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2e0dcc6..29e9559 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1333,6 +1333,52 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ /*********************************************************************** + * validate_block_pointer + * + * Minimum validation needed to catch bad parameters in heap functions. + */ +static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARENA_INUSE *arena ) +{ + SUBHEAP *subheap; + BOOL ret = FALSE; + + if (!(*ret_subheap = subheap = HEAP_FindSubHeap( heap, arena ))) + { + ARENA_LARGE *large_arena = find_large_block( heap, arena + 1 ); + + if (!large_arena) + { + WARN( "Heap %p: pointer %p is not inside heap\n", heap, arena + 1 ); + return FALSE; + } + if ((heap->flags & HEAP_VALIDATE) && !validate_large_arena( heap, large_arena, QUIET )) + return FALSE; + return TRUE; + } + + if ((char *)arena < (char *)subheap->base + subheap->headerSize) + WARN( "Heap %p: pointer %p is inside subheap %p header\n", subheap->heap, arena + 1, subheap ); + else if (subheap->heap->flags & HEAP_VALIDATE) /* do the full validation */ + ret = HEAP_ValidateInUseArena( subheap, arena, QUIET ); + else if ((ULONG_PTR)arena % ALIGNMENT != ARENA_OFFSET) + WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, arena ); + else if (arena->magic != ARENA_INUSE_MAGIC) + WARN( "Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, arena->magic, arena ); + else if (arena->size & ARENA_FLAG_FREE) + ERR( "Heap %p: bad flags %08x for in-use arena %p\n", + subheap->heap, arena->size & ~ARENA_SIZE_MASK, arena ); + else if ((const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) > (const char *)subheap->base + subheap->size || + (const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) < (const char *)(arena + 1)) + ERR( "Heap %p: bad size %08x for in-use arena %p\n", + subheap->heap, arena->size & ARENA_SIZE_MASK, arena ); + else + ret = TRUE; + + return ret; +} + + +/*********************************************************************** * heap_set_debug_flags */ void heap_set_debug_flags( HANDLE handle ) @@ -1633,24 +1679,13 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) /* Some sanity checks */ pInUse = (ARENA_INUSE *)ptr - 1; - if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) - { - ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + if (!validate_block_pointer( heapPtr, &subheap, pInUse )) goto error; - if (!large_arena) goto error; - if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) - goto error; + if (!subheap) free_large_block( heapPtr, flags, ptr ); - goto done; - } - if ((char *)pInUse < (char *)subheap->base + subheap->headerSize) goto error; - if (!HEAP_ValidateInUseArena( subheap, pInUse, QUIET )) goto error; - - /* Turn the block into a free block */ - - HEAP_MakeInUseBlockFree( subheap, pInUse ); + else + HEAP_MakeInUseBlockFree( subheap, pInUse ); -done: if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); TRACE("(%p,%08x,%p): returning TRUE\n", heap, flags, ptr ); return TRUE; @@ -1705,19 +1740,13 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; pArena = (ARENA_INUSE *)ptr - 1; - if (!(subheap = HEAP_FindSubHeap( heapPtr, pArena ))) + if (!validate_block_pointer( heapPtr, &subheap, pArena )) goto error; + if (!subheap) { - ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); - - if (!large_arena) goto error; - if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) - goto error; if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; notify_free( ptr ); goto done; } - if ((char *)pArena < (char *)subheap->base + subheap->headerSize) goto error; - if (!HEAP_ValidateInUseArena( subheap, pArena, QUIET )) goto error; /* Check if we need to grow the block */ @@ -1910,6 +1939,8 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap ) SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) { SIZE_T ret; + const ARENA_INUSE *pArena; + SUBHEAP *subheap; HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) @@ -1920,20 +1951,21 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) + + pArena = (const ARENA_INUSE *)ptr - 1; + if (!validate_block_pointer( heapPtr, &subheap, pArena )) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); ret = ~0UL; } + else if (!subheap) + { + const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; + ret = large_arena->data_size; + } else { - const ARENA_INUSE *pArena = (const ARENA_INUSE *)ptr - 1; - if (pArena->size == ARENA_LARGE_SIZE) - { - const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; - ret = large_arena->data_size; - } - else ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; + ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; } if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );

1 0

Alexandre Julliard : ntdll: Add 8 more bytes to the block tail when tail checking is enabled.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: 31aa3900e4f861016467a8e94a4424cf545a1e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31aa3900e4f861016467a8e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:33:53 2010 +0100 ntdll: Add 8 more bytes to the block tail when tail checking is enabled. --- dlls/kernel32/tests/heap.c | 14 +++++++++++++- dlls/ntdll/heap.c | 8 +++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 81850fe..0c0de11 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -488,7 +488,7 @@ static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; BOOL ret; - SIZE_T size, large_size = 800 * 1024 + 37; + SIZE_T i, size, large_size = 800 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08x\n", flags ); @@ -640,6 +640,18 @@ static void test_heap_checks( DWORD flags ) ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" ); + + /* test block sizes when tail checking */ + if (flags & HEAP_TAIL_CHECKING_ENABLED) + { + for (size = 0; size < 64; size++) + { + p = HeapAlloc( GetProcessHeap(), 0, size ); + for (i = 0; i < 32; i++) if (p[size + i] != 0xab) break; + ok( i >= 8, "only %lu tail bytes for size %lu\n", i, size ); + HeapFree( GetProcessHeap(), 0, p ); + } + } } static void test_debug_heap( const char *argv0, DWORD flags ) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 29e9559..c3fdf2c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -106,6 +106,8 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 +/* extra size to add at the end of block for tail checking */ +#define HEAP_TAIL_EXTRA_SIZE(flags) (flags & HEAP_TAIL_CHECKING_ENABLED ? 8 : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -677,7 +679,7 @@ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) { ARENA_LARGE *arena; - SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size); + SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ @@ -1581,7 +1583,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) if (!heapPtr) return NULL; flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; - rounded_size = ROUND_SIZE(size); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE( flags ); if (rounded_size < size) /* overflow */ { if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); @@ -1735,7 +1737,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - rounded_size = ROUND_SIZE(size); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); if (rounded_size < size) goto oom; /* overflow */ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE;

1 0

Alexandre Julliard : ntdll: Always enable tail checking when running under Valgrind.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: 90f31aa3811ef3e9920796d51b8da748c15cff05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f31aa3811ef3e9920796d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:35:32 2010 +0100 ntdll: Always enable tail checking when running under Valgrind. --- dlls/ntdll/heap.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index c3fdf2c..1055ce0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -29,6 +29,8 @@ #include <string.h> #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> +#else +#define RUNNING_ON_VALGRIND 0 #endif #define NONAMELESSUNION @@ -107,7 +109,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 /* extra size to add at the end of block for tail checking */ -#define HEAP_TAIL_EXTRA_SIZE(flags) (flags & HEAP_TAIL_CHECKING_ENABLED ? 8 : 0) +#define HEAP_TAIL_EXTRA_SIZE(flags) ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? 8 : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -206,16 +208,16 @@ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) /* mark a block of memory as a tail block */ static inline void mark_block_tail( void *ptr, SIZE_T size, DWORD flags ) { - mark_block_uninitialized( ptr, size ); if (flags & HEAP_TAIL_CHECKING_ENABLED) { + mark_block_uninitialized( ptr, size ); memset( ptr, ARENA_TAIL_FILLER, size ); + } #if defined(VALGRIND_MAKE_MEM_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); #elif defined( VALGRIND_MAKE_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif - } } /* initialize contents of a newly created block of memory */

1 0

Alexandre Julliard : makefiles: Generate the static library rules from configure.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: b6c275b1b4f2d4d942e7bd011172081f367c25cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c275b1b4f2d4d942e7bd011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 20:40:12 2010 +0100 makefiles: Generate the static library rules from configure. --- aclocal.m4 | 8 +++++++- configure | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 50 ++++---------------------------------------------- tools/make_makefiles | 26 ++++---------------------- 5 files changed, 65 insertions(+), 69 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b30e41e..a603833 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -215,7 +215,13 @@ dnl dnl Usage: WINE_CONFIG_LIB(name) dnl AC_DEFUN([WINE_CONFIG_LIB], -[WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])]) +[ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + $1/lib$1.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +$1/lib$1.a: $1 +$1/lib$1.cross.a: dummy + @cd $1 && \$(MAKE) lib$1.cross.a" +WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])]) dnl **** Add a message to the list displayed at the end **** dnl diff --git a/configure b/configure index 9eabf3c..75828ce 100755 --- a/configure +++ b/configure @@ -601,6 +601,8 @@ ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_INSTALL_DIRS ALL_PROGRAM_DIRS ALL_TEST_DIRS +ALL_IMPORTLIB_RULES +ALL_STATIC_LIBS ALL_IMPLIB_DIRS ALL_DLL_DIRS ALL_TOP_DIRS @@ -13604,6 +13606,10 @@ ALL_DLL_DIRS="" ALL_IMPLIB_DIRS="" +ALL_STATIC_LIBS="" + +ALL_IMPORTLIB_RULES="" + ALL_TEST_DIRS="" ALL_PROGRAM_DIRS="" @@ -13713,6 +13719,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/actxprxy/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + adsiid/libadsiid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +adsiid/libadsiid.a: adsiid +adsiid/libadsiid.cross.a: dummy + @cd adsiid && \$(MAKE) libadsiid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/adsiid/Makefile" test "x$enable_adsiid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14697,6 +14709,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxdiagn/tests/Makefile: dlls/dxdiagn/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dxdiagn/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxerr8/libdxerr8.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxerr8/libdxerr8.a: dxerr8 +dxerr8/libdxerr8.cross.a: dummy + @cd dxerr8 && \$(MAKE) libdxerr8.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr8/Makefile" test "x$enable_dxerr8" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14705,6 +14723,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr8/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxerr9/libdxerr9.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxerr9/libdxerr9.a: dxerr9 +dxerr9/libdxerr9.cross.a: dummy + @cd dxerr9 && \$(MAKE) libdxerr9.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr9/Makefile" test "x$enable_dxerr9" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -14729,6 +14753,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxgi/tests/Makefile: dlls/dxgi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dxgi/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + dxguid/libdxguid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +dxguid/libdxguid.a: dxguid +dxguid/libdxguid.cross.a: dummy + @cd dxguid && \$(MAKE) libdxguid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxguid/Makefile" test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -16601,6 +16631,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/stress.dll16/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + strmiids/libstrmiids.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +strmiids/libstrmiids.a: strmiids +strmiids/libstrmiids.cross.a: dummy + @cd strmiids && \$(MAKE) libstrmiids.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/strmiids/Makefile" test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -16793,6 +16829,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/usp10/tests/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + uuid/libuuid.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +uuid/libuuid.a: uuid +uuid/libuuid.cross.a: dummy + @cd uuid && \$(MAKE) libuuid.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/uuid/Makefile" test "x$enable_uuid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ @@ -17001,6 +17043,12 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winecoreaudio.drv/Makefile" +ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\ + winecrt0/libwinecrt0.a" +ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES +winecrt0/libwinecrt0.a: winecrt0 +winecrt0/libwinecrt0.cross.a: dummy + @cd winecrt0 && \$(MAKE) libwinecrt0.cross.a" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winecrt0/Makefile" test "x$enable_winecrt0" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ diff --git a/configure.ac b/configure.ac index 4e9d263..158aafb 100644 --- a/configure.ac +++ b/configure.ac @@ -2091,6 +2091,8 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"") +AC_SUBST(ALL_STATIC_LIBS,"") +AC_SUBST(ALL_IMPORTLIB_RULES,"") AC_SUBST(ALL_TEST_DIRS,"") AC_SUBST(ALL_PROGRAM_DIRS,"") AC_SUBST(ALL_PROGRAM_INSTALL_DIRS,"") diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 20dcb22..361e5fb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,15 +31,9 @@ IMPORT_SYMLINKS = \ libwinspool.$(IMPLIBEXT) \ libxinput.$(IMPLIBEXT) -IMPORT_LIBS = \ +STATIC_LIBS = @ALL_STATIC_LIBS@ +IMPORT_LIBS = $(STATIC_LIBS) \ $(IMPORT_SYMLINKS) \ - adsiid/libadsiid.a \ - dxerr8/libdxerr8.a \ - dxerr9/libdxerr9.a \ - dxguid/libdxguid.a \ - strmiids/libstrmiids.a \ - uuid/libuuid.a \ - winecrt0/libwinecrt0.a \ aclui/libaclui.$(IMPLIBEXT) \ activeds/libactiveds.$(IMPLIBEXT) \ advapi32/libadvapi32.$(IMPLIBEXT) \ @@ -184,17 +178,10 @@ IMPORT_LIBS = \ wtsapi32/libwtsapi32.$(IMPLIBEXT) \ xinput1_3/libxinput.$(IMPLIBEXT) -CROSS_IMPLIBS = \ +CROSS_IMPLIBS = $(STATIC_LIBS:.a=.cross.a) \ libd3dx9.cross.a \ libwinspool.cross.a \ libxinput.cross.a \ - adsiid/libadsiid.cross.a \ - dxerr8/libdxerr8.cross.a \ - dxerr9/libdxerr9.cross.a \ - dxguid/libdxguid.cross.a \ - strmiids/libstrmiids.cross.a \ - uuid/libuuid.cross.a \ - winecrt0/libwinecrt0.cross.a \ aclui/libaclui.cross.a \ activeds/libactiveds.cross.a \ advapi32/libadvapi32.cross.a \ @@ -812,36 +799,7 @@ libxinput.def: xinput1_3/libxinput.def $(BUILDSUBDIRS): $(IMPORT_LIBS) $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPORT_LIBS) -# Map library name to the corresponding directory - -adsiid/libadsiid.a: adsiid -adsiid/libadsiid.cross.a: dummy - @cd adsiid && $(MAKE) libadsiid.cross.a - -dxerr8/libdxerr8.a: dxerr8 -dxerr8/libdxerr8.cross.a: dummy - @cd dxerr8 && $(MAKE) libdxerr8.cross.a - -dxerr9/libdxerr9.a: dxerr9 -dxerr9/libdxerr9.cross.a: dummy - @cd dxerr9 && $(MAKE) libdxerr9.cross.a - -dxguid/libdxguid.a: dxguid -dxguid/libdxguid.cross.a: dummy - @cd dxguid && $(MAKE) libdxguid.cross.a - -strmiids/libstrmiids.a: strmiids -strmiids/libstrmiids.cross.a: dummy - @cd strmiids && $(MAKE) libstrmiids.cross.a - -uuid/libuuid.a: uuid -uuid/libuuid.cross.a: dummy - @cd uuid && $(MAKE) libuuid.cross.a - -winecrt0/libwinecrt0.a: winecrt0 -winecrt0/libwinecrt0.cross.a: dummy - @cd winecrt0 && $(MAKE) libwinecrt0.cross.a - +(a)ALL_IMPORTLIB_RULES@ # Misc rules diff --git a/tools/make_makefiles b/tools/make_makefiles index 9b5dc43..029994e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -509,27 +509,20 @@ sub update_dlls(@) $text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod}; } - $text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; - foreach my $mod (sort keys %staticlib_dirs) - { - $text .= sprintf " \\\n\t%s/lib%s.a", $staticlib_dirs{$mod}, $mod; - } + $text .= "\n\nSTATIC_LIBS = \@ALL_STATIC_LIBS\@\n"; + $text .= "IMPORT_LIBS = \$(STATIC_LIBS) \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %importlibs) { $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)"; next unless defined $static_implibs{$mod}; $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)"; } - $text .= "\n\nCROSS_IMPLIBS ="; + $text .= "\n\nCROSS_IMPLIBS = \$(STATIC_LIBS:.a=.cross.a)"; foreach my $mod (sort @lib_symlinks) { next if $mod =~ /16$/; $text .= sprintf " \\\n\tlib%s.cross.a", $importlibs{$mod}; } - foreach my $mod (sort keys %staticlib_dirs) - { - $text .= sprintf " \\\n\t%s/lib%s.cross.a", $staticlib_dirs{$mod}, $mod; - } foreach my $mod (sort keys %importlibs) { next if $mod =~ /16$/; @@ -576,18 +569,7 @@ sub update_dlls(@) $text .= "\$(BUILDSUBDIRS): \$(IMPORT_LIBS)\n"; $text .= "\$(INSTALLSUBDIRS:%=%/__install__) \$(INSTALLSUBDIRS:%=%/__install-lib__): \$(IMPORT_LIBS)\n\n"; - - # output the inter-dll dependencies and rules - - $text .= "# Map library name to the corresponding directory\n\n"; - - foreach my $mod (sort keys %staticlib_dirs) - { - my $dir = $staticlib_dirs{$mod}; - $text .= sprintf "%s/lib%s.a: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod}; - $text .= sprintf "%s/lib%s.cross.a: dummy\n", $dir, $mod; - $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.cross.a\n\n", $dir, $mod; - } + $text .= "\@ALL_IMPORTLIB_RULES\@\n"; $text .= "\n# Misc rules\n"; replace_in_file( "dlls/Makefile.in",

1 0

Alexandre Julliard : makefiles: Generate the import library rules from configure.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: 950a0f87a0306c136626ea6ccbcb395133d49a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950a0f87a0306c136626ea6cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 21:10:14 2010 +0100 makefiles: Generate the import library rules from configure. --- aclocal.m4 | 26 ++- configure | 754 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 287 ++++++++++--------- dlls/Makefile.in | 777 +------------------------------------------------- tools/make_makefiles | 148 +--------- 5 files changed, 936 insertions(+), 1056 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=950a0f87a0306c136626e…

1 0

Henri Verbeet : wined3d: Add a FIXME for missing ARB_depth_clamp support.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: fe1024ae4f47dc4f7e2afffbea51e38bb42e9c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1024ae4f47dc4f7e2afffbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:34 2010 +0100 wined3d: Add a FIXME for missing ARB_depth_clamp support. --- dlls/wined3d/state.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 75cb837..d44dc2c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -584,6 +584,10 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, stru glEnable(GL_DEPTH_CLAMP); checkGLcall("glEnable(GL_DEPTH_CLAMP)"); } + else + { + FIXME("Clipping disabled, but ARB_depth_clamp isn't supported.\n"); + } } if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); }

1 0

Henri Verbeet : d3d9: Add depth clamp tests.
by Alexandre Julliard 27 Jan '10

27 Jan '10

Module: wine Branch: master Commit: 983f96b82f397ef63e838293c8f6ffa6eb13c486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=983f96b82f397ef63e838293c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:35 2010 +0100 d3d9: Add depth clamp tests. --- dlls/d3d9/tests/visual.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 15ddd44..0d78271 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10572,6 +10572,138 @@ static void viewport_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); } +/* This test tests depth clamping / clipping behaviour: + * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the + * minimum/maximum z value. + * - The viewport's MinZ/MaxZ is irrelevant for this. + * - When D3DRS_CLIPPING is enabled depth values are clipped. + * - Pretransformed vertices behave the same as regular vertices. + */ +static void depth_clamp_test(IDirect3DDevice9 *device) +{ + const struct tvertex quad1[] = + { + { 0, 0, 5.0f, 1.0, 0xff002b7f}, + { 640, 0, 5.0f, 1.0, 0xff002b7f}, + { 0, 480, 5.0f, 1.0, 0xff002b7f}, + { 640, 480, 5.0f, 1.0, 0xff002b7f}, + }; + const struct tvertex quad2[] = + { + { 0, 300, 10.0f, 1.0, 0xfff9e814}, + { 640, 300, 10.0f, 1.0, 0xfff9e814}, + { 0, 360, 10.0f, 1.0, 0xfff9e814}, + { 640, 360, 10.0f, 1.0, 0xfff9e814}, + }; + const struct vertex quad3[] = + { + {-0.65, 0.55, 5.0f, 0xffffffff}, + {-0.35, 0.55, 5.0f, 0xffffffff}, + {-0.65, 0.15, 5.0f, 0xffffffff}, + {-0.35, 0.15, 5.0f, 0xffffffff}, + }; + const struct vertex quad4[] = + { + {-0.87, 0.83, 10.0f, 0xffffffff}, + {-0.65, 0.83, 10.0f, 0xffffffff}, + {-0.87, 0.55, 10.0f, 0xffffffff}, + {-0.65, 0.55, 10.0f, 0xffffffff}, + }; + const struct vertex quad5[] = + { + { -0.5, 0.5, 10.0f, 0xff14f914}, + { 0.5, 0.5, 10.0f, 0xff14f914}, + { -0.5, -0.5, 10.0f, 0xff14f914}, + { 0.5, -0.5, 10.0f, 0xff14f914}, + }; + const struct tvertex quad6[] = + { + { 0, 120, 10.0f, 1.0, 0xfff91414}, + { 640, 120, 10.0f, 1.0, 0xfff91414}, + { 0, 180, 10.0f, 1.0, 0xfff91414}, + { 640, 180, 10.0f, 1.0, 0xfff91414}, + }; + + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 7.5; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(*quad4)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad5, sizeof(*quad5)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad6, sizeof(*quad6)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 75, 75); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -10627,6 +10759,7 @@ START_TEST(visual) IDirect3DDevice9_Present(device_ptr, NULL, NULL, NULL, NULL); /* Now execute the real tests */ + depth_clamp_test(device_ptr); stretchrect_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr);

1 0

Alexandre Julliard : ntdll: Fill the tail of large blocks too for tail checking.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: dedabe9d543331acb6b26b21f4da1eb54cf7bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedabe9d543331acb6b26b21f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:04:45 2010 +0100 ntdll: Fill the tail of large blocks too for tail checking. --- dlls/ntdll/heap.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b68af25..e112031 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -692,6 +692,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) arena->block_size = block_size; arena->size = ARENA_LARGE_SIZE; arena->magic = ARENA_LARGE_MAGIC; + mark_block_tail( (char *)(arena + 1) + size, block_size - sizeof(*arena) - size, flags ); list_add_tail( &heap->large_list, &arena->entry ); notify_alloc( arena + 1, size, flags & HEAP_ZERO_MEMORY ); return arena + 1; @@ -722,9 +723,13 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz if (arena->block_size - sizeof(*arena) >= size) { + SIZE_T unused = arena->block_size - sizeof(*arena) - size; + /* FIXME: we could remap zero-pages instead */ - if ((flags & HEAP_ZERO_MEMORY) && size > arena->data_size) - memset( (char *)ptr + arena->data_size, 0, size - arena->data_size ); + if (size > arena->data_size) + initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); + else + mark_block_tail( (char *)ptr + size, unused, flags ); arena->data_size = size; return ptr; }

1 0

Alexandre Julliard : ntdll: Fill the tail of existing large blocks when the debug flags change.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: aa409c75f904156dab8a62e4ca669b542e64493d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa409c75f904156dab8a62e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:06:59 2010 +0100 ntdll: Fill the tail of existing large blocks when the debug flags change. --- dlls/ntdll/heap.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e112031..7cbc8ef 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1341,6 +1341,7 @@ void heap_set_debug_flags( HANDLE handle ) if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { SUBHEAP *subheap; + ARENA_LARGE *large; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { @@ -1367,6 +1368,10 @@ void heap_set_debug_flags( HANDLE handle ) } } } + + LIST_FOR_EACH_ENTRY( large, &heap->large_list, ARENA_LARGE, entry ) + mark_block_tail( (char *)(large + 1) + large->data_size, + large->block_size - sizeof(*large) - large->data_size, flags ); } }

1 0

Alexandre Julliard : ntdll: Verify the tail contents when validating a large block.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: bf975d1f85fad29588cf7979f1d40c11bc49bb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf975d1f85fad29588cf7979f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:08:22 2010 +0100 ntdll: Verify the tail contents when validating a large block. --- dlls/ntdll/heap.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7cbc8ef..2e0dcc6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -764,6 +764,8 @@ static ARENA_LARGE *find_large_block( HEAP *heap, const void *ptr ) */ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL quiet ) { + DWORD flags = heap->flags; + if ((ULONG_PTR)arena % getpagesize()) { if (quiet == NOISY) @@ -794,6 +796,25 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui } return FALSE; } + if (arena->data_size > arena->block_size - sizeof(*arena)) + { + ERR( "Heap %p: invalid large arena %p size %lx/%lx\n", + heap, arena, arena->data_size, arena->block_size ); + return FALSE; + } + if (flags & HEAP_TAIL_CHECKING_ENABLED) + { + SIZE_T i, unused = arena->block_size - sizeof(*arena) - arena->data_size; + const unsigned char *data = (const unsigned char *)(arena + 1) + arena->data_size; + + for (i = 0; i < unused; i++) + { + if (data[i] == ARENA_TAIL_FILLER) continue; + ERR("Heap %p: block %p tail overwritten at %p (byte %lu/%lu == 0x%02x)\n", + heap, arena + 1, data + i, i, unused, data[i] ); + return FALSE; + } + } return TRUE; } @@ -1614,7 +1635,11 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) pInUse = (ARENA_INUSE *)ptr - 1; if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) { - if (!find_large_block( heapPtr, ptr )) goto error; + ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + + if (!large_arena) goto error; + if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) + goto error; free_large_block( heapPtr, flags, ptr ); goto done; } @@ -1682,7 +1707,11 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size pArena = (ARENA_INUSE *)ptr - 1; if (!(subheap = HEAP_FindSubHeap( heapPtr, pArena ))) { - if (!find_large_block( heapPtr, ptr )) goto error; + ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + + if (!large_arena) goto error; + if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) + goto error; if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; notify_free( ptr ); goto done;

1 0