October 2007 - Wine-commits

Alexandre Julliard : shlwapi: Fix GetAcceptLanguagesA to not read past the end of the buffer.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 3ee3058677d4d3be4c18e3bd81bab3d956e4a49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee3058677d4d3be4c18e3bd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 18:09:11 2007 +0200 shlwapi: Fix GetAcceptLanguagesA to not read past the end of the buffer. --- dlls/shlwapi/ordinal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index b1cb585..d3e5825 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -529,9 +529,15 @@ HRESULT WINAPI GetAcceptLanguagesA( LPSTR langbuf, LPDWORD buflen) langbufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflenW); retval = GetAcceptLanguagesW(langbufW, &buflenW); - /* FIXME: this is wrong, the string may not be null-terminated */ - convlen = WideCharToMultiByte(CP_ACP, 0, langbufW, -1, langbuf, - *buflen, NULL, NULL); + if (retval == S_OK) + { + convlen = WideCharToMultiByte(CP_ACP, 0, langbufW, -1, langbuf, *buflen, NULL, NULL); + } + else /* copy partial string anyway */ + { + convlen = WideCharToMultiByte(CP_ACP, 0, langbufW, *buflen, langbuf, *buflen, NULL, NULL); + if (convlen < *buflen) langbuf[convlen] = 0; + } *buflen = buflenW ? convlen : 0; HeapFree(GetProcessHeap(), 0, langbufW);

1 0

Alexandre Julliard : ntdll: Clear heap blocks also for WARN_ON(heap).
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: d73dbecf68eccc3ca11a8ff3bb03d05a12667c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73dbecf68eccc3ca11a8ff3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 19:55:20 2007 +0200 ntdll: Clear heap blocks also for WARN_ON(heap). --- dlls/ntdll/heap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fb7df12..c763ac3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -137,7 +137,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL qu /* mark a block of memory as free for debugging purposes */ static inline void mark_block_free( void *ptr, SIZE_T size ) { - if (TRACE_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); + if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); #ifdef VALGRIND_MAKE_NOACCESS VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif @@ -157,7 +157,7 @@ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) #ifdef VALGRIND_MAKE_WRITABLE VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif - if (TRACE_ON(heap)) + if (TRACE_ON(heap) || WARN_ON(heap)) { memset( ptr, ARENA_INUSE_FILLER, size ); #ifdef VALGRIND_MAKE_WRITABLE

1 0

Alexandre Julliard : ntdll: Remove assumptions that the subheap is at the beginning of the memory block .
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 1d063ae18d990343fc077dcbf650add797924018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d063ae18d990343fc077dcbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 15:28:50 2007 +0200 ntdll: Remove assumptions that the subheap is at the beginning of the memory block. --- dlls/ntdll/heap.c | 118 ++++++++++++++++++++++++++++------------------------- 1 files changed, 63 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d063ae18d990343fc077…

1 0

