January 2010 - Wine-commits

Igor Paliychuk : wordpad: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 05450498d01b8280ae2cbf5ab759591dfbb7c6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=05450498d01b8280ae2cbf5ab… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:09:32 2010 +0200 wordpad: Add Ukrainian translations. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/Uk.rc | 250 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05450498d01b8280ae2cb…

1 0

Igor Paliychuk : write.exe: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: d05656f373ce8be1b2612e6dc07b228ce36783c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05656f373ce8be1b2612e6dc… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:10:04 2010 +0200 write.exe: Add Ukrainian translations. --- programs/write/Makefile.in | 3 ++- programs/write/Uk.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index be459b6..7329856 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -23,7 +23,8 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ - Sv.rc + Sv.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/write/Uk.rc b/programs/write/Uk.rc new file mode 100644 index 0000000..f922210 --- /dev/null +++ b/programs/write/Uk.rc @@ -0,0 +1,33 @@ +/* + * Ukrainian language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * Copyright (C) 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Не вдалось запустити Wordpad" +}

1 0

Igor Paliychuk : xcopy.exe: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 3df59ccf69293d5f0ddf116eb0aa7e3c94dea0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df59ccf69293d5f0ddf116eb… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:13:37 2010 +0200 xcopy.exe: Add Ukrainian translations. --- programs/xcopy/Makefile.in | 3 +- programs/xcopy/Uk.rc | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 088db0e..7c626d5 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -25,7 +25,8 @@ RC_SRCS = \ Pl.rc \ Pt.rc \ Ru.rc \ - Si.rc + Si.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/xcopy/Uk.rc b/programs/xcopy/Uk.rc new file mode 100644 index 0000000..6d59e1b --- /dev/null +++ b/programs/xcopy/Uk.rc @@ -0,0 +1,84 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Ukrainian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2010 I. Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Невірна кількість параметрів - Введіть xcopy /? для довідки\n" + STRING_INVPARM, "Невірний параметр '%s' - Введіть xcopy /? для довідки\n" + STRING_PAUSE, "Натисніть <enter> щоб почати копіювання\n" + STRING_SIMCOPY, "%d файл(ів) буде скопійовано\n" + STRING_COPY, "%d файл(ів) скопійовано\n" + STRING_QISDIR, "'%s' є файлом чи директорією\n" \ + "on the target?\n" \ + "(F - Файл, D - Директорія)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n" + STRING_COPYFAIL, "Під час копіювання '%s' в '%s' сталась помилка r/c %d\n" + STRING_OPENFAIL, "Не вдалось відкрити '%s'\n" + STRING_READFAIL, "Помилка читання '%s'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Копіює файли та дерева директорій за призначенням\n\ +\n\ +Syntax:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or\n\ +\tmore files\n\ +[/S] Копіює директорії та піддиректорії\n\ +[/E] Копіює директорії та піддиректорії, включно з порожніми\n\ +[/Q] Do not list names during copy, ie quiet.\n\ +[/F] Під час копіювання відображає повні імена початкових і кінцевих файлів\n\ +[/L] Simulate operation, showing names which would be copied\n\ +[/W] Питає підтвердження перед початком копіювання\n\ +[/T] Створює структуру каталогів але не копіює файли\n\ +[/Y] Suppress prompting when overwriting files\n\ +[/-Y] Питає підтвердження на перезапис файлів\n\ +[/P] Prompts on each source file before copying\n\ +[/N] Копіює, використовуючи короткі імена\n\ +[/U] Copy only files which already exist in destination\n\ +[/R] Перезаписує файли, доступні лише для читання\n\ +[/H] Include hidden and system files in the copy\n\ +[/C] Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\ +[/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ +[/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ +\властивість АРХІВНИЙ\n\ +[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\ +\t\tЯкщо дата не вказана, only copy if destination is older\n\ +\t\tthan source\n\n" + +}

1 0

Henri Verbeet : wined3d: Add a debug function for state names.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 9bbccb7f8070d0bf3c725e3074d4d00b8bb450bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbccb7f8070d0bf3c725e307… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:23 2010 +0100 wined3d: Add a debug function for state names. --- dlls/wined3d/utils.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4038833..b92b884 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1786,6 +1786,51 @@ const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) { } } +const char *debug_d3dstate(DWORD state) +{ + if (STATE_IS_RENDER(state)) + return wine_dbg_sprintf("STATE_RENDER(%s)", debug_d3drenderstate(state - STATE_RENDER(0))); + if (STATE_IS_TEXTURESTAGE(state)) + { + DWORD texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + DWORD texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); + return wine_dbg_sprintf("STATE_TEXTURESTAGE(%#x, %s)", + texture_stage, debug_d3dtexturestate(texture_state)); + } + if (STATE_IS_SAMPLER(state)) + return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); + if (STATE_IS_PIXELSHADER(state)) + return "STATE_PIXELSHADER"; + if (STATE_IS_TRANSFORM(state)) + return wine_dbg_sprintf("STATE_TRANSFORM(%s)", debug_d3dtstype(state - STATE_TRANSFORM(0))); + if (STATE_IS_STREAMSRC(state)) + return "STATE_STREAMSRC"; + if (STATE_IS_INDEXBUFFER(state)) + return "STATE_INDEXBUFFER"; + if (STATE_IS_VDECL(state)) + return "STATE_VDECL"; + if (STATE_IS_VSHADER(state)) + return "STATE_VSHADER"; + if (STATE_IS_VIEWPORT(state)) + return "STATE_VIEWPORT"; + if (STATE_IS_VERTEXSHADERCONSTANT(state)) + return "STATE_VERTEXSHADERCONSTANT"; + if (STATE_IS_PIXELSHADERCONSTANT(state)) + return "STATE_PIXELSHADERCONSTANT"; + if (STATE_IS_ACTIVELIGHT(state)) + return wine_dbg_sprintf("STATE_ACTIVELIGHT(%#x)", state - STATE_ACTIVELIGHT(0)); + if (STATE_IS_SCISSORRECT(state)) + return "STATE_SCISSORRECT"; + if (STATE_IS_CLIPPLANE(state)) + return wine_dbg_sprintf("STATE_CLIPPLANE(%#x)", state - STATE_CLIPPLANE(0)); + if (STATE_IS_MATERIAL(state)) + return "STATE_MATERIAL"; + if (STATE_IS_FRONTFACE(state)) + return "STATE_FRONTFACE"; + + return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); +} + const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { #define POOL_TO_STR(p) case p: return #p diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164cc6b..c5713c0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -994,8 +994,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) +#define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) #define STATE_FRONTFACE (STATE_MATERIAL + 1) +#define STATE_IS_FRONTFACE(a) ((a) == STATE_FRONTFACE) #define STATE_HIGHEST (STATE_FRONTFACE) @@ -2506,6 +2508,7 @@ const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Disable debug flags when running on Valgrind.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: a75ae7936eb2581cdc6a7a5050ae79add0cb4ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75ae7936eb2581cdc6a7a505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:42:31 2010 +0100 ntdll: Disable debug flags when running on Valgrind. The extra debug checks cause more harm than good under Valgrind. --- dlls/ntdll/heap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1055ce0..07fec3f 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1406,6 +1406,8 @@ void heap_set_debug_flags( HANDLE handle ) flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */ + heap->flags |= flags; heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE);

