wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Francois Gouget : winetest: Replace malloc() & co with HeapAlloc().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 4a558538c8a1862a018fb98cf4880439243c89bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a558538c8a1862a018fb98cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:28:46 2009 +0200 winetest: Replace malloc() & co with HeapAlloc(). --- programs/winetest/util.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/winetest/util.c b/programs/winetest/util.c index 66f79f5..d0776ea 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -29,7 +29,7 @@ HANDLE logfile = 0; void *heap_alloc (size_t len) { - void *p = malloc (len); + void *p = HeapAlloc(GetProcessHeap(), 0, len); if (!p) report (R_FATAL, "Out of memory."); return p; @@ -37,7 +37,7 @@ void *heap_alloc (size_t len) void *heap_realloc (void *op, size_t len) { - void *p = realloc (op, len); + void *p = HeapReAlloc(GetProcessHeap(), 0, op, len); if (len && !p) report (R_FATAL, "Out of memory."); return p; @@ -45,14 +45,16 @@ void *heap_realloc (void *op, size_t len) char *heap_strdup( const char *str ) { - char *res = strdup( str ); + int len = lstrlen(str) + 1; + char* res = HeapAlloc(GetProcessHeap(), 0, len); if (!res) report (R_FATAL, "Out of memory."); + memcpy(res, str, len); return res; } void heap_free (void *op) { - free (op); + HeapFree(GetProcessHeap(), 0, op); } static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) @@ -61,14 +63,14 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) char *p, *q; int n; - p = malloc (size); + p = HeapAlloc(GetProcessHeap(), 0, size); if (!p) return NULL; while (1) { n = vsnprintf (p, size, fmt, ap); if (n < 0) size *= 2; /* Windows */ else if ((unsigned)n >= size) size = n+1; /* glibc */ else break; - q = realloc (p, size); + q = HeapReAlloc(GetProcessHeap(), 0, p, size); if (!q) { heap_free (p); return NULL;

1 0

Francois Gouget : winetest: Rename xmalloc() & co to heap_xxx() to not imply they are based on malloc(), and add heap_free().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: bf6b95e95c1cf419dd6e4953dcc4dae65714038b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6b95e95c1cf419dd6e4953d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:28:23 2009 +0200 winetest: Rename xmalloc() & co to heap_xxx() to not imply they are based on malloc(), and add heap_free(). --- programs/winetest/gui.c | 30 +++++++++++++++--------------- programs/winetest/main.c | 40 ++++++++++++++++++++-------------------- programs/winetest/send.c | 6 +++--- programs/winetest/util.c | 15 ++++++++++----- programs/winetest/winetest.h | 7 ++++--- 5 files changed, 52 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6b95e95c1cf419dd6e4…

1 0

Francois Gouget : dplayx: cbDelete{Groups, Player}Elem() are unused so remove them.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 7422611cc9289ea21e3246150bda4fca10a0083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7422611cc9289ea21e3246150… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:27:31 2009 +0200 dplayx: cbDelete{Groups,Player}Elem() are unused so remove them. --- dlls/dplayx/dplay.c | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1d57dba..0c33bb3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -338,33 +338,6 @@ DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID ) HeapFree( GetProcessHeap(), 0, elem ); } -/* Function to delete the list of groups with this interface. Needs to - * delete the group and player lists associated with this group as well - * as the group data associated with this group. It should not delete - * player data as that is shared with the top player list and will be - * deleted with that. - */ -DPQ_DECL_DELETECB( cbDeleteGroupsElem, lpGroupList ); -DPQ_DECL_DELETECB( cbDeleteGroupsElem, lpGroupList ) -{ - DPQ_DELETEQ( elem->lpGData->groups, groups, - lpGroupList, cbDeleteElemFromHeap ); - DPQ_DELETEQ( elem->lpGData->players, players, - lpPlayerList, cbDeleteElemFromHeap ); - HeapFree( GetProcessHeap(), 0, elem->lpGData ); - HeapFree( GetProcessHeap(), 0, elem ); -} - -/* Function to delete the list of players with this interface. Needs to - * delete the player data for all players as well. - */ -DPQ_DECL_DELETECB( cbDeletePlayerElem, lpPlayerList ); -DPQ_DECL_DELETECB( cbDeletePlayerElem, lpPlayerList ) -{ - HeapFree( GetProcessHeap(), 0, elem->lpPData ); - HeapFree( GetProcessHeap(), 0, elem ); -} - static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) { IDirectPlay2AImpl *This = lpDP; @@ -404,11 +377,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) FreeLibrary( This->dp2->hDPLobbyProvider ); } -#if 0 - DPQ_DELETEQ( This->dp2->players, players, lpPlayerList, cbDeletePlayerElem ); - DPQ_DELETEQ( This->dp2->groups, groups, lpGroupList, cbDeleteGroupsElem ); -#endif - /* FIXME: Need to delete receive and send msgs queue contents */ NS_DeleteSessionCache( This->dp2->lpNameServerData );

