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

Julius Schwartzenberg : dwrite: Font search is case insensitive.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 20aee0673dcad26e86ae97d26447bc87977b9eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=20aee0673dcad26e86ae97d26… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Fri Apr 10 21:08:31 2015 +0200 dwrite: Font search is case insensitive. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc067a5..c591f4e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1431,7 +1431,7 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { WCHAR buffer[255]; hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); - if (SUCCEEDED(hr) && !strcmpW(buffer, name)) + if (SUCCEEDED(hr) && !strcmpiW(buffer, name)) return i; } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 65d8bcb..126fba9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -58,6 +58,8 @@ static inline BOOL heap_free(void *mem) static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; +static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; static IDWriteFactory *create_factory(void) @@ -1376,6 +1378,20 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaUppercaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaStrangecaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Vincent Povirk : windowscodecs: Fix crash when PNG decoder is freed without successful init.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 27ae589d2aee548d06401153a2bdc5f9af98329d URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae589d2aee548d06401153a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 10 11:39:34 2015 -0500 windowscodecs: Fix crash when PNG decoder is freed without successful init. --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2aac560..f39b31a 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -442,7 +442,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { - IStream_Release(This->stream); + if (This->stream) + IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; @@ -1218,6 +1219,7 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This->png_ptr = NULL; This->info_ptr = NULL; This->end_info = NULL; + This->stream = NULL; This->initialized = FALSE; This->image_bits = NULL; InitializeCriticalSection(&This->lock);

1 0

Bruno Jesus : ws2_32/tests: Add more select() tests.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 2da8f9a9dbc4b759b1deeb339a5856e44c876751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da8f9a9dbc4b759b1deeb339… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 12 21:22:49 2015 -0300 ws2_32/tests: Add more select() tests. --- dlls/ws2_32/tests/sock.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8b69cf6..c7b3ea7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3368,6 +3368,14 @@ static DWORD WINAPI SelectReadThread(void *param) return 0; } +static DWORD WINAPI SelectCloseThread(void *param) +{ + SOCKET s = *(SOCKET*)param; + Sleep(500); + closesocket(s); + return 0; +} + static void test_errors(void) { SOCKET sock; @@ -3792,6 +3800,49 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite); + + /* Try select() on a closed socket after connection */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + closesocket(fdRead); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + FD_SET_ALL(fdRead); + SetLastError(0xdeadbeef); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + /* descriptor sets are unchanged */ + ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); + ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); + closesocket(fdWrite); + + /* Close the socket currently being selected in a thread - bug 38399 */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); + /* test again with only the except descriptor */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET(fdWrite, &exceptfds); + SetLastError(0xdeadbeef); + ret = select(0, NULL, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); } #undef FD_SET_ALL #undef FD_ZERO_ALL

1 0

Mark Harmstone : uxtheme: Fix typo making fonts italic.
by Alexandre Julliard April 13, 2015

April 13, 2015

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

Nikolay Sivov : oleaut32/tests: Skip cache tests if it's disabled.
by Alexandre Julliard April 13, 2015

April 13, 2015

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

Nikolay Sivov : winealsa: Fix a leak of a silence buffer (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

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

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 13, 2015

April 13, 2015

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

Mark Harmstone : uxtheme: Free properties when theme file closed.
by Alexandre Julliard April 13, 2015

April 13, 2015

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

Nikolay Sivov : mmdevapi: Fix returned format leak (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

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 : scrrun: Fix iterating through per-bucket pair list ( Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

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