1 0

Alexandre Julliard : ntdll: Support delayed freeing of heap blocks to catch use-after-free bugs.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: b7b8929f0b72dc63d61e96e3eaca177da79f5865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b8929f0b72dc63d61e96e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:43:38 2010 +0100 ntdll: Support delayed freeing of heap blocks to catch use-after-free bugs. --- dlls/ntdll/heap.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 07fec3f..622b174 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -82,6 +82,7 @@ typedef struct /* Value for arena 'magic' field */ #define ARENA_INUSE_MAGIC 0x455355 +#define ARENA_PENDING_MAGIC 0xbedead #define ARENA_FREE_MAGIC 0x45455246 #define ARENA_LARGE_MAGIC 0x6752614c @@ -151,6 +152,8 @@ typedef struct tagHEAP struct list large_list; /* Large blocks list */ SIZE_T grow_size; /* Size of next subheap for growing heap */ DWORD magic; /* Magic number */ + DWORD pending_pos; /* Position in pending free requests ring */ + ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ FREE_LIST_ENTRY *freeList; /* Free lists */ } HEAP; @@ -159,6 +162,7 @@ typedef struct tagHEAP #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ #define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ +#define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ #define HEAP_PAGE_ALLOCS 0x01000000 @@ -275,7 +279,8 @@ static void subheap_notify_free_all(SUBHEAP const *subheap) else { ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic!=ARENA_INUSE_MAGIC) ERR("bad inuse_magic @%p\n", pArena); + if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) + ERR("bad inuse_magic @%p\n", pArena); notify_free(pArena + 1); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); } @@ -362,7 +367,9 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x used %08x\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK ); + DPRINTF( "%p %08x %s %08x\n", + pArena, pArena->magic, pArena->magic == ARENA_INUSE_MAGIC ? "used" : "pend", + pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); usedSize += pArena->size & ARENA_SIZE_MASK; @@ -607,11 +614,25 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) */ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) { + HEAP *heap = subheap->heap; ARENA_FREE *pFree; - SIZE_T size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + SIZE_T size; + + if (heap->pending_free) + { + ARENA_INUSE *prev = heap->pending_free[heap->pending_pos]; + heap->pending_free[heap->pending_pos] = pArena; + heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; + pArena->magic = ARENA_PENDING_MAGIC; + mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); + if (!prev) return; + pArena = prev; + subheap = HEAP_FindSubHeap( heap, pArena ); + } /* Check if we can merge with previous block */ + size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); if (pArena->size & ARENA_FLAG_PREV_FREE) { pFree = *((ARENA_FREE **)pArena - 1); @@ -1168,7 +1189,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * } /* Check magic number */ - if (pArena->magic != ARENA_INUSE_MAGIC) + if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) { if (quiet == NOISY) { ERR("Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, pArena->magic, pArena ); @@ -1238,7 +1259,24 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * return FALSE; } /* Check unused bytes */ - if (flags & HEAP_TAIL_CHECKING_ENABLED) + if (pArena->magic == ARENA_PENDING_MAGIC) + { + DWORD *ptr = (DWORD *)(pArena + 1); + DWORD *end = (DWORD *)((char *)ptr + size); + + while (ptr < end) + { + if (*ptr != ARENA_FREE_FILLER) + { + ERR("Heap %p: free block %p overwritten at %p by %08x\n", + subheap->heap, (ARENA_INUSE *)pArena + 1, ptr, *ptr ); + if (!*ptr) { HEAP_Dump( subheap->heap ); DbgBreakPoint(); } + return FALSE; + } + ptr++; + } + } + else if (flags & HEAP_TAIL_CHECKING_ENABLED) { const unsigned char *data = (const unsigned char *)(pArena + 1) + size - pArena->unused_bytes; @@ -1366,6 +1404,8 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE 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_PENDING_MAGIC) + WARN( "Heap %p: block %p used after free\n", subheap->heap, arena + 1 ); 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) @@ -1435,8 +1475,11 @@ void heap_set_debug_flags( HANDLE handle ) } else { - mark_block_tail( (char *)(arena + 1) + size - arena->unused_bytes, - arena->unused_bytes, flags ); + if (arena->magic == ARENA_PENDING_MAGIC) + mark_block_free( arena + 1, size, flags ); + else + mark_block_tail( (char *)(arena + 1) + size - arena->unused_bytes, + arena->unused_bytes, flags ); ptr += sizeof(ARENA_INUSE) + size; } } @@ -1446,6 +1489,19 @@ void heap_set_debug_flags( HANDLE handle ) mark_block_tail( (char *)(large + 1) + large->data_size, large->block_size - sizeof(*large) - large->data_size, flags ); } + + if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free && + ((flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND)) + { + void *ptr = NULL; + SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); + + if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + { + heap->pending_free = ptr; + heap->pending_pos = 0; + } + } } @@ -1550,6 +1606,12 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } subheap_notify_free_all(&heapPtr->subheap); + if (heapPtr->pending_free) + { + size = 0; + addr = heapPtr->pending_free; + NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + } size = 0; addr = heapPtr->subheap.base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); @@ -2052,7 +2114,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) goto HW_end; } - if (((ARENA_INUSE *)ptr - 1)->magic == ARENA_INUSE_MAGIC) + if (((ARENA_INUSE *)ptr - 1)->magic == ARENA_INUSE_MAGIC || + ((ARENA_INUSE *)ptr - 1)->magic == ARENA_PENDING_MAGIC) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1; ptr += pArena->size & ARENA_SIZE_MASK; @@ -2100,7 +2163,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) entry->lpData = pArena + 1; entry->cbData = pArena->size & ARENA_SIZE_MASK; entry->cbOverhead = sizeof(ARENA_INUSE); - entry->wFlags = PROCESS_HEAP_ENTRY_BUSY; + entry->wFlags = (pArena->magic == ARENA_PENDING_MAGIC) ? + PROCESS_HEAP_UNCOMMITTED_RANGE : PROCESS_HEAP_ENTRY_BUSY; /* FIXME: can't handle PROCESS_HEAP_ENTRY_MOVEABLE and PROCESS_HEAP_ENTRY_DDESHARE yet */ }

