December 2016 - Wine-Commits

Bruno Jesus : xinput1_1: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: d923087c2dc7ee4cac280ed39414ab3c8581cd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d923087c2dc7ee4cac280ed39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:03 2016 -0200 xinput1_1: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 3 --- dlls/xinput1_1/xinput1_1_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index 364c9db..fc341d1 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_1.dll -C_SRCS = \ - xinput1_1_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_1/xinput1_1_main.c b/dlls/xinput1_1/xinput1_1_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput1_1/xinput1_1_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -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; - } - return TRUE; -}

1 0

Julian Rüger : Fix German translation for release 1.9.24
by Jeremy Newman Dec. 9, 2016

Dec. 9, 2016

Module: website Branch: master Commit: 018d8e70549e5f78bd98423d836e03de07962319 URL: http://source.winehq.org/git/website.git/?a=commit;h=018d8e70549e5f78bd9842… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 9 08:14:05 2016 +0100 Fix German translation for release 1.9.24 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016112501.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/de/2016112501.xml b/news/de/2016112501.xml index 4d73e88..00375e5 100644 --- a/news/de/2016112501.xml +++ b/news/de/2016112501.xml @@ -5,7 +5,7 @@ <p> Die Entwicklungsversion 1.9.24 von Wine ist jetzt verfügbar.</p> <p> <a href="{$root}/announce/1.9.24">Neuerungen (en)</a> in dieser Version:</p> <ul> - <li>Unterstützung von ungeordneten View-Zugriffen in Direct3D.</li> + <li>Unterstützung von Unordered-Access-Views in Direct3D.</li> <li>Viele Fehlerkorrekturen in den Regressionstests.</li> <li>Kleinere Verbesserungen an der HID-Unterstützung.</li> <li>Diverse Fehlerkorrekturen.</li>

1 0