1 0

Francois Gouget : winapi_test: Simplify the code that builds the list of headers to process.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: d537476894471dbae75044e8fc5d997f02806950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d537476894471dbae75044e8f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:26:16 2009 +0200 winapi_test: Simplify the code that builds the list of headers to process. --- tools/winapi/winapi_test | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 99a7276..cf3a2b6 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -47,32 +47,23 @@ if ($options->pack) { push @tests, "pack"; } -my @files = (); +my @files; { my %files; - my %test_dirs; - foreach my $test (@tests) { - my @test_dirs = $tests->get_test_dirs($test); - foreach my $test_dir (@test_dirs) { - my @headers = $tests->get_section($test_dir, $test, "header"); - foreach my $header (@headers) { - $files{"include/$header"} = 1; - } - } - } - - foreach my $test (@tests) { - my @test_dirs = $tests->get_test_dirs($test); - foreach my $test_dir (@test_dirs) { - my @headers = $tests->get_section($test_dir, $test, "header"); - foreach my $header (@headers) { - if($files{"include/$header"}) { + foreach my $test (@tests) + { + foreach my $test_dir ($tests->get_test_dirs($test)) + { + foreach my $header ($tests->get_section($test_dir, $test, "header")) + { + if (!$files{$header}) + { push @files, "include/$header"; - $files{"include/$header"} = 0; - } - } - } + $files{$header} = 1; + } + } + } } }

1 0

Damjan Jovanovic : oleaut32: Add a failing VarFormat test showing that wine wrongly truncates decimals with large negative exponents instead of rounding .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: b51d03125d430b2d6ff04ad371efafca9394113a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51d03125d430b2d6ff04ad37… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 17 11:09:16 2009 +0200 oleaut32: Add a failing VarFormat test showing that wine wrongly truncates decimals with large negative exponents instead of rounding. --- dlls/oleaut32/tests/varformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 3c0e72e..6833a27 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -381,6 +381,8 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); VARFMT(VT_R8,V_R8,0.099,"#.#",S_OK,".1"); VARFMT(VT_R8,V_R8,0.0999,"#.##",S_OK,".1"); + /* for large negative exponents, wine truncates instead of rounding */ + todo_wine VARFMT(VT_R8,V_R8,0.099,"#.##",S_OK,".1"); /* 'out' is not cleared */

1 0

Michael Stefaniuc : msctf: Allocate memory only right before it's needed.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 850f6c796569e90907845eaabba19e07136baecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=850f6c796569e90907845eaab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 16 21:43:06 2009 +0200 msctf: Allocate memory only right before it's needed. Fixes a memory leak on an error path. Found by Smatch. --- dlls/msctf/msctf.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 55a8075..675e4d5 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -358,14 +358,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); if (!actsvr) return E_OUTOFMEMORY; - entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); - - if (!entry) - { - HeapFree(GetProcessHeap(),0,actsvr); - return E_OUTOFMEMORY; - } - ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); ITfClientId_Release(clientid); @@ -404,6 +396,14 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) if (activated > 0) activate_given_ts(actsvr, tm); + entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); + + if (!entry) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + entry->ats = actsvr; list_add_head(&AtsList, &entry->entry);

1 0

Michael Stefaniuc : msvideo.dll16: Add missing unlock on an error path ( Smatch).
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: d39dd3834652bb00838e5c5e3cccb747952714b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39dd3834652bb00838e5c5e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 16 21:42:39 2009 +0200 msvideo.dll16: Add missing unlock on an error path (Smatch). --- dlls/msvideo.dll16/msvideo16.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index ef2163f..a48a613 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -774,7 +774,11 @@ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FAR struct msvideo_thunk* thunk; EnterCriticalSection(&msvideo_cs); - if (!(thunk = MSVIDEO_AddThunk((DWORD)lpfnHandler))) return 0; + if (!(thunk = MSVIDEO_AddThunk((DWORD)lpfnHandler))) + { + LeaveCriticalSection(&msvideo_cs); + return 0; + } if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, IC_Callback3216))) thunk->hIC16 = HIC_16(hic32); else

