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

Grazvydas Ignotas : wined3d: Add Polaris GPUs and their driver.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: e1b2c40be623a931154af5d65da05049e1b61db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b2c40be623a931154af5d65… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Mon Nov 14 00:10:00 2016 +0200 wined3d: Add Polaris GPUs and their driver. Signed-off-by: Grazvydas Ignotas <notasas(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 c63e3261f37e8116e59c70b9bed20aa90c39e8a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e02adb3..e090694 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -45,6 +45,7 @@ enum wined3d_display_driver DRIVER_AMD_R100, DRIVER_AMD_R300, DRIVER_AMD_R600, + DRIVER_AMD_RX, DRIVER_INTEL_GMA800, DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, @@ -1146,6 +1147,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 17, 10, 1474}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1350,7 +1352,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, @@ -2071,6 +2075,9 @@ cards_intel[] = * These are returned but not handled: RC410, RV380. */ cards_amd_mesa[] = { + /* Polaris 10/11 */ + {"POLARIS10", CARD_AMD_RADEON_RX_480}, + {"POLARIS11", CARD_AMD_RADEON_RX_460}, /* Sea Islands */ {"HAWAII", CARD_AMD_RADEON_R9 }, {"KAVERI", CARD_AMD_RADEON_R7 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e83cc6..4725726 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1536,6 +1536,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_RX_460 = 0x67ef, + CARD_AMD_RADEON_RX_480 = 0x67df, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a4e39fcbf253a36b546219fc8fe2a8731364c14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e39fcbf253a36b546219fc8… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 22 03:52:55 2016 -0200 msvfw32: Use case insensitive compare in ICInfo for fourcc codes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02fa1d4cc2f99909d62565e1760bc0158e36d700) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 5 ++--- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4f1a2bf..6650b8f 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); - /* exact match of fccHandler or nth driver found */ - if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) - return FALSE; + if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) + return FALSE; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..0b0c9dc 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -306,14 +306,12 @@ static void test_ICInfo(void) if (fcc[0] & 0x20) { fcc[0] &= ~0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); } else { fcc[0] |= 0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); }

1 0

Bruno Jesus : msvfw32/tests: Add tests for ICInfo().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 065f67360e592ab005e04e09ec0083e73eca15a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065f67360e592ab005e04e09e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:53 2016 -0200 msvfw32/tests: Add tests for ICInfo(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90e4ad3b144b44805e21b8549129c29e75b797e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 125cac5..507d003 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -285,9 +285,47 @@ static void test_ICSeqCompress(void) ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } +todo_wine + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); + test_ICInfo(); }

1 0

Alistair Leslie-Hughes : dpnet: Header files cleanup.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0b1c912060613b44782fe5d11941b646b59e3305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1c912060613b44782fe5d11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 15 06:59:13 2016 +0000 dpnet: Header files cleanup. Stops error of SOCKADDR being redefined on older compilers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cd33bf892f3a7599f37dba64b1046f22b95af6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/address.c | 1 - dlls/dpnet/client.c | 1 - dlls/dpnet/lobbiedapp.c | 2 -- dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - dlls/dpnet/threadpool.c | 1 - include/dpaddr.h | 2 ++ 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d87d4e7..e6b82fd 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -33,7 +33,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index bf2b8d2..765a1bc 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -31,7 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..c7b49b9 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -31,8 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" -#include "dplobby8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index a07a59a..f0a6467 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 3e026fc..65128b4 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -32,7 +32,6 @@ #include "ocidl.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" typedef struct IDirectPlay8ServerImpl diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 274789d..9e13ffb 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/include/dpaddr.h b/include/dpaddr.h index 576caaf..d47dd26 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -27,7 +27,9 @@ extern "C" { #endif /* defined(__cplusplus) */ typedef REFIID DPNAREFIID; +#ifndef _WINSOCK2API_ typedef struct sockaddr SOCKADDR; +#endif /***************************************************************************** * DirectPlay8Addr defines

1 0

Bruno Jesus : comdlg32: Avoid crash when a path is passed into Open File Dialog.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 673bafaa7ad5c7c9f8b380739fb3601085a2a044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673bafaa7ad5c7c9f8b380739… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 27 06:53:27 2016 +0000 comdlg32: Avoid crash when a path is passed into Open File Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58091188929f9786b408912c991420f54f489f6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1453396..1b9ad43 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1564,10 +1564,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit); if (result) { - /* nameBit is always shorter than the original filename */ - lstrcpyW(fodInfos->filename,nameBit); + /* nameBit is always shorter than the original filename. It may be NULL + * when the filename contains only a drive name instead of file name */ + if (nameBit) + { + lstrcpyW(fodInfos->filename,nameBit); + *nameBit = 0x00; + } + else + *fodInfos->filename = '\0'; - *nameBit = 0x00; MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf);

1 0

