January 2017 - Wine-Commits

Józef Kucia : d3d10core/tests: Port test_depth_stencil_sampling() from d3d11.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 6a45ea7dd976e84b185c7b51a11bb5128249d18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a45ea7dd976e84b185c7b51a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:51 2017 +0100 d3d10core/tests: Port test_depth_stencil_sampling() from d3d11. 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> --- dlls/d3d10core/tests/device.c | 375 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 372 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a45ea7dd976e84b185c7…

1 0

Michael Cronenworth : wined3d: Add Iris Haswell PCI ids and descriptions.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 58056728cdf5697e2bbbe8636b498f001131cfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58056728cdf5697e2bbbe8636… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Fri Jan 13 07:06:45 2017 -0600 wined3d: Add Iris Haswell PCI ids and descriptions. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afe2d1c..3783d49 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1418,6 +1418,15 @@ 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_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_4, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_1, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_2, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_3, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_4, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_5, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, {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}, @@ -2065,6 +2074,8 @@ cards_intel[] = {"Iris 6100", CARD_INTEL_I6100}, {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ + {"Iris Pro 5200", CARD_INTEL_IP5200_1}, + {"Iris 5100", CARD_INTEL_I5100_1}, {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e1787a2..1a59ba5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2067,6 +2067,15 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_I5100_1 = 0x0a22, + CARD_INTEL_I5100_2 = 0x0a2a, + CARD_INTEL_I5100_3 = 0x0a2b, + CARD_INTEL_I5100_4 = 0x0a2e, + CARD_INTEL_IP5200_1 = 0x0d22, + CARD_INTEL_IP5200_2 = 0x0d26, + CARD_INTEL_IP5200_3 = 0x0d2a, + CARD_INTEL_IP5200_4 = 0x0d2b, + CARD_INTEL_IP5200_5 = 0x0d2e, CARD_INTEL_HD5300 = 0x161e, CARD_INTEL_HD5500 = 0x1616, CARD_INTEL_HD5600 = 0x1612,

1 0

Henri Verbeet : ddraw: Set the swapchain palette in ddraw_create_swapchain ().
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: e48d75862fdd273a878e4a1188d57725fee7e87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48d75862fdd273a878e4a118… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 13 14:59:17 2017 +0330 ddraw: Set the swapchain palette in ddraw_create_swapchain(). This fixes a regression introduced by commit 9d49b7a9be6d4ed59a69c3453de4eadb0101ea09. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6afa6dd..3b4c628 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -653,6 +653,9 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win wined3d_swapchain_incref(ddraw->wined3d_swapchain); ddraw_set_swapchain_window(ddraw, window); + if (ddraw->primary && ddraw->primary->palette) + wined3d_swapchain_set_palette(ddraw->wined3d_swapchain, ddraw->primary->palette->wined3d_palette); + return DD_OK; }

1 0

Nikolay Sivov : comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 9d404ddac6e4f789b7ee417f4bedd3cb49e411e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d404ddac6e4f789b7ee417f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 13 14:25:54 2017 +0300 comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/tests/propsheet.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8600844..1809b86 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -639,7 +639,7 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) */ resSize = SizeofResource(COMCTL32_hModule, hRes); - temp = Alloc(resSize); + temp = Alloc(2 * resSize); if (!temp) return -1; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 6594298..592ad15 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -55,6 +55,21 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) { + case PSCB_PRECREATE: + { + HMODULE module = GetModuleHandleA("comctl32.dll"); + DWORD size, buffer_size; + HRSRC hrsrc; + + hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), + (LPSTR)RT_DIALOG); + size = SizeofResource(module, hrsrc); + ok(size != 0, "Failed to get size of propsheet dialog resource\n"); + buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); + ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", + buffer_size, size); + break; + } case PSCB_INITIALIZED: { char caption[256];

1 0

