January 2011 - Wine-commits

Thomas Mullaly : urlmon/tests: Fixed memory leak in tests (valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: c63cf7014bcc22366834e916302385b257ca61cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63cf7014bcc22366834e9163… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Jan 15 15:16:50 2011 -0500 urlmon/tests: Fixed memory leak in tests (valgrind). --- dlls/urlmon/tests/uri.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 44f438f..5bbd051 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7248,6 +7248,7 @@ static void test_CreateUriWithFragment(void) { if(uri) IUri_Release(uri); heap_free(uriW); + heap_free(fragW); } }

1 0

Nikolay Sivov : comctl32/imagelist: Fix a couple of imagelist leaks ( Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 6d1a3c6e6e1ca5448812c27eded3a604d6f28583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1a3c6e6e1ca5448812c27ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 18:21:54 2011 +0300 comctl32/imagelist: Fix a couple of imagelist leaks (Valgrind). --- dlls/comctl32/imagelist.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ed92a52..66cd03d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3384,7 +3384,12 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, /* Get the interface for the new image list */ if (hNew) + { + IImageList *imerge = (IImageList*)hNew; + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + IImageList_Release(imerge); + } IImageList_Release(iml2); return ret; @@ -3534,7 +3539,12 @@ static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList *iface, POINT *ppt, /* Get the interface for the new image list */ if (hNew) + { + IImageList *idrag = (IImageList*)hNew; + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + IImageList_Release(idrag); + } return ret; }

1 0

Nikolay Sivov : fusion: Fix processor arch string leak (Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 79f1d863d28f4e6ed71b03a839ba69a4e942ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f1d863d28f4e6ed71b03a83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 18:55:42 2011 +0300 fusion: Fix processor arch string leak (Valgrind). --- dlls/fusion/asmname.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 34f0555..54223af 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -111,6 +111,7 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) HeapFree(GetProcessHeap(), 0, This->displayname); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->culture); + HeapFree(GetProcessHeap(), 0, This->procarch); HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : hlink/tests: Fix interface leak (Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e871d5ec3751c08b98964ba69565c41127c9626e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e871d5ec3751c08b98964ba69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 19:07:58 2011 +0300 hlink/tests: Fix interface leak (Valgrind). --- dlls/hlink/tests/browse_ctx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index e25333d..78df8fa 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -124,6 +124,8 @@ static void test_BrowseWindowInfo(void) hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, &bwinfo_get); ok(hres == S_OK, "GetBrowseWindowInfo failed: 0x%08x\n", hres); ok(!memcmp(&bwinfo_set, &bwinfo_get, sizeof(HLBWINFO)), "Set and Get differ\n"); + + IHlinkBrowseContext_Release(bc); } START_TEST(browse_ctx)

1 0

