December 2016 - Wine-Commits

Hans Leidekker : advpack/tests: Skip inf install tests if the user doesn' t have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: ea7c86a715a25b779bd536976a1f0a78cf5b2962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7c86a715a25b779bd536976… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:49 2016 +0100 advpack/tests: Skip inf install 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/advpack/tests/advpack.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index f7ac66b..d595876 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -337,7 +337,7 @@ static void translateinfstringex_test(void) } create_inf_file(); - + /* need to see if there are any flags */ /* try a NULL filename */ @@ -424,6 +424,12 @@ static void translateinfstringex_test(void) /* open the inf with the install section */ hr = pOpenINFEngine(inf_file, "section", 0, &hinf, NULL); + if (hr == E_FAIL) + { + skip("can't open engine with install section (needs admin rights)\n"); + DeleteFileA(inf_file); + return; + } ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* translate the string with the install section specified */

1 0

Andrew Eikum : mscoree: Leave the last backslash on application base path.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 0ea8893e1c3dd9097df083b57c0d7442c3fb4f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea8893e1c3dd9097df083b57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 16 14:50:30 2016 -0600 mscoree: Leave the last backslash on application base path. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 94eca7f..86eb759 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -170,7 +170,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf slash = strrchr(base_dirA, '\\'); if (slash) - *slash = 0; + *(slash + 1) = 0; TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); mono_domain_set_config(This->default_domain, base_dirA, config_pathA);

1 0

Alexandre Julliard : Wine release 1.8.6
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: website Branch: master Commit: 65d1cc2fa6eeece6c930c10cefa6497154f841c1 URL: http://source.winehq.org/git/website.git/?a=commit;h=65d1cc2fa6eeece6c930c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:10:48 2016 +0100 Wine release 1.8.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016121901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2016121901.xml b/news/en/2016121901.xml new file mode 100644 index 0000000..5cb91c8 --- /dev/null +++ b/news/en/2016121901.xml @@ -0,0 +1,14 @@ +<news> +<date>December 19, 2016</date> +<title>Wine 1.8.6 Released</title> +<body> + The Wine maintenance release 1.8.6 is now available. + <a href="{$root}/announce/1.8.6">What's new</a> in this release: +<ul> + <li>Fix a regression introduced in 1.8.5 (#41627)</li> + <li>Various bug fixes.</li> + <li>A few more cards added to the GPU description table.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.6.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Philipp Hoppermann : ws2_32: Implement InetNtopW.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d65fd8fdfaf5f5adca04244d7c6b437e2e70f7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65fd8fdfaf5f5adca04244d7… Author: Philipp Hoppermann <plata(a)mailbox.org> Date: Sat Jul 23 01:21:23 2016 -0300 ws2_32: Implement InetNtopW. Signed-off-by: Philipp Hoppermann <plata(a)mailbox.org> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8397e3da735c87295d1ae71e3e1650be0c52d28c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 20 ++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 21 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6877063..7b63639 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7818,6 +7818,26 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) } /*********************************************************************** + * InetNtopW (WS2_32.@) + */ +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T len) +{ + char bufferA[WS_INET6_ADDRSTRLEN]; + PWSTR ret = NULL; + + TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); + + if (WS_inet_ntop(family, addr, bufferA, sizeof(bufferA))) + { + if (MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, len)) + ret = buffer; + else + SetLastError(ERROR_INVALID_PARAMETER); + } + return ret; +} + +/*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ INT WINAPI WSAStringToAddressA(LPSTR AddressString, diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 6de888f..24fb198 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -54,6 +54,7 @@ @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) +@ stdcall InetNtopW(long ptr ptr long) @ stdcall InetPtonW(long wstr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)

1 0

Tag wine-1.8.6 : Alexandre Julliard : Release 1.8.6
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: refs/tags/wine-1.8.6 Tag: 909cacdbcdaa0c535e746145dd68eba83608fd87 URL: http://source.winehq.org/git/wine.git/?a=tag;h=909cacdbcdaa0c535e746145dd68… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:08:23 2016 +0100 Release 1.8.6