Huw Davies : advapi32/tests: Update ACE registry tests with Windows 10 values.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: e3c8794dfc244f119770370ce6e2147943e97def URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c8794dfc244f119770370ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 13 11:18:17 2017 +0000 advapi32/tests: Update ACE registry tests with Windows 10 values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 18f4e04..f339607 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4033,10 +4033,14 @@ static void test_GetNamedSecurityInfoA(void) ok(bret, "Failed to get Builtin Users ACE.\n"); flags = ((ACE_HEADER *)ace)->AceFlags; ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE) - || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ + || broken(flags == (CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* win 10 wow64 */ + || broken(flags == CONTAINER_INHERIT_ACE), /* win 10 */ "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); - ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", + ok(ace->Mask == GENERIC_READ + || broken(ace->Mask == KEY_READ), /* win 10 */ + "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ); } ok(admins_ace_id != -1, "Bultin Admins ACE not found.\n"); @@ -4048,7 +4052,9 @@ static void test_GetNamedSecurityInfoA(void) ok(flags == 0x0 || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) /* win7 */ - || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)), /* win8+ */ + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)) /* win8+ */ + || broken(flags == (CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* win 10 wow64 */ + || broken(flags == CONTAINER_INHERIT_ACE), /* win 10 */ "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS);

1 0

Huw Davies : dmime/tests: Skip the tests if InitAudio fails for any reason.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 5864ef417e25cb6152cacf5801ea58b980dd0396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5864ef417e25cb6152cacf580… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 13 10:10:42 2017 +0000 dmime/tests: Skip the tests if InitAudio fails for any reason. Fixes failures on Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3e93c39..1e96aba 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -22,6 +22,7 @@ #include <windef.h> #include <wine/test.h> #include <dmusici.h> +#include <audioclient.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -57,11 +58,13 @@ static void test_COM_audiopath(void) } hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); - if (hr == DSERR_NODRIVER) { - skip("No audio driver\n"); + ok(hr == S_OK || hr == DSERR_NODRIVER || + broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED), /* Win 10 testbot */ + "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + if (FAILED(hr)) { + skip("Audio failed to initialize\n"); return; } - ok(hr == S_OK, "DirectMusicPerformance_InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr);

1 0

Alex Henrie : patches: Say "translation files" instead of "resource files" .
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: tools Branch: master Commit: d9f2f182fc8de3435d616a79512da7e40924e923 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d9f2f182fc8de3435d616a79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 12 21:47:43 2017 -0700 patches: Say "translation files" instead of "resource files". The explanation was confusing because it's been years since we used resource files for translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update b/patches/update index 037297f..4f381f0 100755 --- a/patches/update +++ b/patches/update @@ -69,7 +69,7 @@ my @legend = [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . "<li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . - "<li>8-bit chars got mangled in transit (usually when sending patches to resource files).</li>" . + "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . "<li>You are making gratuitous formatting changes to the code.</li>" . "<li>You are using C++ comments.</li></ul>" ], [ "nopatch", "<ul><li>You hit 'send' before attaching the patch.</li>" .

1 0

Nikolay Sivov : comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary.
by Alexandre Julliard Jan. 12, 2017

Jan. 12, 2017

Module: wine Branch: master Commit: bb1d68ede06c8b517ea16246e376a4a4e52bf1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1d68ede06c8b517ea16246e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 12 17:22:25 2017 +0300 comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 26 ++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index b236cc3..a0fae00 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -775,6 +775,32 @@ static void test_range(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + /* test position update on range change */ + + /* set to [20, 50], position at 30, reduce range to [20,25] */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip max to 10 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 20, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip min to 70 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 70); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 70, "Unexpected position %d\n", r); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c6757a5..cdbf859 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1275,10 +1275,11 @@ static inline LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) { BOOL changed = infoPtr->lRangeMax != lMax; + LONG rightmost = max(lMax, infoPtr->lRangeMin); infoPtr->lRangeMax = lMax; - if (infoPtr->lPos > infoPtr->lRangeMax) { - infoPtr->lPos = infoPtr->lRangeMax; + if (infoPtr->lPos > rightmost) { + infoPtr->lPos = rightmost; infoPtr->flags |= TB_THUMBPOSCHANGED; }

1 0

Henri Verbeet : wine.inf: Add Dynamic DST data for Asia/Tehran.
by Alexandre Julliard Jan. 12, 2017

Jan. 12, 2017

Module: wine Branch: master Commit: 19ce2b77bdf39cdf2ae15268e3e55996da194925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ce2b77bdf39cdf2ae15268e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 19:37:35 2017 +0330 wine.inf: Add Dynamic DST data for Asia/Tehran. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19ce2b77bdf39cdf2ae15…

1 0

Anton Romanov : ws2_32: Ignore IPV6_V6ONLY setsockopt for AF_INET sockets.
by Alexandre Julliard Jan. 12, 2017

Jan. 12, 2017

Module: wine Branch: master Commit: 531dcf2dd3b1c5e9848afce422a6e0f2ee497597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531dcf2dd3b1c5e9848afce42… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Jan 11 21:27:08 2017 -0800 ws2_32: Ignore IPV6_V6ONLY setsockopt for AF_INET sockets. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6bf3c9d..4977bbf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6016,7 +6016,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: - case WS_IPV6_V6ONLY: #ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: #endif @@ -6027,6 +6026,30 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + case WS_IPV6_V6ONLY: + { + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen; + int bound; + + fd = get_sock_fd( s, 0, NULL ); + if (fd == -1) return SOCKET_ERROR; + + bound = is_fd_bound(fd, &uaddr, &uaddrlen); + release_sock_fd( s, fd ); + if (bound == 0 && uaddr.addr.sa_family == AF_INET) + { + /* Changing IPV6_V6ONLY succeeds on AF_INET (IPv4) socket + * on Windows (with IPv6 support) if the socket is unbound. + * It is essentially a noop, though Windows does store the value + */ + WARN("Silently ignoring IPPROTO_IPV6+IPV6_V6ONLY on AF_INET socket\n"); + return 0; + } + level = IPPROTO_IPV6; + optname = IPV6_V6ONLY; + break; + } default: FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); return SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba755a5..5856718 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6189,12 +6189,60 @@ static void test_ipv6only(void) } v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(v4 != INVALID_SOCKET, "Could not create IPv6 socket (LastError: %d)\n", WSAGetLastError()); + ok(v4 != INVALID_SOCKET, "Could not create IPv4 socket (LastError: %d)\n", WSAGetLastError()); + +todo_wine { + enabled = 2; + ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(enabled == 1, "expected 1, got %d\n", enabled); +} + + enabled = 0; + len = sizeof(enabled); + ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); + ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + +todo_wine { + enabled = 2; + ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!enabled, "expected 0, got %d\n", enabled); +} + + enabled = 1; + len = sizeof(enabled); + ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); + ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); ok(!ret, "Could not bind IPv4 address (LastError: %d)\n", WSAGetLastError()); +todo_wine { + enabled = 2; + ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(enabled == 1, "expected 1, got %d\n", enabled); +} + + enabled = 0; + len = sizeof(enabled); + ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); + ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + +todo_wine { + enabled = 0; + ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(enabled == 1, "expected 1, got %d\n", enabled); +} + + enabled = 1; + len = sizeof(enabled); + ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); + ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + closesocket(v4); closesocket(v6);

1 0