Nikolay Sivov : shlwapi: Keep pointer to allocated block to free it later ( Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: d6c0752913bc8fbab12ba0f9e2866b31eaaa6efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c0752913bc8fbab12ba0f9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 20:14:39 2011 +0300 shlwapi: Keep pointer to allocated block to free it later (Valgrind). --- dlls/shlwapi/url.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index bb5e633..6b469e2 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1072,7 +1072,7 @@ HRESULT WINAPI UrlEscapeW( LPCWSTR src; DWORD needed = 0, ret; BOOL stop_escaping = FALSE; - WCHAR next[5], *dst = pszEscaped; + WCHAR next[5], *dst = pszEscaped, *dst_ptr = NULL; INT len; PARSEDURLW parsed_url; DWORD int_flags; @@ -1092,7 +1092,7 @@ HRESULT WINAPI UrlEscapeW( FIXME("Unimplemented flags: %08x\n", dwFlags); if(pszUrl == pszEscaped) { - dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); + dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); if(!dst) return E_OUTOFMEMORY; } @@ -1224,7 +1224,7 @@ HRESULT WINAPI UrlEscapeW( *pcchEscaped = needed; if(pszUrl == pszEscaped) - HeapFree(GetProcessHeap(), 0, dst); + HeapFree(GetProcessHeap(), 0, dst_ptr); return ret; }

1 0

Nikolay Sivov : shell32/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 38a995021ac0898b0977591e80da3705356968dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a995021ac0898b0977591e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 21:29:08 2011 +0300 shell32/tests: Fix some leaks in tests (Valgrind). --- dlls/shell32/tests/shfldr_special.c | 3 +++ dlls/shell32/tests/shlfolder.c | 1 + dlls/shell32/tests/shlview.c | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 24374bc..2374d7c 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -162,8 +162,11 @@ if (0) hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); + details.str.u.pOleStr = NULL; hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); + if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + /* test every column if method is implemented */ if (hr == S_OK) { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 990ec0c..8701b4d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3977,6 +3977,7 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) ok_(__FILE__,l)(lstrcmpW(path, U(filename).pOleStr) == 0, "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); + SHFree(U(filename).pOleStr); }else if(filename.uType == STRRET_CSTR){ ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0, "didn't get expected path (%s), instead: %s\n", diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 101cdf3..9d2fb47 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1105,6 +1105,7 @@ static void test_GetSetCurrentViewMode(void) skip("No IFolderView for the desktop folder.\n"); } + IShellBrowser_Release(browser); IShellView_DestroyViewWindow(sview); IShellView_Release(sview); IShellFolder_Release(desktop);

1 0

Michael Stefaniuc : urlmon: Remove some leftovers from the old COM days.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e5b2a222ac4632fd589b8e530094868699a41c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b2a222ac4632fd589b8e530… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 23:32:54 2011 +0100 urlmon: Remove some leftovers from the old COM days. --- dlls/urlmon/binding.c | 4 ---- dlls/urlmon/bindprot.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index aa547c3..fa92a4d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -104,8 +104,6 @@ typedef struct { CRITICAL_SECTION section; } Binding; -#define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) - static void fill_stgmed_buffer(stgmed_buf_t *buf) { DWORD read = 0; @@ -1270,8 +1268,6 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, return E_NOTIMPL; } -#undef BINDF_THIS - static const IInternetBindInfoVtbl InternetBindInfoVtbl = { InternetBindInfo_QueryInterface, InternetBindInfo_AddRef, diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 929fd21..095194e 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -820,8 +820,6 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, return IInternetBindInfo_GetBindString(This->bind_info, ulStringType, ppwzStr, cEl, pcElFetched); } -#undef BINDFO_THIS - static const IInternetBindInfoVtbl InternetBindInfoVtbl = { BindInfo_QueryInterface, BindInfo_AddRef,

1 0

Vincent Povirk : wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 173b2c5b0f0d44adf7b946c9fbe2ad5f94b33d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173b2c5b0f0d44adf7b946c9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 14 16:39:57 2011 -0600 wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry. --- dlls/wininet/cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 7dfd2a8..157ee8d 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -302,11 +302,11 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, cookie_domain *cookiesDomain = LIST_ENTRY(cursor, cookie_domain, entry); if (COOKIE_matchDomain(hostName, path, cookiesDomain, TRUE)) { - struct list * cursor; + struct list * cursor, * cursor2; domain_count++; TRACE("found domain %p\n", cookiesDomain); - LIST_FOR_EACH(cursor, &cookiesDomain->cookie_list) + LIST_FOR_EACH_SAFE(cursor, cursor2, &cookiesDomain->cookie_list) { cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry); /* check for expiry */

1 0

Alexandre Julliard : libwine: Remove redundant wine_switch_to_stack implementations.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: b8f6345d3d18c03e275b46363e66be9e8e31516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f6345d3d18c03e275b46363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 17 12:49:31 2011 +0100 libwine: Remove redundant wine_switch_to_stack implementations. --- libs/wine/port.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 32b819b..c9d38dc 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -54,36 +54,11 @@ void wine_pthread_set_functions( const struct wine_pthread_functions *functions, * * Switch to the specified stack and call the function. */ -#if defined(__sparc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "mov %o0, %l0\n\t" /* store first argument */ - "mov %o1, %l1\n\t" /* store second argument */ - "sub %o2, 96, %sp\n\t" /* store stack */ - "call %l0, 0\n\t" /* call func */ - "mov %l1, %o0\n\t" /* delay slot: arg for func */ - "ta 0x01") /* breakpoint - we never get here */ -#elif defined(__powerpc__) && defined(__APPLE__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "mtctr r3\n\t" /* func -> ctr */ - "mr r3,r4\n\t" /* args -> function param 1 (r3) */ - "mr r1,r5\n\t" /* stack */ - "subi r1,r1,0x100\n\t" /* adjust stack pointer */ - "bctrl\n" /* call ctr */ - "1:\tb 1b") /* loop */ -#elif defined(__ALPHA__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "mov $16,$0\n\t" /* func */ - "mov $17,$16\n\t" /* arg */ - "mov $18,$30\n\t" /* stack */ - "jsr $31,($0),0\n\t" /* call func */ - "L1:\tbr $31,L1") /* loop */ -#else void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ) { wine_call_on_stack( (int (*)(void *))func, arg, stack ); abort(); } -#endif /*********************************************************************** @@ -196,5 +171,5 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "ret\n\t" /* return */ "restore\n\t") /* delay slot: pop */ #else -#error You must implement wine_switch_to_stack for your platform +#error You must implement wine_call_on_stack for your platform #endif

1 0

Damjan Jovanovic : winemenubuilder: Extract all icon sizes on freedesktop too.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: bf07eb926ed9fa3591d10cfa74711fc94c3e3ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf07eb926ed9fa3591d10cfa7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Jan 15 10:37:52 2011 +0200 winemenubuilder: Extract all icon sizes on freedesktop too. --- programs/winemenubuilder/winemenubuilder.c | 113 ++++++++++++++++++++------- 1 files changed, 83 insertions(+), 30 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 56ff158..070a8c2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -939,18 +939,34 @@ end: return hr; } #else +static void refresh_icon_cache(const char *iconsDir) +{ + /* The icon theme spec only requires the mtime on the "toplevel" + * directory (whatever that is) to be changed for a refresh, + * but on Gnome you have to create a file in that directory + * instead. Creating a file also works on KDE, XFCE and LXDE. + */ + char *filename = heap_printf("%s/.wine-refresh-XXXXXX", iconsDir); + if (filename != NULL) + { + int fd = mkstemps(filename, 0); + if (fd >= 0) + { + close(fd); + unlink(filename); + } + HeapFree(GetProcessHeap(), 0, filename); + } +} + static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { ICONDIRENTRY *iconDirEntries = NULL; int numEntries; - int bestIndex = -1; - int maxPixels = 0; - int maxBits = 0; int i; char *icoPathA = NULL; char *iconsDir = NULL; - char *pngPath = NULL; unsigned short crc; char *p, *q; HRESULT hr = S_OK; @@ -959,19 +975,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); if (FAILED(hr)) goto end; - for (i = 0; i < numEntries; i++) - { - WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, - iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); - if (iconDirEntries[i].wBitCount >= maxBits && - (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= maxPixels) - { - bestIndex = i; - maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; - maxBits = iconDirEntries[i].wBitCount; - } - } - WINE_TRACE("Selected: %d\n", bestIndex); icoPathA = wchars_to_utf8_chars(icoPathW); if (icoPathA == NULL) @@ -1000,31 +1003,81 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico hr = E_OUTOFMEMORY; goto end; } - iconsDir = heap_printf("%s/icons", xdg_data_dir); + iconsDir = heap_printf("%s/icons/hicolor", xdg_data_dir); if (iconsDir == NULL) { hr = E_OUTOFMEMORY; goto end; } - create_directories(iconsDir); - pngPath = heap_printf("%s/%s.png", iconsDir, *nativeIdentifier); - if (pngPath == NULL) + + for (i = 0; i < numEntries; i++) { - hr = E_OUTOFMEMORY; - goto end; + int bestIndex; + int maxBits = -1; + int j; + BOOLEAN duplicate = FALSE; + int w, h; + char *iconDir = NULL; + char *pngPath = NULL; + + WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, + iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); + + for (j = 0; j < i; j++) + { + if (iconDirEntries[j].bWidth == iconDirEntries[i].bWidth && + iconDirEntries[j].bHeight == iconDirEntries[i].bHeight) + { + duplicate = TRUE; + break; + } + } + if (duplicate) + continue; + for (j = i; j < numEntries; j++) + { + if (iconDirEntries[j].bWidth == iconDirEntries[i].bWidth && + iconDirEntries[j].bHeight == iconDirEntries[i].bHeight && + iconDirEntries[j].wBitCount >= maxBits) + { + bestIndex = j; + maxBits = iconDirEntries[j].wBitCount; + } + } + WINE_TRACE("Selected: %d\n", bestIndex); + + w = iconDirEntries[bestIndex].bWidth ? iconDirEntries[bestIndex].bWidth : 256; + h = iconDirEntries[bestIndex].bHeight ? iconDirEntries[bestIndex].bHeight : 256; + iconDir = heap_printf("%s/%dx%d/apps", iconsDir, w, h); + if (iconDir == NULL) + { + hr = E_OUTOFMEMORY; + goto endloop; + } + create_directories(iconDir); + pngPath = heap_printf("%s/%s.png", iconDir, *nativeIdentifier); + if (pngPath == NULL) + { + hr = E_OUTOFMEMORY; + goto endloop; + } + zero.QuadPart = 0; + hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + goto endloop; + hr = convert_to_native_icon(icoStream, &bestIndex, 1, &CLSID_WICPngEncoder, + pngPath, icoPathW); + + endloop: + HeapFree(GetProcessHeap(), 0, iconDir); + HeapFree(GetProcessHeap(), 0, pngPath); } - zero.QuadPart = 0; - hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - goto end; - hr = convert_to_native_icon(icoStream, &bestIndex, 1, &CLSID_WICPngEncoder, - pngPath, icoPathW); + refresh_icon_cache(iconsDir); end: HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, icoPathA); HeapFree(GetProcessHeap(), 0, iconsDir); - HeapFree(GetProcessHeap(), 0, pngPath); return hr; } #endif /* defined(__APPLE__) */

1 0