Bruno Jesus : ws2_32: Implement IP_DONTFRAGMENT in [set|get]sockopt.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: c86bf9dc819a96d10a314e89c2c81299b819a393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86bf9dc819a96d10a314e89c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 7 04:27:26 2016 -0200 ws2_32: Implement IP_DONTFRAGMENT in [set|get]sockopt. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 120 +++++++++++++++++++++++++++++++++++++++++++---- dlls/ws2_32/tests/sock.c | 51 ++++++++++++++++++++ 2 files changed, 161 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d863b3e..3cdeade 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1150,6 +1150,108 @@ static int _get_fd_type(int fd) return sock_type; } +static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) +{ + int fd, optname; + + if (level == IPPROTO_IP) + { +#ifdef IP_DONTFRAG + optname = IP_DONTFRAG; +#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) + optname = IP_MTU_DISCOVER; + value = value ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; +#else + static int once; + if (!once++) + FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); + return TRUE; /* fake success */ +#endif + } + else + { +#ifdef IPV6_DONTFRAG + optname = IPV6_DONTFRAG; +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) + optname = IPV6_MTU_DISCOVER; + value = value ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; +#else + static int once; + if (!once++) + FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); + return TRUE; /* fake success */ +#endif + } + + fd = get_sock_fd(s, 0, NULL); + if (fd == -1) return FALSE; + + if (!setsockopt(fd, level, optname, &value, sizeof(value))) + value = TRUE; + else + { + WSASetLastError(wsaErrno()); + value = FALSE; + } + + release_sock_fd(s, fd); + return value; +} + +static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) +{ + int fd, optname, value, not_expected; + socklen_t optlen = sizeof(value); + + if (level == IPPROTO_IP) + { +#ifdef IP_DONTFRAG + optname = IP_DONTFRAG; + not_expected = 0; +#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT) + optname = IP_MTU_DISCOVER; + not_expected = IP_PMTUDISC_DONT; +#else + static int once; + if (!once++) + FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); + return TRUE; /* fake success */ +#endif + } + else + { +#ifdef IPV6_DONTFRAG + optname = IPV6_DONTFRAG; + not_expected = 0; +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) + optname = IPV6_MTU_DISCOVER; + not_expected = IPV6_PMTUDISC_DONT; +#else + static int once; + if (!once++) + FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); + return TRUE /* fake success */ +#endif + } + + fd = get_sock_fd(s, 0, NULL); + if (fd == -1) return FALSE; + + if (!getsockopt(fd, level, optname, &value, &optlen)) + { + *out = value != not_expected; + value = TRUE; + } + else + { + WSASetLastError(wsaErrno()); + value = FALSE; + } + + release_sock_fd(s, fd); + return value; +} + static struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -4231,9 +4333,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, release_sock_fd( s, fd ); return ret; case WS_IP_DONTFRAGMENT: - FIXME("WS_IP_DONTFRAGMENT is always false!\n"); - *(BOOL*)optval = FALSE; - return 0; + return get_dont_fragment(s, IPPROTO_IP, (BOOL *)optval) ? 0 : SOCKET_ERROR; } FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -4266,9 +4366,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, release_sock_fd( s, fd ); return ret; case WS_IPV6_DONTFRAG: - FIXME("WS_IPV6_DONTFRAG is always false!\n"); - *(BOOL*)optval = FALSE; - return 0; + return get_dont_fragment(s, IPPROTO_IPV6, (BOOL *)optval) ? 0 : SOCKET_ERROR; } FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -5898,8 +5996,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; case WS_IP_DONTFRAGMENT: - FIXME("IP_DONTFRAGMENT is silently ignored!\n"); - return 0; + return set_dont_fragment(s, IPPROTO_IP, *(BOOL *)optval) ? 0 : SOCKET_ERROR; default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -5926,8 +6023,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; case WS_IPV6_DONTFRAG: - FIXME("IPV6_DONTFRAG is silently ignored!\n"); - return 0; + return set_dont_fragment(s, IPPROTO_IPV6, *(BOOL *)optval) ? 0 : SOCKET_ERROR; case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; @@ -7273,6 +7369,10 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); + /* ensure IP_DONTFRAGMENT is disabled, in Linux the global default can be enabled */ + if (unixaf == AF_INET || unixaf == AF_INET6) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + #ifdef IPV6_V6ONLY if (unixaf == AF_INET6) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 83a931e..ba755a5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1721,6 +1721,57 @@ todo_wine closesocket(s); closesocket(s2); + + for (i = 0; i < 2; i++) + { + int family, level; + + if (i) + { + family = AF_INET6; + level = IPPROTO_IPV6; + } + else + { + family = AF_INET; + level = IPPROTO_IP; + } + + s = socket(family, SOCK_DGRAM, 0); + if (s == INVALID_SOCKET && i) + { + skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + size = sizeof(value); + value = 1; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + size = sizeof(value); + value = 0xdead; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + closesocket(s); + } } static void test_so_reuseaddr(void)

1 0

Michael Stefaniuc : comdlg32: Avoid some superfluous pointer casts.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: eff2ecc39afcf053f8dddaaea14c6a15912b296e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff2ecc39afcf053f8dddaaea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 8 11:29:25 2016 +0100 comdlg32: Avoid some superfluous pointer casts. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 8c2b9bc..ccc9eb6 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1956,7 +1956,7 @@ static LRESULT CALLBACK dropdown_subclass_proc(HWND hwnd, UINT umessage, WPARAM if (umessage == WM_LBUTTONDOWN) { - FileDialogImpl *This = (FileDialogImpl*)GetPropW(hwnd, prop_this); + FileDialogImpl *This = GetPropW(hwnd, prop_this); SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); show_opendropdown(This); @@ -2049,7 +2049,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); /* Subclass button so we can handle LBUTTONDOWN */ - SetPropW(dropdown_hwnd, prop_this, (HANDLE)This); + SetPropW(dropdown_hwnd, prop_this, This); SetPropW(dropdown_hwnd, prop_oldwndproc, (HANDLE)SetWindowLongPtrW(dropdown_hwnd, GWLP_WNDPROC, (LONG_PTR)dropdown_subclass_proc)); }

1 0

Józef Kucia : wined3d: Recognize dynamic linking shader instructions.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 875636980395e3ba02bc9bfc0229f77d358734cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=875636980395e3ba02bc9bfc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:03 2016 +0100 wined3d: Recognize dynamic linking shader instructions. 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/wined3d/arb_program_shader.c | 4 +++ dlls/wined3d/glsl_shader.c | 32 +++++++++-------- dlls/wined3d/shader.c | 73 ++++++++++++++++++++++++++++----------- dlls/wined3d/shader_sm1.c | 2 +- dlls/wined3d/shader_sm4.c | 64 +++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 25 ++++++++++++-- 6 files changed, 158 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875636980395e3ba02bc9…

1 0

Andrew Wesie : d3d11/tests: Add test for primitive restart.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: fe5b03beb5922f39ce1fa709984e4c2c98948061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5b03beb5922f39ce1fa7099… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Dec 7 12:43:02 2016 +0100 d3d11/tests: Add test for primitive restart. 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/d3d11/tests/d3d11.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7c6e875..0b3cb10 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11774,6 +11774,166 @@ static void test_sm4_ret_instruction(void) release_test_context(&test_context); } +static void test_primitive_restart(void) +{ + struct d3d11_test_context test_context; + unsigned int stride, offset, x, y; + ID3D11Buffer *ib32, *ib16, *vb; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11InputLayout *layout; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_Position; + float4 color : color; + }; + + float4 main(vs_out input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0x119e48d1, 0x468aecb3, 0x0a405be5, 0x4e203b82, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x6f6c6f63, 0xabab0072, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_Position; + float4 color : color; + }; + + void main(float4 position : POSITION, uint vertex_id : SV_VertexID, out vs_out output) + { + output.position = position; + output.color = vertex_id < 4 ? float4(0.0, 1.0, 1.0, 1.0) : float4(1.0, 0.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x2fa57573, 0xdb71c15f, 0x2641b028, 0xa8f87ccc, 0x00000001, 0x00000198, 0x00000003, + 0x0000002c, 0x00000084, 0x000000d8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000006, + 0x00000001, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x6f6c6f63, 0xabab0072, 0x52444853, 0x000000b8, + 0x00010040, 0x0000002e, 0x0300005f, 0x001010f2, 0x00000000, 0x04000060, 0x00101012, 0x00000001, + 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, + 0x02000068, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0700004f, + 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x00004001, 0x00000004, 0x0f000037, 0x001020f2, + 0x00000001, 0x00100006, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct vec2 vertices[] = + { + {-1.00f, -1.0f}, + {-1.00f, 1.0f}, + {-0.25f, -1.0f}, + {-0.25f, 1.0f}, + { 0.25f, -1.0f}, + { 0.25f, 1.0f}, + { 1.00f, -1.0f}, + { 1.00f, 1.0f}, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const unsigned short indices16[] = + { + 0, 1, 2, 3, 0xffff, 4, 5, 6, 7 + }; + static const unsigned int indices32[] = + { + 0, 1, 2, 3, 0xffffffff, 4, 5, 6, 7 + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create return pixel shader, hr %#x.\n", hr); + + ib16 = create_buffer(device, D3D11_BIND_INDEX_BUFFER, sizeof(indices16), indices16); + ib32 = create_buffer(device, D3D11_BIND_INDEX_BUFFER, sizeof(indices32), indices32); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, + sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_IASetInputLayout(context, layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*vertices); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + + for (i = 0; i < 2; ++i) + { + if (!i) + ID3D11DeviceContext_IASetIndexBuffer(context, ib32, DXGI_FORMAT_R32_UINT, 0); + else + ID3D11DeviceContext_IASetIndexBuffer(context, ib16, DXGI_FORMAT_R16_UINT, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_DrawIndexed(context, 9, 0, 0); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + DWORD color = get_readback_color(&rb, x, y); + DWORD expected_color; + if (x < 240) + expected_color = 0xffffff00; + else if (x >= 640 - 240) + expected_color = 0xff0000ff; + else + expected_color = 0x00000000; + ok(compare_color(color, expected_color, 1), + "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", + i, color, expected_color, x, y); + } + } + release_resource_readback(&rb); + } + + ID3D11Buffer_Release(ib16); + ID3D11Buffer_Release(ib32); + ID3D11Buffer_Release(vb); + ID3D11InputLayout_Release(layout); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -11839,4 +11999,5 @@ START_TEST(d3d11) test_stencil_separate(); test_uav_load(); test_sm4_ret_instruction(); + test_primitive_restart(); }

1 0

Józef Kucia : d3d10core/tests: Print expected result in case of failures in check_texture_sub_resource_* () functions.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 1e7b52c5c1e070995798372c0efdc919f5e53f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7b52c5c1e070995798372c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:57:52 2016 +0100 d3d10core/tests: Print expected result in case of failures in check_texture_sub_resource_*() functions. 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 778f33c..784a086 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -643,8 +643,8 @@ static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", - color, x, y, sub_resource_idx); + "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n", + color, expected_color, x, y, sub_resource_idx); } #define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) @@ -686,8 +686,8 @@ static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", - value, x, y, sub_resource_idx); + "Got %.8e, expected %.8e at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, sub_resource_idx); } #define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) @@ -729,8 +729,10 @@ static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", - value.x, value.y, value.z, value.w, x, y, sub_resource_idx); + "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, + expected_value->x, expected_value->y, expected_value->z, expected_value->w, + x, y, sub_resource_idx); } #define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c)

1 0

Henri Verbeet : d2d1: Store separate bezier vertices.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 91baf67e4a266720902a3bec861d18aa51265c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91baf67e4a266720902a3bec8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 14:31:59 2016 +0100 d2d1: Store separate bezier vertices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 15 +++++------- dlls/d2d1/geometry.c | 62 ++++++++++++++++++++++------------------------- dlls/d2d1/render_target.c | 10 ++++---- 3 files changed, 40 insertions(+), 47 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6704ec5..2e05b80 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -285,16 +285,13 @@ enum d2d_geometry_state D2D_GEOMETRY_STATE_FIGURE, }; -struct d2d_bezier +struct d2d_bezier_vertex { + D2D1_POINT_2F position; struct { - D2D1_POINT_2F position; - struct - { - float u, v, sign; - } texcoord; - } v[3]; + float u, v, sign; + } texcoord; }; struct d2d_face @@ -320,8 +317,8 @@ struct d2d_geometry size_t faces_size; size_t face_count; - struct d2d_bezier *beziers; - size_t bezier_count; + struct d2d_bezier_vertex *bezier_vertices; + size_t bezier_vertex_count; } fill; union diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a04a003..8bdd818 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -118,6 +118,15 @@ struct d2d_fp_fin size_t length; }; +static void d2d_bezier_vertex_set(struct d2d_bezier_vertex *b, + const D2D1_POINT_2F *p, float u, float v, float sign) +{ + b->position = *p; + b->texcoord.u = u; + b->texcoord.v = v; + b->texcoord.sign = sign; +} + static void d2d_fp_two_sum(float *out, float a, float b) { float a_virt, a_round, b_virt, b_round; @@ -1679,7 +1688,7 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) static void d2d_geometry_cleanup(struct d2d_geometry *geometry) { - HeapFree(GetProcessHeap(), 0, geometry->fill.beziers); + HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); HeapFree(GetProcessHeap(), 0, geometry->fill.faces); HeapFree(GetProcessHeap(), 0, geometry->fill.vertices); ID2D1Factory_Release(geometry->factory); @@ -1900,14 +1909,14 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { - geometry->fill.bezier_count += geometry->u.path.figures[i].bezier_control_count; + geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.beziers = HeapAlloc(GetProcessHeap(), 0, - geometry->fill.bezier_count * sizeof(*geometry->fill.beziers)))) + if (!(geometry->fill.bezier_vertices = HeapAlloc(GetProcessHeap(), 0, + geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices)))) { - ERR("Failed to allocate beziers array.\n"); - geometry->fill.bezier_count = 0; + ERR("Failed to allocate bezier vertices array.\n"); + geometry->fill.bezier_vertex_count = 0; return E_OUTOFMEMORY; } @@ -1919,44 +1928,31 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) for (j = 0, control_idx = 0; j < figure->vertex_count; ++j) { const D2D1_POINT_2F *p0, *p1, *p2; - struct d2d_bezier *b; + struct d2d_bezier_vertex *b; + float sign = -1.0f; if (figure->vertex_types[j] != D2D_VERTEX_TYPE_BEZIER) continue; - b = &geometry->fill.beziers[bezier_idx]; + b = &geometry->fill.bezier_vertices[bezier_idx * 3]; p0 = &figure->vertices[j]; p1 = &figure->bezier_controls[control_idx++]; - if (j == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[j + 1]; - - b->v[0].position = *p0; - b->v[0].texcoord.u = 0.0f; - b->v[0].texcoord.v = 0.0f; - b->v[1].position = *p1; - b->v[1].texcoord.u = 0.5f; - b->v[1].texcoord.v = 0.0f; - b->v[2].position = *p2; - b->v[2].texcoord.u = 1.0f; - b->v[2].texcoord.v = 1.0f; if (d2d_path_geometry_point_inside(geometry, p1, FALSE)) { - b->v[0].texcoord.sign = 1.0f; - b->v[1].texcoord.sign = 1.0f; - b->v[2].texcoord.sign = 1.0f; + sign = 1.0f; d2d_figure_insert_vertex(figure, j + 1, *p1); ++j; } + + if (j == figure->vertex_count - 1) + p2 = &figure->vertices[0]; else - { - b->v[0].texcoord.sign = -1.0f; - b->v[1].texcoord.sign = -1.0f; - b->v[2].texcoord.sign = -1.0f; - } + p2 = &figure->vertices[j + 1]; + d2d_bezier_vertex_set(&b[0], p0, 0.0f, 0.0f, sign); + d2d_bezier_vertex_set(&b[1], p1, 0.5f, 0.0f, sign); + d2d_bezier_vertex_set(&b[2], p2, 1.0f, 1.0f, sign); ++bezier_idx; } } @@ -1990,8 +1986,8 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac done: if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, geometry->fill.beziers); - geometry->fill.bezier_count = 0; + HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); + geometry->fill.bezier_vertex_count = 0; d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; } @@ -2685,7 +2681,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed if (!refcount) { - geometry->fill.beziers = NULL; + geometry->fill.bezier_vertices = NULL; geometry->fill.faces = NULL; geometry->fill.vertices = NULL; ID2D1Geometry_Release(geometry->u.transformed.src_geometry); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 40ddecb..74dbfb7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -717,10 +717,10 @@ static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, ID3D10Buffer_Release(ib); } - if (geometry->fill.bezier_count) + if (geometry->fill.bezier_vertex_count) { - buffer_desc.ByteWidth = geometry->fill.bezier_count * sizeof(*geometry->fill.beziers); - buffer_data.pSysMem = geometry->fill.beziers; + buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); + buffer_data.pSysMem = geometry->fill.bezier_vertices; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) { @@ -728,8 +728,8 @@ static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, goto done; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_BEZIER, NULL, 3 * geometry->fill.bezier_count, vb, - sizeof(*geometry->fill.beziers->v), vs_cb, ps_cb, brush, opacity_brush); + d2d_rt_draw(render_target, D2D_SHAPE_TYPE_BEZIER, NULL, geometry->fill.bezier_vertex_count, vb, + sizeof(*geometry->fill.bezier_vertices), vs_cb, ps_cb, brush, opacity_brush); ID3D10Buffer_Release(vb); }