1 0

Alexandre Julliard : ntdll: Don't require heap sizes to be 64K aligned.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 0692bfda5f10e0c2dc6eed2a66e1a9f9c1092bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0692bfda5f10e0c2dc6eed2a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:01 2010 +0100 ntdll: Don't require heap sizes to be 64K aligned. --- dlls/kernel32/tests/alloc.c | 12 +++--------- dlls/ntdll/heap.c | 7 ++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c index 8cb0915..c1b2afc 100644 --- a/dlls/kernel32/tests/alloc.c +++ b/dlls/kernel32/tests/alloc.c @@ -70,15 +70,9 @@ static void test_Heap(void) heap=HeapCreate(0,2*memchunk,5*memchunk); /* Check that HeapCreate allocated the right amount of ram */ - todo_wine { - /* Today HeapCreate seems to return a memory block larger than specified. - MSDN says the maximum heap size should be dwMaximumSize rounded up to the - nearest page boundary - */ - mem1=HeapAlloc(heap,0,5*memchunk+1); - ok(mem1==NULL,"HeapCreate allocated more Ram than it should have\n"); - HeapFree(heap,0,mem1); - } + mem1=HeapAlloc(heap,0,5*memchunk+1); + ok(mem1==NULL,"HeapCreate allocated more Ram than it should have\n"); + HeapFree(heap,0,mem1); /* Check that a normal alloc works */ mem1=HeapAlloc(heap,0,memchunk); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 622b174..9a41d68 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -856,16 +856,13 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!address) { - /* round-up sizes on a 64K boundary */ - totalSize = (totalSize + 0xffff) & 0xffff0000; - commitSize = (commitSize + 0xffff) & 0xffff0000; - if (!commitSize) commitSize = 0x10000; + if (!commitSize) commitSize = COMMIT_MASK + 1; totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ /* allocate the memory block */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { WARN("Could not allocate %08lx bytes\n", totalSize );

1 0

Alexandre Julliard : ntdll: Fix the various heap debug checks for 64-bit.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 7ffb1c102ed38bff541c9ccc430727ded9b21a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffb1c102ed38bff541c9ccc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:10:17 2010 +0100 ntdll: Fix the various heap debug checks for 64-bit. --- dlls/ntdll/heap.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 9a41d68..5e57fd0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -110,7 +110,8 @@ 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) || RUNNING_ON_VALGRIND ? 8 : 0) +#define HEAP_TAIL_EXTRA_SIZE(flags) \ + ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -143,7 +144,8 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { - DWORD unknown[3]; + DWORD_PTR unknown1[2]; + DWORD unknown2; DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ @@ -1143,7 +1145,8 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) char *end = (char *)(pArena + 1) + size; if (end >= heapEnd) end = (char *)subheap->base + subheap->commitSize; - while (ptr < (DWORD *)end - 1) + else end -= sizeof(ARENA_FREE *); + while (ptr < (DWORD *)end) { if (*ptr != ARENA_FREE_FILLER) { @@ -1466,8 +1469,8 @@ void heap_set_debug_flags( HANDLE handle ) SIZE_T count = size; ptr += sizeof(ARENA_FREE) + size; - if (ptr > end) count = end - (char *)((ARENA_FREE *)arena + 1); - else count -= sizeof(DWORD); + if (ptr >= end) count = end - (char *)((ARENA_FREE *)arena + 1); + else count -= sizeof(ARENA_FREE *); mark_block_free( (ARENA_FREE *)arena + 1, count, flags ); } else