Huw Davies : fonts: Fix typo in glyph name.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a5d271f355ff1a0bbc7872cd58cd65de02745508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d271f355ff1a0bbc7872cd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 19 10:38:27 2016 +0100 fonts: Fix typo in glyph name. Reported by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6e0a4a8924c1c0b69124a21075713ae051a41064) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- fonts/wingding.sfd | 2 +- fonts/wingding.ttf | Bin 6720 -> 6720 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 55723b4..c46152b 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -333,7 +333,7 @@ SplineSet EndSplineSet EndChar -StartChar: sqaure2 +StartChar: square2 Encoding: 160 160 14 Width: 641 Flags: W diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index b1e9d58..36539ce 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 980 Ti.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 8cfcd610c1ca2f0ffd7f911735989f8ccf80f28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfcd610c1ca2f0ffd7f91173… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Wed Sep 28 03:17:08 2016 +0200 wined3d: Add NVIDIA GTX 980 Ti. 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 af37b187ad86191110b80bef814d25ce3ac350db) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 246a750..47e8b41 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1306,6 +1306,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1784,6 +1785,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ @@ -2178,6 +2180,7 @@ cards_nvidia_mesa[] = { /* Maxwell */ {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, + {"NV120", CARD_NVIDIA_GEFORCE_GTX980TI}, {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 62d670a..ac82509 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1651,6 +1651,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, + CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Matteo Bruni : wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: cf80566c45e4a5cd38d1356bc8b01d91df43f9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf80566c45e4a5cd38d1356bc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:35 2016 +0200 wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 339321dd2073fea7383378a7cf3212140013a2c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++---- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de5fe10..246a750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1396,14 +1396,30 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {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_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD6000, "Intel(R) HD Graphics 6000", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I6100, "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_HD510_1, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_2, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_3, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD515, "Intel(R) HD Graphics 515", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_1, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_2, "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}, - {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP580, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HDP530, "Intel(R) HD Graphics P530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I550, "Intel(R) Iris(TM) Graphics 550", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I555, "Intel(R) Iris(TM) Graphics 555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP555, "Intel(R) Iris(TM) Graphics P555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_1, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -2014,13 +2030,13 @@ cards_amd_binary[] = cards_intel[] = { /* Skylake */ - {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, - {"Skylake", CARD_INTEL_HD520}, + {"Iris Pro Graphics P580", CARD_INTEL_IPP580_1}, + {"Skylake", CARD_INTEL_HD520_1}, /* 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 */ + {"Iris 6100", CARD_INTEL_I6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8f6773..62d670a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1693,14 +1693,30 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, - CARD_INTEL_IG6100 = 0x162b, + CARD_INTEL_HD5300 = 0x161e, + CARD_INTEL_HD5500 = 0x1616, + CARD_INTEL_HD5600 = 0x1612, + CARD_INTEL_HD6000 = 0x1626, + CARD_INTEL_I6100 = 0x162b, CARD_INTEL_IP6200 = 0x1622, CARD_INTEL_IPP6300 = 0x162a, - CARD_INTEL_HD520 = 0x1916, + CARD_INTEL_HD510_1 = 0x1902, + CARD_INTEL_HD510_2 = 0x1906, + CARD_INTEL_HD510_3 = 0x190b, + CARD_INTEL_HD515 = 0x191e, + CARD_INTEL_HD520_1 = 0x1916, + CARD_INTEL_HD520_2 = 0x1921, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b, - CARD_INTEL_HD540 = 0x1926, - CARD_INTEL_IPP580 = 0x193d, + CARD_INTEL_HDP530 = 0x191d, + CARD_INTEL_I540 = 0x1926, + CARD_INTEL_I550 = 0x1927, + CARD_INTEL_I555 = 0x192b, + CARD_INTEL_IP555 = 0x192d, + CARD_INTEL_IP580_1 = 0x1932, + CARD_INTEL_IP580_2 = 0x193b, + CARD_INTEL_IPP580_1 = 0x193a, + CARD_INTEL_IPP580_2 = 0x193d, }; struct wined3d_fbo_ops

1 0

Piotr Caban : msvcr120: Add _Condition_variable implementation.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: bfdee0193921f9f5432597fc9cb0ddf75b734e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdee0193921f9f5432597fc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:13 2016 -0600 msvcr120: Add _Condition_variable implementation. 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 5e981f8512ec08d0cd044e3241c969b209da5aa0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/lock.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 3a356a6..0786c77 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -558,8 +558,14 @@ unsigned int __cdecl _GetConcurrency(void) #endif #if _MSVCR_VER >= 110 +typedef struct cv_queue { + struct cv_queue *next; + BOOL expired; +} cv_queue; + typedef struct { - void *chain; + /* cv_queue structure is not binary compatible */ + cv_queue *queue; critical_section lock; } _Condition_variable; @@ -568,8 +574,11 @@ typedef struct { DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4) _Condition_variable* __thiscall _Condition_variable_ctor(_Condition_variable *this) { - FIXME("(%p)\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->queue = NULL; + critical_section_ctor(&this->lock); + return this; } /* ??1_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ @@ -577,7 +586,16 @@ _Condition_variable* __thiscall _Condition_variable_ctor(_Condition_variable *th DEFINE_THISCALL_WRAPPER(_Condition_variable_dtor, 4) void __thiscall _Condition_variable_dtor(_Condition_variable *this) { - FIXME("(%p)\n", this); + TRACE("(%p)\n", this); + + while(this->queue) { + cv_queue *next = this->queue->next; + if(!this->queue->expired) + ERR("there's an active wait\n"); + HeapFree(GetProcessHeap(), 0, this->queue); + this->queue = next; + } + critical_section_dtor(&this->lock); } /* ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z */ @@ -585,7 +603,19 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this) DEFINE_THISCALL_WRAPPER(_Condition_variable_wait, 8) void __thiscall _Condition_variable_wait(_Condition_variable *this, critical_section *cs) { - FIXME("(%p, %p)\n", this, cs); + cv_queue q; + + TRACE("(%p, %p)\n", this, cs); + + critical_section_lock(&this->lock); + q.next = this->queue; + q.expired = FALSE; + this->queue = &q; + critical_section_unlock(&this->lock); + + critical_section_unlock(cs); + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + critical_section_lock(cs); } /* ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z */ @@ -594,8 +624,41 @@ DEFINE_THISCALL_WRAPPER(_Condition_variable_wait_for, 12) MSVCRT_bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, critical_section *cs, unsigned int timeout) { - FIXME("(%p %p %d)\n", this, cs, timeout); - return FALSE; + LARGE_INTEGER to; + NTSTATUS status; + FILETIME ft; + cv_queue *q; + + TRACE("(%p %p %d)\n", this, cs, timeout); + + if(!(q = HeapAlloc(GetProcessHeap(), 0, sizeof(cv_queue)))) { + throw_bad_alloc("bad allocation"); + } + + critical_section_lock(&this->lock); + q->next = this->queue; + q->expired = FALSE; + this->queue = q; + critical_section_unlock(&this->lock); + + critical_section_unlock(cs); + + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * 10000; + status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->expired, TRUE)) { + critical_section_lock(cs); + return FALSE; + } + else + NtWaitForKeyedEvent(keyed_event, q, 0, 0); + } + + HeapFree(GetProcessHeap(), 0, q); + critical_section_lock(cs); + return TRUE; } /* ?notify_one(a)_Condition_variable@details(a)Concurrency@@QAEXXZ */ @@ -603,7 +666,30 @@ MSVCRT_bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, DEFINE_THISCALL_WRAPPER(_Condition_variable_notify_one, 4) void __thiscall _Condition_variable_notify_one(_Condition_variable *this) { - FIXME("(%p)\n", this); + cv_queue *node; + + TRACE("(%p)\n", this); + + if(!this->queue) + return; + + while(1) { + critical_section_lock(&this->lock); + node = this->queue; + if(!node) { + critical_section_unlock(&this->lock); + return; + } + this->queue = node->next; + critical_section_unlock(&this->lock); + + if(!InterlockedExchange(&node->expired, TRUE)) { + NtReleaseKeyedEvent(keyed_event, node, 0, NULL); + return; + } else { + HeapFree(GetProcessHeap(), 0, node); + } + } } /* ?notify_all(a)_Condition_variable@details(a)Concurrency@@QAEXXZ */ @@ -611,7 +697,27 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this) DEFINE_THISCALL_WRAPPER(_Condition_variable_notify_all, 4) void __thiscall _Condition_variable_notify_all(_Condition_variable *this) { - FIXME("(%p)\n", this); + cv_queue *ptr; + + TRACE("(%p)\n", this); + + if(!this->queue) + return; + + critical_section_lock(&this->lock); + ptr = this->queue; + this->queue = NULL; + critical_section_unlock(&this->lock); + + while(ptr) { + cv_queue *next = ptr->next; + + if(!InterlockedExchange(&ptr->expired, TRUE)) + NtReleaseKeyedEvent(keyed_event, ptr, 0, NULL); + else + HeapFree(GetProcessHeap(), 0, ptr); + ptr = next; + } } #endif

1 0

Józef Kucia : wined3d: Improve advertized driver version for Windows 10.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a7d16673478f6fa385f4cb689140e5807643975d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d16673478f6fa385f4cb689… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:25 2016 +0100 wined3d: Improve advertized driver version for Windows 10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4315caeff699325cd681b9beb7d22908b098411b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 364082d..e02adb3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1145,7 +1145,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1521,6 +1521,11 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } break; + case 10: + driver_os_version = 10; + driver_model = DRIVER_MODEL_NT6X; + break; + default: FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0

Piotr Caban : msvcrt: Support fdiv m64fp in i386 _fpieee_flt.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 4690483f6bb74a98cb2d5909a29da462ace7abbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4690483f6bb74a98cb2d5909a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:58:00 2016 +0200 msvcrt: Support fdiv m64fp in i386 _fpieee_flt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6ffb1d2cf4b86290e61e1c44c8e3c9179c4172d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/except_i386.c | 70 +++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 2103c1a..79d5a76 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1137,8 +1137,74 @@ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep, int (__cdecl *handler)(_FPIEEE_RECORD*)) { - FIXME("(%x %p %p) opcode: %x\n", exception_code, ep, handler, - *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + FLOATING_SAVE_AREA *ctx = &ep->ContextRecord->FloatSave; + _FPIEEE_RECORD rec; + int ret; + + TRACE("(%x %p %p)\n", exception_code, ep, handler); + + switch(exception_code) { + case STATUS_FLOAT_DIVIDE_BY_ZERO: + case STATUS_FLOAT_INEXACT_RESULT: + case STATUS_FLOAT_INVALID_OPERATION: + case STATUS_FLOAT_OVERFLOW: + case STATUS_FLOAT_UNDERFLOW: + break; + default: + return EXCEPTION_CONTINUE_SEARCH; + } + + memset(&rec, 0, sizeof(rec)); + rec.RoundingMode = ctx->ControlWord >> 10; + switch((ctx->ControlWord >> 8) & 0x3) { + case 0: rec.Precision = 2; break; + case 1: rec.Precision = 3; break; + case 2: rec.Precision = 1; break; + case 3: rec.Precision = 0; break; + } + rec.Status.InvalidOperation = ctx->StatusWord & 0x1; + rec.Status.ZeroDivide = ((ctx->StatusWord & 0x4) != 0); + rec.Status.Overflow = ((ctx->StatusWord & 0x8) != 0); + rec.Status.Underflow = ((ctx->StatusWord & 0x10) != 0); + rec.Status.Inexact = ((ctx->StatusWord & 0x20) != 0); + rec.Enable.InvalidOperation = ((ctx->ControlWord & 0x1) == 0); + rec.Enable.ZeroDivide = ((ctx->ControlWord & 0x4) == 0); + rec.Enable.Overflow = ((ctx->ControlWord & 0x8) == 0); + rec.Enable.Underflow = ((ctx->ControlWord & 0x10) == 0); + rec.Enable.Inexact = ((ctx->ControlWord & 0x20) == 0); + rec.Cause.InvalidOperation = rec.Enable.InvalidOperation & rec.Status.InvalidOperation; + rec.Cause.ZeroDivide = rec.Enable.ZeroDivide & rec.Status.ZeroDivide; + rec.Cause.Overflow = rec.Enable.Overflow & rec.Status.Overflow; + rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; + rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; + + TRACE("opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + + if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ + if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { + rec.Operand1.OperandValid = 1; + rec.Result.OperandValid = 0; + } else { + rec.Operand1.OperandValid = 0; + rec.Result.OperandValid = 1; + } + rec.Operand2.OperandValid = 1; + rec.Operation = _FpCodeDivide; + rec.Operand1.Format = _FpFormatFp80; + memcpy(&rec.Operand1.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + rec.Operand2.Format = _FpFormatFp64; + rec.Operand2.Value.Fp64Value = *(double*)ctx->DataOffset; + rec.Result.Format = _FpFormatFp80; + memcpy(&rec.Result.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + + ret = handler(&rec); + + if(ret == EXCEPTION_CONTINUE_EXECUTION) + memcpy(ctx->RegisterArea, &rec.Result.Value.Fp80Value, sizeof(rec.Operand1.Value.Fp80Value)); + return ret; + } + + FIXME("unsupported opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3ddd835..8dc2929 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1148,6 +1148,113 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_MASK (0x0007) typedef enum { + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, +} _FP_OPERATION_CODE; + +typedef enum { _FpFormatFp32, _FpFormatFp64, _FpFormatFp80,

1 0

Piotr Caban : msvcrt: Add _fpieee_flt stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 63d80c3108322bb8795c5f5189c78d119e1bf490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d80c3108322bb8795c5f518… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:55 2016 +0200 msvcrt: Add _fpieee_flt stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc0e3d0a9c3ffa085d1cbcc53940d1876005af1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except_arm.c | 10 +++ dlls/msvcrt/except_i386.c | 11 +++ dlls/msvcrt/except_x86_64.c | 11 +++ dlls/msvcrt/msvcrt.h | 90 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 19 files changed, 137 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d80c3108322bb8795c5…

1 0

Andrew Eikum : mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 6fbcd1db4a9e1d787bc1a978ad870d5af14f9f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbcd1db4a9e1d787bc1a978a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:22 2016 -0600 mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89de040e4f2567df48af1cfcad33c34e2a54d9cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- dlls/mmdevapi/devenum.c | 5 +++-- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 24 ++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 7dddbdf..a49d2e9 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -233,10 +233,15 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); + if (!mindb || !maxdb || !inc) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) @@ -273,17 +278,17 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + *ppv = &This->IAudioEndpointVolumeEx_iface; return S_OK; } diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1d838e3..f21019c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -596,8 +596,9 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2b40a05..b85c757 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -74,6 +74,6 @@ typedef struct MMDevice { } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 12e2156..4f8c848 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" +#include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 298c886..1476adc 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -39,6 +39,7 @@ #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -2242,6 +2243,28 @@ static void test_marshal(void) } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2306,7 @@ START_TEST(render) test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

Piotr Caban : ucrtbase: Add __intrinsic_setjmp implementation.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 138fec0b534b39fa8e4983573be99605a34e0ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138fec0b534b39fa8e4983573… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 15:31:01 2016 -0600 ucrtbase: Add __intrinsic_setjmp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8683fc8c42095f23e26a76b978e1180b60e1048) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b77b73e..e71bd78 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aa4e7e0..8571295 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -93,7 +93,7 @@ @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index feb94ac..6c147ce 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -32,7 +32,7 @@ @ stub __TypeMatch @ stub __current_exception @ stub __current_exception_context -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure

1 0

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

Dec. 19, 2016

Module: wine Branch: stable Commit: c5c20fa6b0415877f5c8c344bee6e625d1fc2dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c20fa6b0415877f5c8c344b… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Sat Sep 24 00:00:18 2016 +0200 wined3d: Add NVIDIA GTX 675MX 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 b8273a1118fec45237d76d3e357ecb215c09d8c1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 47e8b41..67e4b17 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1273,6 +1273,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1819,6 +1820,7 @@ cards_nvidia_binary[] = {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ + {"GTX 675MX", CARD_NVIDIA_GEFORCE_GTX675MX}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ @@ -2188,7 +2190,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 */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ /* 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 ac82509..fa66129 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1618,6 +1618,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, + CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287,

1 0

Carlos Rafael Ramirez : cmd: When 'if' condition is not met, ignore the next commands in the list.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 488f314e918f5f44ee6a9f03bd39e69de5ba0b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488f314e918f5f44ee6a9f03b… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Mon Oct 31 18:57:33 2016 -0500 cmd: When 'if' condition is not met, ignore the next commands in the list. Signed-off-by: Carlos Rafael Ramirez <crramirez(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55be713d76bef86ba7577c810a9dbdfb071fc179) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 3 +++ programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++++++ 3 files changed, 27 insertions(+) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a444330..cfa1642 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1574,6 +1574,9 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + } else if (!processThese) { + if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + WINE_TRACE("Ignore the next command as well (next = %p)\n", *cmdList); } else { WINE_TRACE("Found end of this IF statement (next = %p)\n", *cmdList); break; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cf2559a..975a84b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -836,6 +836,17 @@ if 1 GEQ "10" (echo 1 GEQ "10") else echo foo if "1" GEQ "10" (echo 1 GEQ "10") else echo foo if '1' GEQ "10" (echo '1' GEQ "10") else echo foo if "10" GEQ "10" (echo "10" GEQ "10") +echo --- unconditional ampersand after if one line +if "0"=="0" echo 1 & echo 2 & echo 3 else echo 4 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 +echo --- +echo x & if "0"=="1" (echo 1 & echo 2 & echo 3) +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 else echo 4 +echo --- goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7543b53..d70aad3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -645,6 +645,19 @@ foo foo '1' GEQ "10" "10" GEQ "10" +--- unconditional ampersand after if one line +1(a)space@ +2(a)space@ +3 else echo 4 +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- ------------ Testing for ------------ --- plain FOR A

1 0

Bernhard Übelacker : ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7a09ac7f94fb7fbb07fa6359cd406daa48d38d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a09ac7f94fb7fbb07fa6359c… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Mar 29 22:13:16 2016 +0200 ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64aec5d8dbae329958b9b677d3289de78142e289) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 904d66a..1a5fe11 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { SIZE_T size; PIRP irp; + CCHAR loc_count = stack_size; TRACE( "%d, %d\n", stack_size, charge_quota ); - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + if (loc_count < 8 && loc_count != 1) + loc_count = 8; + + size = sizeof(IRP) + loc_count * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); if (irp == NULL) return NULL; IoInitializeIrp( irp, size, stack_size ); - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (stack_size >= 1 && stack_size <= 8) + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; return irp;

1 0

Alistair Leslie-Hughes : comdlg32/tests: Test when a directory is passed to OpenFileName Dialog.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 5226773d53dbbdff8c51946fae0bdc234490d0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5226773d53dbbdff8c51946fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 27 06:53:39 2016 +0000 comdlg32/tests: Test when a directory is passed to OpenFileName Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3126d9ca4c29737af1526ea8aae92a2dadf62665) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0a4c509..e14aa2f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1243,6 +1243,46 @@ static void test_null_filename(void) ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); } +static void test_directory_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + char szInitialDir[MAX_PATH] = {0}; + WCHAR szInitialDirW[MAX_PATH] = {0}; + DWORD ret; + + GetWindowsDirectoryA(szInitialDir, MAX_PATH); + GetWindowsDirectoryW(szInitialDirW, MAX_PATH); + + szInitialDir[strlen(szInitialDir)] = '\\'; + szInitialDirW[lstrlenW(szInitialDirW)] = '\\'; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = szInitialDir; + ofnA.nMaxFile = MAX_PATH; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = szInitialDirW; + ofnW.nMaxFile = MAX_PATH; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1256,4 +1296,5 @@ START_TEST(filedlg) if( resizesupported) test_resizable2(); test_extension(); test_null_filename(); + test_directory_filename(); }

1 0

Alexandre Julliard : ntdll: Add a helper function for registering a file read async I/O.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: dfc3ae752839daa9a3d05b1a0faf19cd3006f629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc3ae752839daa9a3d05b1a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 15:31:00 2016 +0900 ntdll: Add a helper function for registering a file read async I/O. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a8ebc828e763284fdda027dcdf135cc01a58dff) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/file.c | 66 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 668ebbf..ede0ec1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -782,6 +782,42 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL return status; } +/* register an async I/O for a file read; helper for NtReadFile */ +static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *iosb, void *buffer, + ULONG already, ULONG length, BOOL avail_mode ) +{ + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + struct async_fileio_read *fileio; + NTSTATUS status; + + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), handle, apc, apc_user ))) + return STATUS_NO_MEMORY; + + fileio->already = already; + fileio->count = length; + fileio->buffer = buffer; + fileio->avail_mode = avail_mode; + + SERVER_START_REQ( register_async ) + { + req->type = ASYNC_TYPE_READ; + req->count = length; + req->async.handle = wine_server_obj_handle( handle ); + req->async.event = wine_server_obj_handle( event ); + req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); + req->async.iosb = wine_server_client_ptr( iosb ); + req->async.arg = wine_server_client_ptr( fileio ); + req->async.cvalue = cvalue; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + return status; +} + /****************************************************************************** * NtReadFile [NTDLL.@] @@ -918,7 +954,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -928,33 +963,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = STATUS_SUCCESS; goto done; } - - fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); - if (!fileio) - { - status = STATUS_NO_MEMORY; - goto err; - } - fileio->already = total; - fileio->count = length; - fileio->buffer = buffer; - fileio->avail_mode = avail_mode; - - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->count = length; - req->async.handle = wine_server_obj_handle( hFile ); - req->async.event = wine_server_obj_handle( hEvent ); - req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); - req->async.iosb = wine_server_client_ptr( io_status ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.cvalue = cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; - - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, avail_mode ); goto err; } else /* synchronous read, wait for the fd to become ready */