1 0

Vincent Povirk : shell32: Handle NULL return icon parameters in SHDefExtractIcon.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: e083dc831cdcb7424ba00e69e0ab1e022053a72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e083dc831cdcb7424ba00e69e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 15 15:16:35 2009 -0500 shell32: Handle NULL return icon parameters in SHDefExtractIcon. --- dlls/shell32/iconcache.c | 10 ++++++++-- dlls/shell32/tests/shelllink.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6ef5d8e..b51ff06 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -817,8 +817,14 @@ HRESULT WINAPI SHDefExtractIconW(LPCWSTR pszIconFile, int iIndex, UINT uFlags, if (ret == 0xFFFFFFFF) return E_FAIL; if (ret > 0) { - *phiconLarge = hIcons[0]; - *phiconSmall = hIcons[1]; + if (phiconLarge) + *phiconLarge = hIcons[0]; + else + DestroyIcon(hIcons[0]); + if (phiconSmall) + *phiconSmall = hIcons[1]; + else + DestroyIcon(hIcons[1]); return S_OK; } return S_FALSE; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 9e792fd..3ab3766 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -40,10 +40,12 @@ typedef void (WINAPI *fnILFree)(LPITEMIDLIST); typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); +typedef HRESULT (WINAPI *fnSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static fnILFree pILFree; static fnILIsEqual pILIsEqual; static fnSHILCreateFromPath pSHILCreateFromPath; +static fnSHDefExtractIconA pSHDefExtractIconA; static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); @@ -708,6 +710,34 @@ static void test_datalink(void) IShellLinkW_Release( sl ); } +static void test_shdefextracticon(void) +{ + HICON hiconlarge=NULL, hiconsmall=NULL; + HRESULT res; + + if (!pSHDefExtractIconA) + { + win_skip("SHDefExtractIconA is unavailable\n"); + return; + } + + res = pSHDefExtractIconA("shell32.dll", 0, 0, &hiconlarge, &hiconsmall, MAKELONG(16,24)); + ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); + ok(hiconlarge != NULL, "got null hiconlarge\n"); + ok(hiconsmall != NULL, "got null hiconsmall\n"); + DestroyIcon(hiconlarge); + DestroyIcon(hiconsmall); + + hiconsmall = NULL; + res = pSHDefExtractIconA("shell32.dll", 0, 0, NULL, &hiconsmall, MAKELONG(16,24)); + ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); + ok(hiconsmall != NULL, "got null hiconsmall\n"); + DestroyIcon(hiconsmall); + + res = pSHDefExtractIconA("shell32.dll", 0, 0, NULL, NULL, MAKELONG(16,24)); + ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); +} + START_TEST(shelllink) { HRESULT r; @@ -717,6 +747,7 @@ START_TEST(shelllink) pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155); pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21); pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28); + pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); @@ -728,6 +759,7 @@ START_TEST(shelllink) test_get_set(); test_load_save(); test_datalink(); + test_shdefextracticon(); CoUninitialize(); }

1 0

Gerald Pfeifer : libwine: Remove redundant prototype for wine_call_on_stack ().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 5a28d37fe6fda229fbeff5172569f43267e954be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a28d37fe6fda229fbeff5172… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 15 15:51:53 2009 +0200 libwine: Remove redundant prototype for wine_call_on_stack(). --- libs/wine/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 859818f..65f4912 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -132,7 +132,7 @@ void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, vo * * Switch to the specified stack to call the function and return. */ -int wine_call_on_stack( int (*func)(void *), void *arg, void *stack ); + #if defined(__i386__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "pushl %ebp\n\t"

1 0

Alexandre Julliard : ntdll: Free old memory block when reallocating to a large block.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 13a33b73c349530b17347d3ec6a1f5bb268cc917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a33b73c349530b17347d3ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 16 11:33:06 2009 +0200 ntdll: Free old memory block when reallocating to a large block. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4abd35e..2d7d53d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1555,7 +1555,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (!(ret = allocate_large_block( heapPtr, flags, size ))) goto oom; notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); memcpy( ret, pArena + 1, oldActualSize ); - /* FIXME: free old memory here! */ + notify_free( pArena + 1 ); + HEAP_MakeInUseBlockFree( subheap, pArena ); goto done; } if ((pNext < (char *)subheap->base + subheap->size) &&

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009