1 0

Alexandre Julliard : kernel32/tests: Fix some of the heap tests for 64-bit.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 221c115e98aac2d351301107c7641f71be823f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=221c115e98aac2d351301107c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:10:26 2010 +0100 kernel32/tests: Fix some of the heap tests for 64-bit. --- dlls/kernel32/tests/heap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0c0de11..c6d7b65 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -42,7 +42,8 @@ static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); struct heap_layout { - DWORD unknown[3]; + DWORD_PTR unknown[2]; + DWORD pattern; DWORD flags; DWORD force_flags; }; @@ -488,7 +489,7 @@ static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; BOOL ret; - SIZE_T i, size, large_size = 800 * 1024 + 37; + SIZE_T i, size, large_size = 3000 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08x\n", flags ); @@ -751,7 +752,7 @@ static void test_child_heap( const char *arg ) expect_heap = heap_flags_from_global_flag( expected ); - if (!(heap->flags & HEAP_GROWABLE) || heap->flags == 0xeeeeeeee) /* vista layout */ + if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee || heap->pattern == 0xeeeeeeee) /* vista layout */ { if (expected & FLG_HEAP_PAGE_ALLOCS) ok( heap->flags == 0xeeeeeeee, "%s: got heap flags %08x expected 0xeeeeeeee\n", @@ -765,6 +766,7 @@ static void test_child_heap( const char *arg ) "%s: got heap flags %08x expected %08x\n", arg, heap->flags, expect_heap ); ok( heap->force_flags == (expect_heap & ~0x18000080), "%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expect_heap ); + expect_heap = heap->flags; } test_heap_checks( expect_heap );

1 0

Alexandre Julliard : cabinet/tests: Fix accesses to an invalid pointer.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 91502b0634078cf24dad25a22f8c69758f55525f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91502b0634078cf24dad25a22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:27 2010 +0100 cabinet/tests: Fix accesses to an invalid pointer. --- dlls/cabinet/tests/extract.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 76bd7b7..29fd1c7 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -670,6 +670,7 @@ static void test_Extract(void) lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); + node = session.FileList; todo_wine { ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, @@ -694,8 +695,8 @@ static void test_Extract(void) todo_wine { ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); } - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n");

1 0