1 0

Józef Kucia : d3d11/tests: Print expected result in case of failures in check_texture_sub_resource_* () functions.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 22aa67e8abe227ab5eb3ab05262945afc8328850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22aa67e8abe227ab5eb3ab052… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:57:51 2016 +0100 d3d11/tests: Print expected result in case of failures in check_texture_sub_resource_*() functions. 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/d3d11/tests/d3d11.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0b3cb10..898e3b8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -775,8 +775,8 @@ static void check_texture_sub_resource_color_(unsigned int line, ID3D11Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", - color, x, y, sub_resource_idx); + "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n", + color, expected_color, x, y, sub_resource_idx); } #define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) @@ -818,8 +818,8 @@ static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", - value, x, y, sub_resource_idx); + "Got %.8e, expected %.8e at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, sub_resource_idx); } #define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) @@ -861,8 +861,10 @@ static void check_texture_sub_resource_vec4_(unsigned int line, ID3D11Texture2D } release_resource_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", - value.x, value.y, value.z, value.w, x, y, sub_resource_idx); + "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, + expected_value->x, expected_value->y, expected_value->z, expected_value->w, + x, y, sub_resource_idx); } #define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c)

1 0

Aric Stewart : hid: Refine initialization of UsageLength in HidP_GetUsages.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: e724d67fb4406563538f36f3fb512fba2fd679b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e724d67fb4406563538f36f3f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 08:34:02 2016 -0600 hid: Refine initialization of UsageLength in HidP_GetUsages. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 56616b4..9dcdeb6 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -278,10 +278,11 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, UsageLength, PreparsedData, Report, ReportLength); - *UsageLength = 0; - if (data->magic != HID_MAGIC) + { + *UsageLength = 0; return HIDP_STATUS_INVALID_PREPARSED_DATA; + } switch(ReportType) { @@ -344,11 +345,11 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH } } + *UsageLength = uCount; + if (!found) return HIDP_STATUS_USAGE_NOT_FOUND; - *UsageLength = uCount; - return HIDP_STATUS_SUCCESS; }

1 0