December 2018 - Wine-devel - list.winehq.org

[PATCH] gdiplus: Fix a memory leak (Valgrind).
by Sven Baars 19 Dec '18

19 Dec '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdiplus/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 729592b982..5e6aa5430f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1125,6 +1125,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle return InvalidParameter; for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); return Ok; -- 2.17.1

2 2

[PATCH] [v2] gdi32: Fix compile error with Fontconfig <= 2.10.91.
by Akihiro Sagawa 19 Dec '18

19 Dec '18

In v2, define FC_PRGNAME and FC_NAMELANG if not available. I did some tests with Fontconfig 2.8. FcPatternAddString() succeeds with these pattern names. Family name seems to be always English in the old version, so FC_NAMELANG isn't needed. FC_PRGNAME is a hint for fonts.conf author, so it doesn't affect Fontconfig internals. FC_PRGNAME is available since 2.10.92 and FC_NAMELANG is available since 2.9.91. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH] devenum/tests: Fix a memory leak (Valgrind).
by Sven Baars 19 Dec '18

19 Dec '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/devenum/tests/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 10ca27a614..ec311ceab4 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -95,6 +95,7 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); -- 2.17.1

3 6

[PATCH v2] explorer: unload graphics driver and delete registry keys
by Daniel Wendt 19 Dec '18

19 Dec '18

2 2

[PATCH resent 1/2] kernel32/tests: Test partially overlapped buffers for MultiByteToWideChar
by Gabriel Ivăncescu 19 Dec '18

19 Dec '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..2e47868 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,23 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); +todo_wine + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", wine_dbgstr_wn((WCHAR *)buf, ARRAY_SIZE(strW))); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar) -- 2.19.1

3 5

Re: [PATCH] winex11.drv/window: Sync the window cursor before grabbing it
by Gabriel Ivăncescu 19 Dec '18

19 Dec '18

On 12/18/18 22:52, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Deferred". > > This means that the patch is deferred because of code freeze for an > upcoming release. You need to either resend after the release, make > the patch less intrusive, or make a convincing argument that it needs > to be included in the release. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. > I don't think this patch has reason to be deferred. It can't possibly break anything, as it only syncs the cursor visuals, which is only needed because X11 has per-window cursor. Since Windows itself has a global cursor, then theoretically the cursor should be "permanently" synced for it to have Windows behavior. Obviously it's prohibitive to do that, but in this case it doesn't really break anything other than adding a round-trip to the wineserver when a "sizemove" drag operation begins, which needless to say is insignificant. If the cursor was already synced then nothing happens.

1 0

[PATCH] gdi32: Fix building with versions of fontconfig < 2.11.0.
by Huw Davies 19 Dec '18

19 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e07aadaa1d..ebecf79ee1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -184,7 +184,13 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +#ifndef FC_NAMELANG +#define FC_NAMELANG "namelang" #endif +#ifndef FC_PRGNAME +#define FC_PRGNAME "prgname" +#endif +#endif /* SONAME_LIBFONTCONFIG */ #undef MAKE_FUNCPTR -- 2.17.1

1 0

Re: [PATCH 2/2] explorer: send WM_NCDESTROY message to delete hwnd-related global atom
by Daniel Wendt 19 Dec '18

19 Dec '18

Applying the patch failed because the patch is dependent on another one (ID 155628: [PATCH v2] explorer: unload graphics driver and delete registry keys). If the patch is accepted, I will test this patch series again and resubmitting it. On Tue, Dec 4, 2018 at 11:44 PM Marvin <testbot(a)winehq.org> wrote: > > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Apply failure". > > This means that git-apply refused to apply the patch. This could be > either because it got mangled in transit, it's not relative to the > latest git, or it conflicts with someone else's patch in the same > area. You need to resend an updated patch. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

1 0

[PATCH] scrrun/tests: Skip BOM reading tests if we don't know the right result
by Alex Henrie 19 Dec '18

19 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/scrrun/tests/filesystem.c | 80 ++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 29ee73f243..d84828ec75 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1469,6 +1469,7 @@ static void test_CreateTextFile(void) HANDLE file; HRESULT hr; BOOL ret; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1519,17 +1520,24 @@ static void test_CreateTextFile(void) ITextStream_Release(stream); /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode - treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - SysFreeString(str); - ITextStream_Release(stream); + treats BOM like valuable data with appropriate CP_ACP -> WCHAR conversion. */ + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } DeleteFileW(nameW); RemoveDirectoryW(dirW); @@ -1615,6 +1623,7 @@ static void test_ReadAll(void) HRESULT hr; BOOL ret; BSTR str; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1651,13 +1660,21 @@ static void test_ReadAll(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ - str = NULL; - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); - SysFreeString(str); + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + str = NULL; + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + SysFreeString(str); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } ITextStream_Release(stream); /* Unicode file -> read with unicode stream */ @@ -1744,6 +1761,7 @@ static void test_Read(void) HRESULT hr; BOOL ret; BSTR str; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1796,16 +1814,22 @@ static void test_Read(void) ok(str == NULL, "got %p\n", str); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ - str = NULL; - hr = ITextStream_Read(stream, 2, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); - - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); - SysFreeString(str); + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + str = NULL; + hr = ITextStream_Read(stream, 2, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); + SysFreeString(str); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } ITextStream_Release(stream); /* Unicode file -> read with unicode stream */ -- 2.20.1

2 3

[PATCH] dmstyle/tests: Relax dwValidData test
by Alex Henrie 19 Dec '18

19 Dec '18

This fixes the consistent test failures on Windows 7 and intermittent test failures on Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c649..65d9348fba 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(desc.dwValidData & ~(DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION) == DMUS_OBJ_CLASS + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); -- 2.20.1

2 1