1 0

Jacek Caban : secur32: Use %LATEST_RECORD_VERSION gnutls priority.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: c02915d0dde1094106783db93c84020a582d40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02915d0dde1094106783db93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 12:42:05 2016 +0200 secur32: Use %LATEST_RECORD_VERSION gnutls priority. It's based on [1], where it's reported to fix issues with older gnutls. I tested what client hello packages Windows reports for different sets of used protocol versions, and it always uses newest possible version. There may be a concern about not using SSL3 client hello, which still may negotiate newer protocol and was recommended for compatibility reasons, but it's known to be problematic the other way those days and recent gnutls won't use it by default anyway [2]. [1] http://us.battle.net/wow/en/forum/topic/20742995286?page=11 [2] https://gitlab.com/gnutls/gnutls/commit/25ed2750438178ff65d555a49212dc7b5a3… Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f198b5a45a52aa0bcf79f1909c8f6dc4e56c4143) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4f95e4d..bcadd47 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -159,7 +159,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[64] = "NORMAL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);

1 0

Bruno Jesus : xinput1_3: Prefer builtin DLL.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: ecba1f4c5fcef8f0bf854064af63398462f32eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba1f4c5fcef8f0bf854064a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 29 23:13:25 2016 -0200 xinput1_3: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b09e848b8867683007f4c90ac589b43dfdc5707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 63f725b..d5d6147 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break;

