December 2018 - Wine-commits

Alexandre Julliard : comctl32/tests: Avoid a structure initialization warning.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 0e166d998d5f203e3de67cb3776081a97f200de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e166d998d5f203e3de67cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:33:34 2018 +0100 comctl32/tests: Avoid a structure initialization warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 718df25..f48dc03 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1099,7 +1099,7 @@ static void test_wm_notify_datetime(HWND pager) static void test_wm_notify_header(HWND pager) { - NMHEADERW nmh = {0}; + NMHEADERW nmh = {{0}}; HDITEMW hdi = {0}; HD_TEXTFILTERW hdtf = {0};

1 0

Alexandre Julliard : Release 4.0-rc2.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 4397d9497608a3df45a5c519a37f5dcde5cc2301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4397d9497608a3df45a5c519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 588 +++++++++++--------------------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 116 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4397d9497608a3df45a5…

1 0

Tag wine-4.0-rc2 : Alexandre Julliard : Release 4.0-rc2
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: refs/tags/wine-4.0-rc2 Tag: 6340db6f8508df95bffe5e2e7e37d73a7049b76b URL: https://source.winehq.org/git/wine.git/?a=tag;h=6340db6f8508df95bffe5e2e7e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2

1 0

Nikolay Sivov : dwrite/tests: Fix some leaks (Valgrind).
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 75b02759b0528ecda05ff4865f6c06dda1ac6410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b02759b0528ecda05ff486… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:05:26 2018 +0300 dwrite/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f752afd..aa1562e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1778,6 +1778,7 @@ static void test_CreateFontFace(void) UINT32 count; WCHAR *path; HRESULT hr; + ULONG ref; factory = create_factory(); @@ -1864,6 +1865,8 @@ static void test_CreateFontFace(void) IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); /* IDWriteFactory::CreateFontFace() */ path = create_testfontfile(test_fontfile); @@ -1929,7 +1932,8 @@ todo_wine } IDWriteFontFile_Release(file); - IDWriteFactory_Release(factory); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); DELETE_FONTFILE(path); } @@ -4873,6 +4877,7 @@ static void test_IsMonospacedFont(void) ULONG ref; factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4920,7 +4925,8 @@ static void test_IsMonospacedFont(void) else skip("Courier New font not found.\n"); - ref = IDWriteFontCollection_Release(collection); + IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Nikolay Sivov : inetcomm: Fix a leak on DeleteProp() (Valgrind).
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 05f6769f24a6db40ac1ea3d60cdbc3ac9c5f2513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f6769f24a6db40ac1ea3d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:43:25 2018 +0300 inetcomm: Fix a leak on DeleteProp() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index cb9ebcc..a2854be 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -819,16 +819,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1232,8 +1237,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } }

1 0

Nikolay Sivov : kernelbase/tests: Fix some leaks (Valgrind).
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 392bce96c131a4ef2d68881ba668525ad44904b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392bce96c131a4ef2d68881b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:54:46 2018 +0300 kernelbase/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7b24f00..7644c31 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -323,6 +323,7 @@ static void test_PathAllocCanonicalize(void) path_maxW[PATHCCH_MAX_CCH - 1] = '\0'; hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + LocalFree(path_outW); /* Check if flags added after Windows 10 1709 are supported */ MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); @@ -449,12 +450,14 @@ static void test_PathAllocCombine(void) ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + LocalFree(resultW); MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); hr = pPathAllocCombine(NULL, path2W, 0, &resultW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + LocalFree(resultW); hr = pPathAllocCombine(path1W, path2W, 0, NULL); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr);

1 0

Nikolay Sivov : shcore: Fix path string leak for file streams (Valgrind).
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 0e966cbf5c72cd953cfe7588c66002da57a005a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e966cbf5c72cd953cfe7588… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:59:07 2018 +0300 shcore: Fix path string leak for file streams (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27..ac625fb 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -839,6 +839,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); + heap_free(stream->u.file.path); heap_free(stream); }

1 0

Kai Krakow : winebus.sys: Re-add missing Xbox controller PIDs.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 383c3128bb7b1d1c50ef9d69a92df6758b2dca25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=383c3128bb7b1d1c50ef9d69… Author: Kai Krakow <kai(a)kaishome.de> Date: Fri Dec 14 03:21:32 2018 +0100 winebus.sys: Re-add missing Xbox controller PIDs. These were introduced in commit 1333206 and have gone missing in one of the previous cleanup commits. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index cee0ae6..299cec5 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -53,9 +53,11 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x028f, /* Xbox360 Wireless Controller */ 0x02d1, /* Xbox One Controller */ 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ 0x02e3, /* Xbox One Elite Controller */ 0x02e6, /* Wireless XBox Controller Dongle */ 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ 0x0719, /* Xbox 360 Wireless Adapter */ };

1 0

Dmitry Timoshkov : include: Add _Deref_ret_z_ stub definition.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: bb5dfce475498cdf0bfcff55ee6ee4eb1e3f4d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5dfce475498cdf0bfcff55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 08:56:11 2018 +0300 include: Add _Deref_ret_z_ stub definition. Yet another compatibility fix for Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c69f7f9..29746c3 100644 --- a/include/sal.h +++ b/include/sal.h @@ -34,6 +34,7 @@ #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ +#define _Deref_ret_z_ #define _Field_range_(min, max)

1 0

Nikolay Sivov : usp10/tests: Test width returned with ScriptGetGlyphABCWidth().
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 4d2d7e9b7f281ca16c972ab8e5ff14c1aff4bedb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2d7e9b7f281ca16c972ab8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:36 2018 +0300 usp10/tests: Test width returned with ScriptGetGlyphABCWidth(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 62 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8c4b125..e907c8c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3403,26 +3403,76 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; SCRIPT_CACHE sc = NULL; - ABC abc; + HFONT hfont, prev_hfont; + TEXTMETRICA tm; + ABC abc, abc2; + LOGFONTA lf; + WORD glyph; + INT width; + DWORD ret; - hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); + glyph = 0; + ret = GetGlyphIndicesA(hdc, "a", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + hr = ScriptGetGlyphABCWidth(NULL, NULL, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, NULL); ok(broken(hr == E_PENDING) || hr == E_INVALIDARG, /* WIN7 */ "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, &abc); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); if (0) { /* crashes on WinXP */ - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc2); + ok(ret, "Failed to get char width.\n"); + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + ScriptFreeCache(&sc); + + /* Bitmap font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "Failed to get text metrics.\n"); + ok(!(tm.tmPitchAndFamily & TMPF_TRUETYPE), "Unexpected TrueType font.\n"); + ok(tm.tmPitchAndFamily & TMPF_FIXED_PITCH, "Unexpected fixed pitch font.\n"); + + glyph = 0; + ret = GetGlyphIndicesA(hdc, "i", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + sc = NULL; + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); + ok(hr == S_OK, "Failed to get glyph width, hr %#x.\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharWidthI(hdc, glyph, 1, NULL, &width); + ok(ret, "Failed to get char width.\n"); + abc2.abcA = abc2.abcC = 0; + abc2.abcB = width; + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + SelectObject(hdc, prev_hfont); + DeleteObject(hfont); ScriptFreeCache(&sc); }

1 0