1 0

Michael Stefaniuc : Release 1.8.6.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7b38d4f9efd899a68d754b83b1b396929549a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b38d4f9efd899a68d754b83b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 30 01:32:54 2016 +0100 Release 1.8.6. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 320 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 157 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b38d4f9efd899a68d754…

1 0

Alex Henrie : ntdll: Skip synchronous read if a serial read interval timeout is set.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 64ddc0bff03bb676a43163891aad9f61b955875d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ddc0bff03bb676a43163891… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 26 23:34:26 2016 -0600 ntdll: Skip synchronous read if a serial read interval timeout is set. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84fcaafb895f08b3513486f7b687882a2ffca1f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ede0ec1..646e3f0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -912,6 +912,20 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } } + if (type == FD_TYPE_SERIAL && async_read && length) + { + /* an asynchronous serial port read with a read interval timeout needs to + skip the synchronous read to make sure that the server starts the read + interval timer after the first read */ + if ((status = get_io_timeouts( hFile, type, length, TRUE, &timeouts ))) goto err; + if (timeouts.interval) + { + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, FALSE ); + goto err; + } + } + for (;;) { if ((result = read( unix_handle, (char *)buffer + total, length - total )) >= 0)

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 760 Ti to the GPU list.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 4475304ae8216a28819bc9fb69554c8f4917e09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4475304ae8216a28819bc9fb6… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Sat Sep 24 02:58:50 2016 +0200 wined3d: Add NVIDIA GTX 760 Ti to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c76c7d85d0be45edf72e63ae7eae51c018383070) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 67e4b17..63d54fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1282,7 +1282,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA GeForce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760TI, "NVIDIA GeForce GTX 760 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1811,6 +1812,7 @@ cards_nvidia_binary[] = {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ + {"GTX 760 Ti", CARD_NVIDIA_GEFORCE_GTX760TI}, /* Geforce 700 - midend high */ {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ @@ -2190,7 +2192,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX / 760TI */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fa66129..a8b2aff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1628,6 +1628,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187, + CARD_NVIDIA_GEFORCE_GTX760TI = 0x1193, CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,

1 0

Andrew Kanaber : wined3d: Add id for Broadwell Xeon E3 GPU.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d3e5805559bef564bce38c6593288251d7e666e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e5805559bef564bce38c659… Author: Andrew Kanaber <akanaber(a)chiark.greenend.org.uk> Date: Tue Sep 20 22:23:34 2016 +0100 wined3d: Add id for Broadwell Xeon E3 GPU. Signed-off-by: Andrew Kanaber <akanaber(a)chiark.greenend.org.uk> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6816313387e89c915729783f612a8170becece61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e090694..de5fe10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1398,6 +1398,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, @@ -2016,6 +2017,7 @@ cards_intel[] = {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, {"Skylake", CARD_INTEL_HD520}, /* Broadwell */ + {"Iris Pro P6300", CARD_INTEL_IPP6300}, {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4725726..d8f6773 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1695,6 +1695,7 @@ enum wined3d_pci_device CARD_INTEL_HWM = 0x0416, CARD_INTEL_IG6100 = 0x162b, CARD_INTEL_IP6200 = 0x1622, + CARD_INTEL_IPP6300 = 0x162a, CARD_INTEL_HD520 = 0x1916, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b,

1 0

Piotr Caban : msvcr110: Add Concurrency::details:: _Condition_variable class stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: f60df433588f2315dfdf1375940f56ce825405d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60df433588f2315dfdf13759… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:06 2016 -0600 msvcr110: Add Concurrency::details::_Condition_variable class stub. Based on patch by Yifu Wang. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84bed7664c381637697f30f32f5b34787d9450da) Conflicts: dlls/concrt140/concrt140.spec Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 36 +++++++++++------------ dlls/msvcr120/msvcr120.spec | 36 +++++++++++------------ dlls/msvcr120_app/msvcr120_app.spec | 36 +++++++++++------------ dlls/msvcrt/lock.c | 58 +++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f60df433588f2315dfdf1…

1 0