1 0

Andrey Gusev : user32: Add support for WS_EX_RIGHT style.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7a483350069fef3c6e7125f446bebed9db3cfd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a483350069fef3c6e7125f44… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 20 16:53:00 2016 +0300 user32: Add support for WS_EX_RIGHT style. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 535f1de80db22e5ba76af5cb69ae61524224eb31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 13fc746..0968f10 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -859,6 +859,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) HFONT hFont; LONG state = get_button_state( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); HWND parent; HRGN hrgn; @@ -882,7 +883,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) (WPARAM)hDC, (LPARAM)hwnd ); hrgn = set_control_clipping( hDC, &client ); - if (style & BS_LEFTTEXT) + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { /* magic +4 is what CTL3D expects */

1 0

Austin English : api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 14a7ea3b199ee83803ff1322b06b2ba3cc371919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a7ea3b199ee83803ff1322b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 01:09:25 2016 -0500 api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80aee498f0082f5b346f30c4628348306b5cd7eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 69136d5..d2966f5 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,4 +1,15 @@ +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 1eb046bc37a24584f69acf3f31cd1c4de0287d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb046bc37a24584f69acf3f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc645ca71a7e2575e9808d54b78a97f84f9ffe66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 6cb08fe..2d0c6c0 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -73,6 +73,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -235,6 +236,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -248,7 +252,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1413,7 +1417,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1577,6 +1581,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1587,6 +1593,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Huw Davies : gdi32: Check that ExtFloodFill()' s initial co-ordinates lie within the dib.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 8eef454103e27ac38fbe75653c3e48690df6697d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef454103e27ac38fbe75653… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 29 09:57:47 2016 +0100 gdi32: Check that ExtFloodFill()'s initial co-ordinates lie within the dib. It might seem more natural to move this check inside is_interior(), but this would slow down the unclipped case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 04f8ecd95691b2536cac76663f9864f7caf450fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 +++ dlls/gdi32/tests/dib.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 2c865c0..e2d58e8 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -982,6 +982,9 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || + y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; + if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d12c752..7d8d51b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2779,6 +2779,9 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + ret = ExtFloodFill( hdc, -1, -1, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE ); + ok (!ret, "got ret %d\n", ret); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(solid_brush);

1 0

Sebastian Lackner : server: Allow to create win32 prefix when directory already exists.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d56dbbb39ebe3f9795b07e57683cc2cd1662afae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56dbbb39ebe3f9795b07e576… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 21 15:24:38 2016 +0200 server: Allow to create win32 prefix when directory already exists. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 808619b72d1524df2c576ed5faac67dd2093c0f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/server.c | 11 ----------- server/registry.c | 8 +++++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 356d631..25c6473 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1139,17 +1139,6 @@ static void setup_config_dir(void) mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); - if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" )) - { - /* force creation of a 32-bit prefix */ - int fd = open( "system.reg", O_WRONLY | O_CREAT | O_EXCL, 0666 ); - if (fd != -1) - { - static const char regfile[] = "WINE REGISTRY Version 2\n\n#arch=win32\n"; - write( fd, regfile, sizeof(regfile) - 1 ); - close( fd ); - } - } MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } diff --git a/server/registry.c b/server/registry.c index a3c1390..65126c3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1791,6 +1791,7 @@ void init_registry(void) WCHAR *current_user_path; struct unicode_str current_user_str; struct key *key, *hklm, *hkcu; + char *p; /* switch to the config dir */ @@ -1807,7 +1808,12 @@ void init_registry(void) fatal_error( "could not create Machine registry key\n" ); if (!load_init_registry_from_file( "system.reg", hklm )) - prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + { + if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" )) + prefix_type = PREFIX_32BIT; + else + prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + } else if (prefix_type == PREFIX_UNKNOWN) prefix_type = PREFIX_32BIT;

