December 2016 - Wine-commits

Alexandre Julliard : msvcirt/tests: Silence a compiler warning.
by Alexandre Julliard 22 Dec '16

22 Dec '16

Module: wine Branch: master Commit: c28816cc378a580258bfb35a8fc8a32d1b40afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28816cc378a580258bfb35a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 15:07:05 2016 +0100 msvcirt/tests: Silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2234abf..63582e8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2122,14 +2122,14 @@ static void test_strstreambuf(void) ok(ssb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb1.base.allocated); ok(ssb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb1.base.unbuffered); ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); - ok(ssb1.base.ebuf == buffer + 0x7fffffff || ssb1.base.ebuf == (char*)-1, + ok(ssb1.base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.ebuf == (char*)-1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.ebuf); ok(ssb1.base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, ssb1.base.eback); ok(ssb1.base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, ssb1.base.gptr); ok(ssb1.base.egptr == buffer + 20, "wrong get end, expected %p got %p\n", buffer + 20, ssb1.base.egptr); ok(ssb1.base.pbase == buffer + 20, "wrong put base, expected %p got %p\n", buffer + 20, ssb1.base.pbase); ok(ssb1.base.pptr == buffer + 20, "wrong put pointer, expected %p got %p\n", buffer + 20, ssb1.base.pptr); - ok(ssb1.base.epptr == buffer + 0x7fffffff || ssb1.base.epptr == (char*)-1, + ok(ssb1.base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.epptr == (char*)-1, "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); @@ -4208,14 +4208,14 @@ static void test_ostrstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer + 4, "wrong put pointer, expected %p got %p\n", buffer + 4, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_ostrstream_dtor, &os1.base_ios); @@ -6858,14 +6858,14 @@ static void test_strstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer, "wrong put pointer, expected %p got %p\n", buffer, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_strstream_vbase_dtor, &ios1);

1 0

Nikolay Sivov : shell32: Don't trace output string buffer contents.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: 490ffe7f4081f7bac874997ba432835eea6e1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490ffe7f4081f7bac874997ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:55 2016 +0300 shell32: Don't trace output string buffer contents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index cf26caf..1674ad2 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + TRACE("(%p) (flags=%u, %p, %u, %p, %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); if (pwFlags)

1 0

Nikolay Sivov : shell32: Fix potential destination buffer overrun.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: f7cc41d7ae11e22163bd8b205bb30c43e2b6f7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cc41d7ae11e22163bd8b205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:56 2016 +0300 shell32: Fix potential destination buffer overrun. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 1674ad2..9307b08 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -323,7 +323,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN if (SUCCEEDED(hr)) { - hr = IShellLinkW_GetIconLocation(psl, szIconFile, MAX_PATH, piIndex); + hr = IShellLinkW_GetIconLocation(psl, szIconFile, cchMax, piIndex); if (SUCCEEDED(hr) && *szIconFile) found = TRUE;

1 0

Alexandre Julliard : msvcrt: Disable relay for the __libm_sse2 functions.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: cf51752d5f13ad24d9a4abea29d5aecba803adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf51752d5f13ad24d9a4abea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 17:11:09 2016 +0100 msvcrt: Disable relay for the __libm_sse2 functions. The relay code can use the SSE registers too. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 64 +++++++++++----------- dlls/msvcr100/msvcr100.spec | 42 +++++++------- dlls/msvcr110/msvcr110.spec | 64 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 64 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 64 +++++++++++----------- dlls/msvcr80/msvcr80.spec | 42 +++++++------- dlls/msvcr90/msvcr90.spec | 42 +++++++------- dlls/msvcrt/msvcrt.spec | 42 +++++++------- dlls/ucrtbase/ucrtbase.spec | 64 +++++++++++----------- 9 files changed, 244 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf51752d5f13ad24d9a4a…

1 0

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: c03ea1971b3a16291615cac25e169aeb78290c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ea1971b3a16291615cac25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

1 0

Nikolay Sivov : dwrite: Fully initialize shared factory vtable.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 6d0fa4cebce4b5711fdd291c7ef54f27e14abe6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0fa4cebce4b5711fdd291c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 02:09:27 2016 +0300 dwrite: Fully initialize shared factory vtable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9d5b1be..50a4c1c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1536,7 +1536,10 @@ static const struct IDWriteFactory4Vtbl shareddwritefactoryvtbl = { dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, dwritefactory3_GetSystemFontCollection, - dwritefactory3_GetFontDownloadQueue + dwritefactory3_GetFontDownloadQueue, + dwritefactory4_TranslateColorGlyphRun, + dwritefactory4_ComputeGlyphOrigins_, + dwritefactory4_ComputeGlyphOrigins }; static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type)

1 0

Nikolay Sivov : dwrite: Improve strikethrough and underline thickness extraction logic.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 6e356742e3a7758182b722b73dcf432573ebc4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e356742e3a7758182b722b73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 12:37:03 2016 +0300 dwrite: Improve strikethrough and underline thickness extraction logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++---------- dlls/dwrite/tests/font.c | 12 +++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c666275..c829813 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1243,17 +1243,10 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - /* use any of thickness values if another one is zero, if both are zero use estimate */ - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; /* estimate missing metrics */ if (metrics->xHeight == 0) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index eb47a05..ba9866a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1725,16 +1725,10 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; if (tt_os2) IDWriteFontFace_ReleaseFontTable(fontface, os2_context);

1 0

Hans Leidekker : shell32/tests: Accept another error from SHFileOperationA.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 748f7e26cbab9d91993d555d124bd193c4cafcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=748f7e26cbab9d91993d555d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:51 2016 +0100 shell32/tests: Accept another error from SHFileOperationA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 0e502fc..d74c59a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -817,6 +817,7 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ "Expected ERROR_CANCELLED or DE_DIFFDIR\n");

1 0

Hans Leidekker : shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: a2556760ec6995932e883e11fa93563b271a3951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2556760ec6995932e883e11f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:52 2016 +0100 shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d74c59a..4ae93ff 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -820,7 +820,7 @@ static void test_rename(void) retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %u\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ @@ -2517,6 +2517,11 @@ static void test_unicode(void) skip("Unicode tests skipped on non-unicode system\n"); return; } + if (GetLastError()==ERROR_ACCESS_DENIED) + { + skip("test needs admin rights\n"); + return; + } CloseHandle(file); /* Try to delete a file with unicode filename */ @@ -2575,6 +2580,7 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + DeleteFileW(UNICODE_PATH_TO); /* Check last error after a failed file operation. */ DeleteFileW(UNICODE_PATH);

1 0

Hugh McMaster : regedit/tests: Add tests for line concatenation when importing.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: e7d5503347de95441525bd8277d57b442b861584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5503347de95441525bd827… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 20 11:08:17 2016 +0000 regedit/tests: Add tests for line concatenation when importing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e09d188..445efb7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -427,6 +427,22 @@ static void test_comments(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0