April 2015 - Wine-commits - list.winehq.org

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 96971ea36db9daf7e06b4551640a8551dcdb45d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96971ea36db9daf7e06b45516… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 10 13:10:48 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 250 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 28 ++--- 2 files changed, 247 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96971ea36db9daf7e06b4…

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don 't support nameless unions.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: af4324e4330c92b41e6fed20f918d4da627f0258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4324e4330c92b41e6fed20f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 11 16:28:19 2015 +0200 windowscodecs/tests: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1818b26..6c2d6b7 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -451,7 +451,7 @@ static void test_metadata_gAMA(void) PropVariantClear(&id); ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); - ok(value.ulVal == 33333, "unexpected value: %u\n", value.ulVal); + ok(U(value).ulVal == 33333, "unexpected value: %u\n", U(value).ulVal); PropVariantClear(&value); IWICMetadataReader_Release(reader);

1 0

Nikolay Sivov : scrrun: Fix iterating through per-bucket pair list ( Valgrind).
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 8ff3ab8503de51c8c4bd1b10c3e9c19ce181d352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff3ab8503de51c8c4bd1b10c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 09:58:48 2015 +0300 scrrun: Fix iterating through per-bucket pair list (Valgrind). --- dlls/scrrun/dictionary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 631d0b0..844b4d1 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -154,10 +154,11 @@ static struct keyitem_pair *get_keyitem_pair(dictionary *dict, VARIANT *key) if (FAILED(hr)) return NULL; - entry = head = get_bucket_head(dict, V_I4(&hash)); + head = get_bucket_head(dict, V_I4(&hash)); if (!head->next || list_empty(head)) return NULL; + entry = list_head(head); do { pair = LIST_ENTRY(entry, struct keyitem_pair, bucket); if (is_matching_key(dict, pair, key, V_I4(&hash))) return pair;

1 0

Nikolay Sivov : winealsa: Fix a leak of a silence buffer (Valgrind).
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 8095210d2c60226743087de4d6c5561f8ac62248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8095210d2c60226743087de4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 10:34:18 2015 +0300 winealsa: Fix a leak of a silence buffer (Valgrind). --- dlls/winealsa.drv/mmdevdrv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index f0ce3a9..90894b6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -923,6 +923,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) HeapFree(GetProcessHeap(), 0, This->vols); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This->remapping_buf); + HeapFree(GetProcessHeap(), 0, This->silence_buf); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->hw_params); CoTaskMemFree(This->fmt);

1 0

Nikolay Sivov : mmdevapi: Fix returned format leak (Valgrind).
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: f4096a30eac7e1344baba96c36a15a826ff469a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4096a30eac7e1344baba96c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 10:46:32 2015 +0300 mmdevapi: Fix returned format leak (Valgrind). --- dlls/mmdevapi/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1a5bf00..d612ec0 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -485,6 +485,7 @@ static HRESULT set_format(MMDevice *dev) &PKEY_AudioEngine_DeviceFormat, &pv); MMDevice_SetPropValue(&dev->devguid, dev->flow, &PKEY_AudioEngine_OEMFormat, &pv); + CoTaskMemFree(fmt); return S_OK; }

1 0

Nikolay Sivov : rpcrt4/tests: Fix a minor leak (Valgrind).
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 4cf70b1418260fda95d69bcb50374a64f1ce895b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf70b1418260fda95d69bcb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 11:01:09 2015 +0300 rpcrt4/tests: Fix a minor leak (Valgrind). --- dlls/rpcrt4/tests/ndr_marshall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 315a452..917c9e5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1590,6 +1590,7 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Nikolay Sivov : shlwapi/tests: Fix uninitialized memory reads (Valgrind).
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: d6180c05b5a6fd3f0f5eae897c00d30527dc4ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6180c05b5a6fd3f0f5eae897… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 12:05:25 2015 +0300 shlwapi/tests: Fix uninitialized memory reads (Valgrind). --- dlls/shlwapi/tests/path.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 7ffa000..84b3f4d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -183,13 +183,18 @@ static const struct { /* ################ */ -static LPWSTR GetWideString(const char* szString) +static LPWSTR GetWideString(const char *src) { - LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - - MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); + WCHAR *ret; - return wszString; + if (!src) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, src, -1, ret, INTERNET_MAX_URL_LENGTH); + + return ret; } static void FreeWideString(LPWSTR wszString)

1 0

Nikolay Sivov : oleaut32/tests: Skip cache tests if it's disabled.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 444bc3556d57ac5b456e0ac7f245c08ee4939443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444bc3556d57ac5b456e0ac7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 18:28:37 2015 +0300 oleaut32/tests: Skip cache tests if it's disabled. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 774aee2..4dd77a0 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6318,6 +6318,11 @@ static void test_bstr_cache(void) static const WCHAR testW[] = {'t','e','s','t',0}; + if (GetEnvironmentVariableA("OANOCACHE", NULL, 0)) { + skip("BSTR cache is disabled, some tests will be skipped.\n"); + return; + } + str = SysAllocString(testW); /* This should put the string into cache */ SysFreeString(str);

1 0

Mark Harmstone : uxtheme: Free properties when theme file closed.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 7aae2d2eae5157f0fb40ace1a93a8634672d23cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aae2d2eae5157f0fb40ace1a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 11 18:51:34 2015 +0100 uxtheme: Free properties when theme file closed. --- dlls/uxtheme/msstyles.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 780751b..b557314 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -209,6 +209,13 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) tf->classes = pcls->next; while(pcls->partstate) { PTHEME_PARTSTATE ps = pcls->partstate; + + while(ps->properties) { + PTHEME_PROPERTY prop = ps->properties; + ps->properties = prop->next; + HeapFree(GetProcessHeap(), 0, prop); + } + pcls->partstate = ps->next; HeapFree(GetProcessHeap(), 0, ps); }

1 0

Mark Harmstone : uxtheme: Fix typo making fonts italic.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 9f622f1fa6f34f81dd38cd5e7aef0865fe15666d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f622f1fa6f34f81dd38cd5e7… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 11 20:12:04 2015 +0100 uxtheme: Fix typo making fonts italic. --- dlls/uxtheme/msstyles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index b557314..e62b95d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1268,9 +1268,9 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, pFont->lfCharSet = DEFAULT_CHARSET; while(MSSTYLES_GetNextToken(lpCur, lpEnd, &lpCur, attr, sizeof(attr)/sizeof(attr[0]))) { if(!lstrcmpiW(szBold, attr)) pFont->lfWeight = FW_BOLD; - else if(!!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE; - else if(!!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE; - else if(!!lstrcmpiW(szStrikeOut, attr)) pFont->lfStrikeOut = TRUE; + else if(!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE; + else if(!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE; + else if(!lstrcmpiW(szStrikeOut, attr)) pFont->lfStrikeOut = TRUE; } *lpValEnd = lpCur; return S_OK;

1 0