May 2009 - Wine-Commits - list.winehq.org

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

May 18, 2009

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 : msvideo.dll16: Add missing unlock on an error path ( Smatch).
by Alexandre Julliard May 18, 2009

May 18, 2009

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

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

May 18, 2009

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 : winetest: Replace malloc() & co with HeapAlloc().
by Alexandre Julliard May 18, 2009

May 18, 2009

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 : advapi32/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 3d5f1edff5330a028c9f63547090b2d72a567433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5f1edff5330a028c9f63547… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:31:24 2009 +0200 advapi32/tests: Replace realloc() with HeapReAlloc(). --- dlls/advapi32/tests/registry.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a3d9f30..47e76b2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -52,7 +52,11 @@ static char *get_temp_buffer( int size ) UINT idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

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

May 18, 2009

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

Francois Gouget : gphoto2.ds: Use Win32 APIs instead of strdup().
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: d0ba18430d769ff4073e08156f4e0035f725f7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ba18430d769ff4073e08156… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:30:10 2009 +0200 gphoto2.ds: Use Win32 APIs instead of strdup(). --- dlls/gphoto2.ds/gphoto2_main.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index bb2c31c..ab4f392 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -37,6 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +static char* GPHOTO2_StrDup(const char* str) +{ + char* dst = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + strcpy(dst, str); + return dst; +} + static void load_filesystem(const char *folder) { #ifdef HAVE_GPHOTO2 @@ -63,12 +70,12 @@ load_filesystem(const char *folder) { ret = gp_list_get_name (list, i, &name); if (ret < GP_OK) continue; - gpfile = HeapAlloc(GetProcessHeap(), 0, sizeof(struct gphoto2_file)); + gpfile = HeapAlloc(GetProcessHeap(), 0, sizeof(struct gphoto2_file)); /* FIXME: Leaked */ if (!gpfile) continue; TRACE("adding %s/%s\n", folder, name); - gpfile->folder = strdup(folder); - gpfile->filename = strdup(name); + gpfile->folder = GPHOTO2_StrDup(folder); + gpfile->filename = GPHOTO2_StrDup(name); gpfile->download = FALSE; list_add_tail( &activeDS.files, &gpfile->entry ); }

1 0

Vitaliy Margolen : dxdiagn: Rename szClsidCat and szClsidFilter to match native information.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: b3375a3fa299827f2c385340e33767ea209a169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3375a3fa299827f2c385340e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:18 2009 -0600 dxdiagn: Rename szClsidCat and szClsidFilter to match native information. --- dlls/dxdiagn/provider.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 398c9ad..86f9c6b 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -598,8 +598,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; - static const WCHAR szClsidCat[] = {'s','z','C','l','s','i','d','C','a','t',0}; - static const WCHAR szClsidFilter[] = {'s','z','C','l','s','i','d','F','i','l','t','e','r',0}; + static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; + static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; static const WCHAR dwMerit[] = {'d','w','M','e','r','i','t',0}; @@ -674,7 +674,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD dwNInputs = 0; add_prop_str(pSubCont, szCatName, wszCatName); - add_prop_str(pSubCont, szClsidCat, wszCatClsid); + add_prop_str(pSubCont, ClsidCatW, wszCatClsid); hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); @@ -683,7 +683,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidFilter, &v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, ClsidFilterW, &v); VariantClear(&v); hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL);

1 0

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

May 18, 2009

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: Initial implementation of RtlVirtualUnwind on x86_64.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: f7b1e94f9896b7f8c61ad1165b8eae51711093f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b1e94f9896b7f8c61ad1165… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 20:18:59 2009 +0200 ntdll: Initial implementation of RtlVirtualUnwind on x86_64. --- dlls/ntdll/signal_x86_64.c | 281 +++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 5 + 2 files changed, 280 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b1e94f9896b7f8c61ad…

1 0