1 0

Huw Davies : ucrtbase: Add __stdio_common_vswscanf().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7c93deb22d874587f3b3c244284da43c8acc20a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c93deb22d874587f3b3c2442… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 12:58:31 2016 +0100 ucrtbase: Add __stdio_common_vswscanf(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f22769f81a2384219c6cb0f6b9f6daf4ac3c8857) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 22 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 448311d..6e066dc 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -18,7 +18,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s @ cdecl _close(long) ucrtbase._close diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 2ebb515..a1575db 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -66,7 +66,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" -/* vfscanf_l */ +/* vfscanf_s_l */ #define SECURE 1 #include "scanf.h" @@ -683,6 +683,26 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, + const MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vfwscanf (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 25dfb2f..aa4e7e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -163,7 +163,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr()

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwscanf.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0d8882ada83bf55fbffaa17f37f9e0fb7dfc3196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8882ada83bf55fbffaa17f3… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 14:02:16 2016 -0700 ucrtbase: Add __stdio_common_vfwscanf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48340bd1fea772d0c3539edc693135ce800d4aaa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 10a2ab7..448311d 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -8,7 +8,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index a19d450..2ebb515 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -683,6 +683,23 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vfwscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, + MSVCRT_FILE *file, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options & ~UCRTBASE_SCANF_SECURECRT) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vfwscanf_s_l(file, format, locale, valist); + else + return MSVCRT_vfwscanf_l(file, format, locale, valist); +} + +/********************************************************************* * _snwscanf (MSVCRT.@) */ int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index fde39e8..25dfb2f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -153,7 +153,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf

1 0

Austin English : wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 6d360b0f39270c5ec3c46aff810036ba74bd32a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d360b0f39270c5ec3c46aff8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 27 12:05:59 2016 -0500 wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2150301b30c13c425866b69fec1aa85a64a35eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 16f7c87..dc55f52 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -664,6 +664,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 +HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0

André Hentschel : loader/wine.inf: Open pdf files using winebrowser.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 83e485755c3f0de86790c5b8fbc682ab0b9fda81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e485755c3f0de86790c5b8f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 22:56:31 2016 +0200 loader/wine.inf: Open pdf files using winebrowser. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e997a75d3cae811e0f90c760c1d5f0616ba3558) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2039798..16f7c87 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -173,6 +173,7 @@ HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" +HKCR,.pdf,,2,"pdffile" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,*\shellex\ContextMenuHandlers,,16 @@ -217,6 +218,12 @@ HKCR,Msi.Package\shell\Uninstall\command,,2,"%11%\msiexec.exe /x ""%1""" HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" +HKCR,pdffile,,2,"PDF Document" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" +HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"

1 0

Matteo Bruni : wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: e8caceda7059474499420ef940928ed2abf4e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8caceda7059474499420ef94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:34 2016 +0200 wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdc3df38ed1129d6b0dd6a55446322cf64acc138) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fe1cdb..364082d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2009,8 +2009,10 @@ cards_intel[] = /* Broadwell */ {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, + {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM},

1 0

Jacek Caban : vbscript: Call GetItemInfo() with original item name.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a1f860a4d80d34f65deb2376cb56ff47096df2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f860a4d80d34f65deb2376c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 14:08:17 2016 +0100 vbscript: Call GetItemInfo() with original item name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c46dbfb131958849ac5fa5eab5703ad404cd0c6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bc34860..02180d9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -183,7 +183,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!item->disp) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); continue; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d8c5467..0209106 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2126,6 +2126,12 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_af(0, "TEST.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0

Austin English : ntoskrnl.exe: Add IoAttachDevice stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 921409f712c0b306fe6a4976ec55e94d75be0beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=921409f712c0b306fe6a4976e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 11 21:59:22 2016 -0500 ntoskrnl.exe: Add IoAttachDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e5fdf0e00c72bd9e6129823d6ee3c69a74378a8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6b0ea0c..871daa9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2426,3 +2426,12 @@ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertab FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * IoAttachDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) +{ + FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b32c5e8..b684595 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -315,7 +315,7 @@ @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources -@ stub IoAttachDevice +@ stdcall IoAttachDevice(ptr ptr ptr) @ stub IoAttachDeviceByPointer @ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe

1 0

Michael Müller : ntdll: Open current working directory with FILE_TRAVERSE access.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: fffa143180de3889cc670be59201be741f7c0775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffa143180de3889cc670be59… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 21 15:00:41 2016 +0200 ntdll: Open current working directory with FILE_TRAVERSE access. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6f2f307b1dcc8e4749eee05325961d77e3473fe1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/directory.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/path.c | 3 ++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 9baae47..316c2e2 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -24,6 +24,28 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" + +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); + +static void init(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); +} + +#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) +static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) +{ + OBJECT_BASIC_INFORMATION obj_info; + NTSTATUS status; + + status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, + sizeof(obj_info), NULL); + ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Granted access should " + "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); +} /* If you change something in these tests, please do the same * for GetSystemDirectory tests. @@ -417,6 +439,7 @@ static void test_CreateDirectoryW(void) static void test_RemoveDirectoryA(void) { + char curdir[MAX_PATH]; char tmpdir[MAX_PATH]; BOOL ret; @@ -425,6 +448,18 @@ static void test_RemoveDirectoryA(void) ret = CreateDirectoryA(tmpdir, NULL); ok(ret == TRUE, "CreateDirectoryA should always succeed\n"); + GetCurrentDirectoryA(MAX_PATH, curdir); + ok(SetCurrentDirectoryA(tmpdir), "SetCurrentDirectoryA failed\n"); + + SetLastError(0xdeadbeef); + ok(!RemoveDirectoryA(tmpdir), "RemoveDirectoryA succeeded\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + + TEST_GRANTED_ACCESS(NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle, + FILE_TRAVERSE | SYNCHRONIZE); + + SetCurrentDirectoryA(curdir); ret = RemoveDirectoryA(tmpdir); ok(ret == TRUE, "RemoveDirectoryA should always succeed\n"); @@ -445,6 +480,7 @@ static void test_RemoveDirectoryA(void) static void test_RemoveDirectoryW(void) { + WCHAR curdir[MAX_PATH]; WCHAR tmpdir[MAX_PATH]; BOOL ret; static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',0}; @@ -461,6 +497,18 @@ static void test_RemoveDirectoryW(void) ok(ret == TRUE, "CreateDirectoryW should always succeed\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); + ok(SetCurrentDirectoryW(tmpdir), "SetCurrentDirectoryW failed\n"); + + SetLastError(0xdeadbeef); + ok(!RemoveDirectoryW(tmpdir), "RemoveDirectoryW succeeded\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + + TEST_GRANTED_ACCESS(NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle, + FILE_TRAVERSE | SYNCHRONIZE); + + SetCurrentDirectoryW(curdir); ret = RemoveDirectoryW(tmpdir); ok(ret == TRUE, "RemoveDirectoryW should always succeed\n"); @@ -488,6 +536,8 @@ static void test_SetCurrentDirectoryA(void) START_TEST(directory) { + init(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ae0646a..de7366c 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,8 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, FILE_TRAVERSE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */

1 0

Aric Stewart : hid: Stub HidP_TranslateUsagesToI8042ScanCodes.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a39c74dc1d12ca6ccf6e297e6b170858f32bf910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39c74dc1d12ca6ccf6e297e6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 19 08:45:34 2016 -0500 hid: Stub HidP_TranslateUsagesToI8042ScanCodes. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b82ce81957a44ac7b80778b5fbe57d3da2c00535) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 12 ++++++++++++ include/ddk/hidpi.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index e416762..76df40d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -39,6 +39,6 @@ @ stub HidP_SetUsageValue @ stub HidP_SetUsageValueArray @ stub HidP_SetUsages -@ stub HidP_TranslateUsagesToI8042ScanCodes +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages @ stub HidP_UsageListDifference diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 3d7a12e..4a0fa64 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -23,6 +23,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" @@ -519,3 +520,14 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag } return count; } + +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, + ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, + HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, + PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext) +{ + FIXME("stub: %p, %i, %i, %p, %p, %p\n", ChangedUsageList, UsageListLength, + KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 4cfac61..eadc44d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -136,6 +136,34 @@ typedef struct _HIDP_CAPS USHORT NumberFeatureDataIndices; } HIDP_CAPS, *PHIDP_CAPS; +typedef enum _HIDP_KEYBOARD_DIRECTION { + HidP_Keyboard_Break, + HidP_Keyboard_Make +} HIDP_KEYBOARD_DIRECTION; + +typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { + union { + struct { + ULONG LeftControl: 1; + ULONG LeftShift: 1; + ULONG LeftAlt: 1; + ULONG LeftGUI: 1; + ULONG RightControl: 1; + ULONG RightShift: 1; + ULONG RightAlt: 1; + ULONG RigthGUI: 1; + ULONG CapsLock: 1; + ULONG ScollLock: 1; + ULONG NumLock: 1; + ULONG Reserved: 21; + } DUMMYSTRUCTNAME; + ULONG ul; + } DUMMYUNIONNAME; +} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; + +typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); + + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); @@ -144,6 +172,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwprintf.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0b548ab7a83cd4ce8b32e55bb4cff2dd95f4d7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b548ab7a83cd4ce8b32e55bb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 6 15:56:43 2016 -0700 ucrtbase: Add __stdio_common_vfwprintf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2f783c6828938d09a7ef86cdd9bc394f7c441136) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 28 ++++ dlls/ucrtbase/tests/printf.c | 157 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b548ab7a83cd4ce8b32e…

1 0

Austin English : newdev: Add DiInstallDriverA/W stubs.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d86a8b94a9ff237d381fe3928b2b4d131bd88602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86a8b94a9ff237d381fe3928… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 21 13:35:29 2016 -0500 newdev: Add DiInstallDriverA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1513c706341a6c04ddfa8b1998a346d343fc4983) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/newdev/main.c | 21 +++++++++++++++++++++ dlls/newdev/newdev.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 6be8cd0..20725a4 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -70,3 +70,24 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR Hardware FIXME("Stub! %s %s 0x%08x\n", debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags); return TRUE; } + + +/*********************************************************************** + * DiInstallDriverA (NEWDEV.@) + */ +BOOL WINAPI DiInstallDriverA(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, + PSP_DRVINFO_DATA_A driverdata, DWORD flags, BOOL *reboot) +{ + FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + return TRUE; +} + +/*********************************************************************** + * DiInstallDriverW (NEWDEV.@) + */ +BOOL WINAPI DiInstallDriverW(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, + PSP_DRVINFO_DATA_W driverdata, DWORD flags, BOOL *reboot) +{ + FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + return TRUE; +} diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index cef0abb..84303cc 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,7 +1,7 @@ @ stub DeviceInternetSettingUiW @ stub DiInstallDevice -@ stub DiInstallDriverA -@ stub DiInstallDriverW +@ stdcall DiInstallDriverA(long ptr ptr ptr long ptr) +@ stdcall DiInstallDriverW(long ptr ptr ptr long ptr) @ stub DiRollbackDriver @ stub DiShowUpdateDevice @ stub DiUninstallDevice

1 0

Austin English : ntoskrnl.exe: Add KeSetTimerEx stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 628629e831953562e58573e98d916cf9d93c7a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628629e831953562e58573e98… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 4 20:59:20 2016 -0500 ntoskrnl.exe: Add KeSetTimerEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e443e95f291a7e96c48fe0907e742507e21ca4b) Conflicts: dlls/ntoskrnl.exe/ntoskrnl.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 871daa9..904d66a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2435,3 +2435,12 @@ NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DE FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeSetTimerEx (NTOSKRNL.EXE.@) + */ +BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDPC *dpc ) +{ + FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b684595..a02c8d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -618,7 +618,7 @@ @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer -@ stub KeSetTimerEx +@ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread

1 0

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 6a1ac3e31c43debc83d8689f9740a6565402e51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1ac3e31c43debc83d8689f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79025d0e6af8189fd6c3360c5bd335954124c205) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5a45466..0def547 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -140,10 +140,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0

Alexandre Julliard : server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0befffb5d9e884d9793d9cb671941aff14415d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0befffb5d9e884d9793d9cb67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 19:08:23 2016 +0900 server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 438dae524d9410f571f7fe5cc335fb74fec8d2bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/request.c | 6 +++--- server/sock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index f78026a..e7eb89f 100644 --- a/server/request.c +++ b/server/request.c @@ -184,7 +184,7 @@ void write_reply( struct thread *thread ) } if (errno == EPIPE) kill_thread( thread, 0 ); /* normal death */ - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "reply write: %s\n", strerror( errno )); } @@ -311,7 +311,7 @@ error: kill_thread( thread, 0 ); else if (ret > 0) fatal_protocol_error( thread, "partial read %d\n", ret ); - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "read: %s\n", strerror( errno )); } @@ -392,7 +392,7 @@ int receive_fd( struct process *process ) } else { - if (errno != EWOULDBLOCK && errno != EAGAIN) + if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); diff --git a/server/sock.c b/server/sock.c index 1767dea..a35a115 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1071,8 +1071,8 @@ static void ifchange_poll_event( struct fd *fd, int event ) r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); if (r < 0) { - if (errno == EWOULDBLOCK || errno == EAGAIN) - return; /* retry when poll() says the socket is ready */ + if (errno == EWOULDBLOCK || (EWOULDBLOCK != EAGAIN && errno == EAGAIN)) + return; /* retry when poll() says the socket is ready */ status = sock_get_ntstatus( errno ); } else if (r > 0)

1 0