Alexandre Julliard : ntdll: Convert the subheap list to a standard list.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 80a6bb1d8ba7ce34f961f31f8e42278840db7406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a6bb1d8ba7ce34f961f31f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 15:31:14 2007 +0200 ntdll: Convert the subheap list to a standard list. --- dlls/ntdll/heap.c | 72 +++++++++++++++++++++++----------------------------- 1 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a0691ba..dbe9b77 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -109,7 +109,7 @@ typedef struct tagSUBHEAP SIZE_T size; /* Size of the whole sub-heap */ SIZE_T commitSize; /* Committed size of the sub-heap */ DWORD headerSize; /* Size of the heap header */ - struct tagSUBHEAP *next; /* Next sub-heap */ + struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ DWORD magic; /* Magic number */ } SUBHEAP; @@ -120,6 +120,7 @@ typedef struct tagHEAP { SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ + struct list subheap_list; /* Sub-heap list */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ DWORD flags; /* Heap flags */ @@ -226,14 +227,8 @@ static void HEAP_Dump( HEAP *heap ) char *ptr; DPRINTF( "Heap: %p\n", heap ); - DPRINTF( "Next: %p Sub-heaps: %p", - LIST_ENTRY( heap->entry.next, HEAP, entry ), &heap->subheap ); - subheap = &heap->subheap; - while (subheap->next) - { - DPRINTF( " -> %p", subheap->next ); - subheap = subheap->next; - } + DPRINTF( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) DPRINTF( " %p", subheap ); DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) @@ -242,8 +237,7 @@ static void HEAP_Dump( HEAP *heap ) LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), LIST_ENTRY( heap->freeList[i].arena.entry.next, ARENA_FREE, entry )); - subheap = &heap->subheap; - while (subheap) + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { SIZE_T freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; DPRINTF( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", @@ -285,7 +279,6 @@ static void HEAP_Dump( HEAP *heap ) DPRINTF( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", subheap->size, subheap->commitSize, freeSize, usedSize, arenaSize, (arenaSize * 100) / subheap->size ); - subheap = subheap->next; } } @@ -390,16 +383,13 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la */ static SUBHEAP *HEAP_FindSubHeap( const HEAP *heap, /* [in] Heap pointer */ - LPCVOID ptr /* [in] Address */ -) { - const SUBHEAP *sub = &heap->subheap; - while (sub) - { + LPCVOID ptr ) /* [in] Address */ +{ + SUBHEAP *sub; + LIST_FOR_EACH_ENTRY( sub, &heap->subheap_list, SUBHEAP, entry ) if (((const char *)ptr >= (const char *)sub->base) && ((const char *)ptr < (const char *)sub->base + sub->size - sizeof(ARENA_INUSE))) - return (SUBHEAP *)sub; - sub = sub->next; - } + return sub; return NULL; } @@ -548,12 +538,10 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) { SIZE_T size = 0; void *addr = subheap->base; - SUBHEAP *pPrev = &subheap->heap->subheap; /* Remove the free block from the list */ list_remove( &pFree->entry ); /* Remove the subheap from the list */ - while (pPrev && (pPrev->next != subheap)) pPrev = pPrev->next; - if (pPrev) pPrev->next = subheap->next; + list_remove( &subheap->entry ); /* Free the memory */ subheap->magic = 0; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); @@ -621,8 +609,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); - subheap->next = heap->subheap.next; - heap->subheap.next = subheap; + list_add_head( &heap->subheap_list, &subheap->entry ); } else { @@ -631,6 +618,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap = (HEAP *)address; heap->flags = flags; heap->magic = HEAP_MAGIC; + list_init( &heap->subheap_list ); subheap = &heap->subheap; subheap->base = address; @@ -639,7 +627,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(HEAP) ); - subheap->next = NULL; + list_add_head( &heap->subheap_list, &subheap->entry ); /* Build the free lists */ @@ -1035,8 +1023,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ return ret; } - subheap = &heapPtr->subheap; - while (subheap && ret) + LIST_FOR_EACH_ENTRY( subheap, &heapPtr->subheap_list, SUBHEAP, entry ) { char *ptr = (char *)subheap->base + subheap->headerSize; while (ptr < (char *)subheap->base + subheap->size) @@ -1058,7 +1045,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ ptr += sizeof(ARENA_INUSE) + (*(DWORD *)ptr & ARENA_SIZE_MASK); } } - subheap = subheap->next; + if (!ret) break; } if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); @@ -1131,7 +1118,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) { HEAP *heapPtr = HEAP_GetPtr( heap ); - SUBHEAP *subheap; + SUBHEAP *subheap, *next; + SIZE_T size; + void *addr; TRACE("%p\n", heap ); if (!heapPtr) return heap; @@ -1145,15 +1134,18 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) heapPtr->critSection.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &heapPtr->critSection ); - subheap = &heapPtr->subheap; - while (subheap) + + LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heapPtr->subheap_list, SUBHEAP, entry ) { - SUBHEAP *next = subheap->next; - SIZE_T size = 0; - void *addr = subheap->base; + if (subheap == &heapPtr->subheap) continue; /* do this one last */ + list_remove( &subheap->entry ); + size = 0; + addr = subheap->base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); - subheap = next; } + size = 0; + addr = heapPtr->subheap.base; + NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); return 0; } @@ -1617,8 +1609,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) else { ptr = entry->lpData; - sub = &heapPtr->subheap; - while (sub) + LIST_FOR_EACH_ENTRY( sub, &heapPtr->subheap_list, SUBHEAP, entry ) { if (((char *)ptr >= (char *)sub->base) && ((char *)ptr < (char *)sub->base + sub->size)) @@ -1626,7 +1617,6 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) currentheap = sub; break; } - sub = sub->next; region_index++; } if (currentheap == NULL) @@ -1651,12 +1641,14 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) if (ptr > (char *)currentheap->base + currentheap->size - 1) { /* proceed with next subheap */ - if (!(currentheap = currentheap->next)) + struct list *next = list_next( &heapPtr->subheap_list, &currentheap->entry ); + if (!next) { /* successfully finished */ TRACE("end reached.\n"); ret = STATUS_NO_MORE_ENTRIES; goto HW_end; } + currentheap = LIST_ENTRY( next, SUBHEAP, entry ); ptr = (char *)currentheap->base + currentheap->headerSize; } }

1 0

Alexandre Julliard : comctl32/tests: Avoid destroying a DPA twice.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: ed147bb102c1cb13149bff27cc369a1cc9053e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed147bb102c1cb13149bff27c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 18:03:51 2007 +0200 comctl32/tests: Avoid destroying a DPA twice. --- dlls/comctl32/tests/dpa.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 062f6f6..3d7d2a7 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -428,7 +428,6 @@ static void test_dpa(void) rc=CheckDPA(dpa, 0x123456, &dw); ok(rc, "dw=0x%x\n", dw); } - pDPA_Destroy(dpa); ret = IStream_Release(pStm); ok(!ret, "ret=%d\n", ret);

1 0

Alexandre Julliard : mshtml: The HTMLDocument URL is a standard WCHAR string, not a BSTR.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 868b5397d3869c4ed16eb786dcd779f6ac8ceb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868b5397d3869c4ed16eb786d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 18:07:30 2007 +0200 mshtml: The HTMLDocument URL is a standard WCHAR string, not a BSTR. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/persist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a547d4..3038d6f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -129,7 +129,7 @@ struct HTMLDocument { BSCallback *bscallback; IMoniker *mon; - BSTR url; + LPOLESTR url; HWND hwnd; HWND tooltips_hwnd; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index abee743..70da02e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -175,7 +175,7 @@ void set_current_mon(HTMLDocument *This, IMoniker *mon) } if(This->url) { - SysFreeString(This->url); + CoTaskMemFree(This->url); This->url = NULL; }

1 0

Alexandre Julliard : msi: Avoid accessing a freed object.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: cd2780e2a7ce8263acd137d65fa13e5eb6f8c473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2780e2a7ce8263acd137d65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 18:07:49 2007 +0200 msi: Avoid accessing a freed object. --- dlls/msi/alter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 587b4be..e0a1b91 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -202,8 +202,8 @@ static UINT ALTER_delete( struct tagMSIVIEW *view ) MSIALTERVIEW *av = (MSIALTERVIEW*)view; TRACE("%p\n", av ); - msi_free( av ); av->table->ops->delete( av->table ); + msi_free( av ); return ERROR_SUCCESS; }

1 0

Alexandre Julliard : user32/tests: Compare against ASCII string first since it may not be a valid Unicode string in that case .
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 78af9e6d018c1674490cb721588ee5decce9aefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=78af9e6d018c1674490cb7215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 18:08:21 2007 +0200 user32/tests: Compare against ASCII string first since it may not be a valid Unicode string in that case. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 811fa28..b5e05c4 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -95,7 +95,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA cmd = GlobalLock((HGLOBAL)hi); - if (!cmd || (lstrcmpW((LPCWSTR)cmd, exec_cmdW) && lstrcmpA(cmd, exec_cmdA))) + if (!cmd || (lstrcmpA(cmd, exec_cmdA) && lstrcmpW((LPCWSTR)cmd, exec_cmdW))) { trace("ignoring unknown WM_DDE_EXECUTE command\n"); /* We have to send a negative acknowledge even if we don't

1 0

Stefan Leichter : kernel32: Define WINE_FILEVERSION in version resource of krnl386.exe.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: f81f82f3ed7c4e89ddd366d5c3304b63c8c6ce70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f81f82f3ed7c4e89ddd366d5c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 29 23:15:51 2007 +0200 kernel32: Define WINE_FILEVERSION in version resource of krnl386.exe. --- dlls/kernel32/version16.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/version16.rc b/dlls/kernel32/version16.rc index 608033e..942639d 100644 --- a/dlls/kernel32/version16.rc +++ b/dlls/kernel32/version16.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEVERSION 1,0,0,0 #define WINE_FILEVERSION_STR "1.0" #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "krnl386.exe"

1 0

Stefan Leichter : user32: Define WINE_FILEVERSION in version resource of user.exe.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 6706a1b3fdd2ef62a27f65714be8710be631dd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6706a1b3fdd2ef62a27f65714… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 29 23:17:08 2007 +0200 user32: Define WINE_FILEVERSION in version resource of user.exe. --- dlls/user32/resources/version16.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/version16.rc b/dlls/user32/resources/version16.rc index 0e150fa..f8d195a 100644 --- a/dlls/user32/resources/version16.rc +++ b/dlls/user32/resources/version16.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEVERSION 1,0,0,0 #define WINE_FILEVERSION_STR "1.0" #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "user.exe"

1 0