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 @@ Die Entwicklungsversion 1.9.24 von Wine ist jetzt verfügbar. <a href="{$root}/announce/1.9.24">Neuerungen (en)</a> in dieser Version: <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

Józef Kucia : wined3d: Rename WINED3D_RS_CCW_STENCIL* render states to WINED3D_RS_BACK_STENCIL*.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 4972cc89ce7bd0490cbb9deff01c337141144628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4972cc89ce7bd0490cbb9deff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:05 2016 +0100 wined3d: Rename WINED3D_RS_CCW_STENCIL* render states to WINED3D_RS_BACK_STENCIL*. 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/device.c | 8 ++++---- dlls/wined3d/state.c | 48 +++++++++++++++++++++++------------------------ dlls/wined3d/stateblock.c | 14 +++++++------- dlls/wined3d/utils.c | 8 ++++---- include/wine/wined3d.h | 8 ++++---- 5 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4972cc89ce7bd0490cbb9…

1 0

Józef Kucia : wined3d: Use opaque data type for stream output registers.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 81e50b6d4126b4b811e98e1004788544eb4863fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e50b6d4126b4b811e98e100… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:04 2016 +0100 wined3d: Use opaque data type for stream output registers. 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/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 00fb4c0..4a4926b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -922,7 +922,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, - {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, + {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "O"}, {WINED3D_SM5_OP_DCL_FUNCTION_BODY, WINED3DSIH_DCL_FUNCTION_BODY, "", "", shader_sm5_read_dcl_function_body}, {WINED3D_SM5_OP_DCL_FUNCTION_TABLE, WINED3DSIH_DCL_FUNCTION_TABLE, "", "",

1 0

Nikolay Sivov : comctl32/tests: Increase fixed buffer size to make test string fit.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 0def005b7744e11fec02a6ff74e1c5bc24ea7273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0def005b7744e11fec02a6ff7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 01:10:11 2016 +0300 comctl32/tests: Increase fixed buffer size to make test string fit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 72bfc95..1fb9579 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -297,7 +297,7 @@ static void test_gettext(void) TTTOOLINFOA toolinfoA; TTTOOLINFOW toolinfoW; LRESULT r; - CHAR bufA[10] = ""; + CHAR bufA[16] = ""; WCHAR bufW[10] = { 0 }; DWORD length, style;

1 0

Henri Verbeet : d2d1: Use d2d_point_set() in d2d_rectangle_geometry_init() .
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 74735f327c804b8739489bbcb777736516c33f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74735f327c804b8739489bbcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 14:32:00 2016 +0100 d2d1: Use d2d_point_set() in d2d_rectangle_geometry_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 6 ++++++ dlls/d2d1/geometry.c | 21 +++++++++++++-------- dlls/d2d1/render_target.c | 6 ------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2e05b80..5b494d5 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -382,6 +382,12 @@ static inline BOOL d2d_matrix_invert(D2D_MATRIX_3X2_F *dst, const D2D_MATRIX_3X2 return TRUE; } +static inline void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) +{ + dst->x = x; + dst->y = y; +} + static inline void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8bdd818..f0e1d08 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2600,6 +2600,9 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { + D2D1_POINT_2F *fv; + float l, r, t, b; + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; @@ -2617,14 +2620,16 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory } geometry->fill.face_count = 2; - geometry->fill.vertices[0].x = min(rect->left, rect->right); - geometry->fill.vertices[0].y = min(rect->top, rect->bottom); - geometry->fill.vertices[1].x = min(rect->left, rect->right); - geometry->fill.vertices[1].y = max(rect->top, rect->bottom); - geometry->fill.vertices[2].x = max(rect->left, rect->right); - geometry->fill.vertices[2].y = min(rect->top, rect->bottom); - geometry->fill.vertices[3].x = max(rect->left, rect->right); - geometry->fill.vertices[3].y = max(rect->top, rect->bottom); + l = min(rect->left, rect->right); + r = max(rect->left, rect->right); + t = min(rect->top, rect->bottom); + b = max(rect->top, rect->bottom); + + fv = geometry->fill.vertices; + d2d_point_set(&fv[0], l, t); + d2d_point_set(&fv[1], l, b); + d2d_point_set(&fv[2], r, t); + d2d_point_set(&fv[3], r, b); geometry->fill.faces[0].v[0] = 0; geometry->fill.faces[0].v[1] = 2; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 74dbfb7..0a70897 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -42,12 +42,6 @@ static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *cont return context->brush; } -static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) -{ - dst->x = x; - dst->y = y; -} - static void d2d_rect_expand(D2D1_RECT_F *dst, const D2D1_POINT_2F *point) { if (point->x < dst->left)

1 0

Henri Verbeet : d2d1: Introduce a separate structure for fill specific geometry fields.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: ad40557103bd6302842c3264279df77ddba3caa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad40557103bd6302842c32642… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 14:31:58 2016 +0100 d2d1: Introduce a separate structure for fill specific geometry fields. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 17 ++++---- dlls/d2d1/geometry.c | 104 ++++++++++++++++++++++------------------------ dlls/d2d1/render_target.c | 24 +++++------ 3 files changed, 72 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad40557103bd6302842c3…

1 0

Aric Stewart : loader: Add IOHID to critical device database.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: ad18f7fe81492d3cd2d53a407961e3008a3e62c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad18f7fe81492d3cd2d53a407… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 07:51:40 2016 -0600 loader: Add IOHID to critical device database. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(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 991857e..1ffd037 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -471,6 +471,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CriticalDevice] HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" [CurrentVersion] HKCU,%CurrentVersion%\Run,,16

1 0

Józef Kucia : wined3d: Implement primitive restart.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: ffcea8af7720007c5cd58f796fc3d6e672ec26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcea8af7720007c5cd58f796… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:01 2016 +0100 wined3d: Implement primitive restart. Based on a patch by Andrew Wesie. 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/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 3 ++- dlls/ddraw/ddraw_private.h | 2 +- dlls/wined3d/context.c | 17 +++++++++++++++-- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 18753cd..d307265 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -432,7 +432,7 @@ BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 5772c11..c377992 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -664,7 +664,8 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; + | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR + | WINED3D_NO_PRIMITIVE_RESTART; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe4603b..731d441 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -61,7 +61,7 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART) enum ddraw_device_state { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 727f074..2ce99cb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1634,16 +1634,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; + BOOL hdc_is_private = FALSE; BOOL auxBuffers = FALSE; HGLRC ctx, share_ctx; int pixel_format; unsigned int s; DWORD state; HDC hdc = 0; - BOOL hdc_is_private = FALSE; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1823,7 +1824,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - ret->d3d_info = &device->adapter->d3d_info; + ret->d3d_info = d3d_info; ret->state_table = device->StateTable; /* Mark all states dirty to force a proper initialization of the states @@ -1979,6 +1980,18 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, { GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); } + if (!(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) + { + if (gl_info->supported[ARB_ES3_COMPATIBILITY]) + { + gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); + checkGLcall("Enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); + } + else + { + FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); + } + } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); device->shader_backend->shader_init_context_state(ret); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5787c22..34c42be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, + {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, @@ -3635,6 +3636,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, + {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 26089ad..cb1647c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, + ARB_ES3_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_COORD_CONVENTIONS, ARB_FRAGMENT_PROGRAM, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6a720d0..6bbb672 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1267,6 +1267,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 +#define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Lauri Kenttä : kernel32/tests: Mask out FILE_ATTRIBUTE_COMPRESSED to prevent failures.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 369543e36531fff4411028c08cd9de49b70805dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=369543e36531fff4411028c08… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Dec 7 22:06:14 2016 +0200 kernel32/tests: Mask out FILE_ATTRIBUTE_COMPRESSED to prevent failures. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f039cf9..70424db 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -457,6 +457,7 @@ static void test__lcreat( void ) ok (!strcmp (filename, search_results.cFileName), "found unexpected name \"%s\"\n", search_results.cFileName); search_results.dwFileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + search_results.dwFileAttributes &= ~FILE_ATTRIBUTE_COMPRESSED; ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes, "attributes of file \"%s\" are 0x%04x\n", search_results.cFileName, search_results.dwFileAttributes);

1 0

Józef Kucia : wined3d: Do not generate shader epilogue in subroutines.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 4e2ee0e452c7060a120dd6edff7ac9fdd13b2808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2ee0e452c7060a120dd6edf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:58 2016 +0100 wined3d: Do not generate shader epilogue in subroutines. 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/glsl_shader.c | 57 ++++++++++++++++++++++-------------------- dlls/wined3d/shader.c | 9 ++++--- dlls/wined3d/wined3d_private.h | 9 ++++--- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b3e7607..88f4465 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2625,7 +2625,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ins->ctx->loop_state->current_reg - 1); + sprintf(register_name, "aL%u", ins->ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: @@ -4309,7 +4309,7 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) /* FIXME: I don't think nested loops will work correctly this way. */ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_parser_state *state = ins->ctx->state; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; @@ -4347,65 +4347,65 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (loop_control.step > 0) { shader_addline(buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d)\n{\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + state->current_loop_depth, loop_control.start, + state->current_loop_depth, loop_control.count, loop_control.step, loop_control.start, + state->current_loop_depth, loop_control.step); } else if (loop_control.step < 0) { shader_addline(buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d)\n{\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + state->current_loop_depth, loop_control.start, + state->current_loop_depth, loop_control.count, loop_control.step, loop_control.start, + state->current_loop_depth, loop_control.step); } else { shader_addline(buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++)\n{\n", - loop_state->current_depth, loop_control.start, loop_state->current_depth, - loop_state->current_depth, loop_control.count, - loop_state->current_depth); + state->current_loop_depth, loop_control.start, state->current_loop_depth, + state->current_loop_depth, loop_control.count, + state->current_loop_depth); } } else { shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - loop_state->current_depth, loop_state->current_reg, - src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, - loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); + state->current_loop_depth, state->current_loop_reg, + src1_param.reg_name, state->current_loop_depth, src1_param.reg_name, + state->current_loop_depth, state->current_loop_reg, src1_param.reg_name); } - ++loop_state->current_reg; + ++state->current_loop_reg; } else { shader_addline(buffer, "for (;;)\n{\n"); } - ++loop_state->current_depth; + ++state->current_loop_depth; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_parser_state *state = ins->ctx->state; shader_addline(ins->ctx->buffer, "}\n"); if (ins->handler_idx == WINED3DSIH_ENDLOOP) { - --loop_state->current_depth; - --loop_state->current_reg; + --state->current_loop_depth; + --state->current_loop_reg; } if (ins->handler_idx == WINED3DSIH_ENDREP) { - --loop_state->current_depth; + --state->current_loop_depth; } } static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_parser_state *state = ins->ctx->state; const struct wined3d_shader *shader = ins->ctx->shader; - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; const struct wined3d_shader_lconst *constant; struct glsl_src_param src0_param; const DWORD *control_values = NULL; @@ -4426,18 +4426,18 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) if (control_values) { shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %d; tmpInt%d++) {\n", - loop_state->current_depth, loop_state->current_depth, - control_values[0], loop_state->current_depth); + state->current_loop_depth, state->current_loop_depth, + control_values[0], state->current_loop_depth); } else { shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", - loop_state->current_depth, loop_state->current_depth, - src0_param.param_str, loop_state->current_depth); + state->current_loop_depth, state->current_loop_depth, + src0_param.param_str, state->current_loop_depth); } - ++loop_state->current_depth; + ++state->current_loop_depth; } static void shader_glsl_switch(const struct wined3d_shader_instruction *ins) @@ -4537,6 +4537,9 @@ static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); shader_addline(ins->ctx->buffer, "void subroutine%u()\n{\n", ins->src[0].reg.idx[0].offset); + + /* Subroutines appear at the end of the shader. */ + ins->ctx->state->in_subroutine = TRUE; } static void shader_glsl_call(const struct wined3d_shader_instruction *ins) @@ -4557,7 +4560,7 @@ static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->shader->reg_maps.shader_version; - if (version->major >= 4) + if (version->major >= 4 && !ins->ctx->state->in_subroutine) { shader_glsl_generate_shader_epilogue(ins->ctx); shader_addline(ins->ctx->buffer, "return;\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a34694b..d434a64 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2104,7 +2104,7 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st const struct wined3d_shader_frontend *fe = shader->frontend; void *fe_data = shader->frontend_data; struct wined3d_shader_version shader_version; - struct wined3d_shader_loop_state loop_state; + struct wined3d_shader_parser_state state; struct wined3d_shader_instruction ins; struct wined3d_shader_tex_mx tex_mx; struct wined3d_shader_context ctx; @@ -2112,15 +2112,16 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st /* Initialize current parsing state. */ tex_mx.current_row = 0; - loop_state.current_depth = 0; - loop_state.current_reg = 0; + state.current_loop_depth = 0; + state.current_loop_reg = 0; + state.in_subroutine = FALSE; ctx.shader = shader; ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; - ctx.loop_state = &loop_state; + ctx.state = &state; ctx.backend_data = backend_ctx; ins.ctx = &ctx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e6dcb0..859b89f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -900,10 +900,11 @@ struct wined3d_shader_tex_mx DWORD texcoord_w[2]; }; -struct wined3d_shader_loop_state +struct wined3d_shader_parser_state { - UINT current_depth; - UINT current_reg; + unsigned int current_loop_depth; + unsigned int current_loop_reg; + BOOL in_subroutine; }; struct wined3d_shader_context @@ -913,7 +914,7 @@ struct wined3d_shader_context const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; - struct wined3d_shader_loop_state *loop_state; + struct wined3d_shader_parser_state *state; void *backend_data; };

1 0

Andrew Wesie : d3d10core/tests: Add test for return in a conditional.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: cf38e53900b7e90419e9aa19c9bd71f8ba3e0add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf38e53900b7e90419e9aa19c… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Dec 7 12:42:57 2016 +0100 d3d10core/tests: Add test for return in a conditional. 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 | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f278f42..778f33c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9970,6 +9970,88 @@ static void test_stencil_separate(void) release_test_context(&test_context); } +static void test_sm4_ret_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + struct uvec4 constant; + ID3D10Device *device; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint c; + + float4 main() : SV_TARGET + { + if (c == 1) + return float4(1, 0, 0, 1); + if (c == 2) + return float4(0, 1, 0, 1); + if (c == 3) + return float4(0, 0, 1, 1); + return float4(1, 1, 1, 1); + } +#endif + 0x43425844, 0x9ee6f808, 0xe74009f3, 0xbb1adaf2, 0x432e97b5, 0x00000001, 0x000001c4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x0000014c, 0x00000040, 0x00000053, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, + 0x00000001, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0304001f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, + 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x00004001, 0x00000003, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + constant.x = 1; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + constant.x = 2; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + constant.x = 3; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + constant.x = 4; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10026,4 +10108,5 @@ START_TEST(device) test_ddy(); test_shader_input_registers_limits(); test_stencil_separate(); + test_sm4_ret_instruction(); }

1 0

Andrew Wesie : d3d11/tests: Add test for return in a conditional.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 809ad52ae6c4d762ca568487cf9c240af4f592bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=809ad52ae6c4d762ca568487c… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Dec 7 12:42:56 2016 +0100 d3d11/tests: Add test for return in a conditional. 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 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d8fc21e..7c6e875 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11690,6 +11690,90 @@ static void test_uav_load(void) release_test_context(&test_context); } +static void test_sm4_ret_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + struct uvec4 constant; + ID3D11Device *device; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint c; + + float4 main() : SV_TARGET + { + if (c == 1) + return float4(1, 0, 0, 1); + if (c == 2) + return float4(0, 1, 0, 1); + if (c == 3) + return float4(0, 0, 1, 1); + return float4(1, 1, 1, 1); + } +#endif + 0x43425844, 0x9ee6f808, 0xe74009f3, 0xbb1adaf2, 0x432e97b5, 0x00000001, 0x000001c4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x0000014c, 0x00000040, 0x00000053, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, + 0x00000001, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0304001f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, + 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x00004001, 0x00000003, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + constant.x = 1; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + constant.x = 2; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + constant.x = 3; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + constant.x = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -11754,4 +11838,5 @@ START_TEST(d3d11) test_shader_input_registers_limits(); test_stencil_separate(); test_uav_load(); + test_sm4_ret_instruction(); }

1 0

Hans Leidekker : rpcrt4/tests: Also register a firewall exception for the rpc test.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: b621973c47e5588c13d1ca4191c48dbfa9398c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b621973c47e5588c13d1ca419… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:24:47 2016 +0100 rpcrt4/tests: Also register a firewall exception for the rpc test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 147 ++++++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 2edae0b..36b3de9 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS #include <ntstatus.h> #define WIN32_NO_STATUS #include "wine/test.h" @@ -30,7 +31,10 @@ #include <winnt.h> #include <winerror.h> #include <ole2.h> +#include <oleauto.h> #include <ntsecapi.h> +#include <initguid.h> +#include <netfw.h> #include "rpc.h" #include "rpcdce.h" @@ -1061,15 +1065,142 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %u\n", protseq, status); } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST( rpc ) { static unsigned char ncacn_np[] = "ncacn_np"; static unsigned char ncalrpc[] = "ncalrpc"; static unsigned char np_address[] = "."; + BOOL firewall_enabled = is_firewall_enabled(); + + if (firewall_enabled && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } UuidConversionAndComparison(); TestDceErrorInqText(); - test_rpc_ncacn_ip_tcp(); test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); @@ -1080,7 +1211,21 @@ START_TEST( rpc ) test_RpcBindingFree(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + + test_rpc_ncacn_ip_tcp(); test_RpcServerUseProtseq(); test_endpoint_mapper(ncacn_np, np_address); test_endpoint_mapper(ncalrpc, NULL); + + if (firewall_enabled) set_firewall(APP_REMOVE); } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index c196c79..290e7de 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -24,7 +24,6 @@ #include <oleauto.h> #include <secext.h> #include <rpcdce.h> -#include <initguid.h> #include <netfw.h> #include "wine/test.h" #include "server.h"

1 0

Józef Kucia : wined3d: Implement return instruction.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: b9b8e775ea97a800264fda59717faac7af3f3562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b8e775ea97a800264fda597… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:55 2016 +0100 wined3d: Implement return instruction. Based on a patch by Andrew Wesie. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 +- dlls/d3d11/tests/d3d11.c | 6 +- dlls/wined3d/glsl_shader.c | 150 ++++++++++++++++++++++++++++-------------- 3 files changed, 106 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9b8e775ea97a800264fd…

1 0

Hans Leidekker : rpcrt4/tests: Merge rpc_protseq.c into rpc.c.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: dd62188627e55f09e04929a872d94dafbe3dacf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd62188627e55f09e04929a87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:24:46 2016 +0100 rpcrt4/tests: Merge rpc_protseq.c into rpc.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 1 - dlls/rpcrt4/tests/rpc.c | 159 +++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/rpc_protseq.c | 205 ---------------------------------------- 3 files changed, 159 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd62188627e55f09e0492…

1 0

Bruno Jesus : msvfw32: Remove duplicated debug.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 15840d9683d050ace9dc6db52c948824f1f72a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15840d9683d050ace9dc6db52… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 7 16:42:13 2016 -0200 msvfw32: Remove duplicated debug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index cc5c85d..d49ea74 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -621,7 +621,6 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) lstrcpyW(picinfo->szDriver, ii.szDriver); } - TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -818,8 +817,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - TRACE("-> %s\n",wine_dbgstr_icerr(ret)); - return ret; }

1 0

Józef Kucia : d3d9/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 49f6aa32ef088460f982250d344db8a0e96307e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f6aa32ef088460f982250d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:00 2016 +0100 d3d9/tests: Add test showing that primitive restart must be disabled. 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/d3d9/tests/visual.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e25e85c..b1916c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22018,13 +22018,13 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), &data, 0); ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); memcpy(data, green_quad, sizeof(green_quad)); hr = IDirect3DVertexBuffer9_Unlock(vb); ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); - hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer9_Unlock(ib); @@ -22032,7 +22032,7 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetIndices(device, ib); ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*green_quad)); ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); @@ -22068,6 +22068,157 @@ static void test_evict_bound_resources(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D9. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + struct vertex *vb_data; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + D3DCAPS9 caps; + HWND window; + void *data; + HRESULT hr; + BOOL warp; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, vertex_count, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22194,4 +22345,5 @@ START_TEST(visual) test_line_antialiasing_blending(); test_dsy(); test_evict_bound_resources(); + test_max_index16(); }

1 0

Józef Kucia : d3d8/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 30b8fb0f76d0941fd609365c755d857d42cd9cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b8fb0f76d0941fd609365c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:59 2016 +0100 d3d8/tests: Add test showing that primitive restart must be disabled. 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/d3d8/tests/visual.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 34d34b1..bf7058c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9528,6 +9528,158 @@ static void test_edge_antialiasing_blending(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D8. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER8 identifier; + IDirect3DVertexBuffer8 *vb; + IDirect3DIndexBuffer8 *ib; + IDirect3DDevice8 *device; + struct vertex *vb_data; + IDirect3D8 *d3d8; + ULONG refcount; + D3DCOLOR color; + D3DCAPS8 caps; + HWND window; + BYTE *data; + HRESULT hr; + BOOL warp; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(green_quad), (BYTE **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, vertex_count, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9596,4 +9748,5 @@ START_TEST(visual) test_texture_blending(); test_color_clamping(); test_edge_antialiasing_blending(); + test_max_index16(); }

1 0

Julian Rüger : German translation for release 1.9.21
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: 75cfd42fdc3724e5d8656471d35e11528e77a86e URL: http://source.winehq.org/git/website.git/?a=commit;h=75cfd42fdc3724e5d86564… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:52:34 2016 +0100 German translation for release 1.9.21 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016101401.xml b/news/de/2016101401.xml new file mode 100644 index 0000000..67d22b4 --- /dev/null +++ b/news/de/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>14. Oktober 2016</date> +<title>Wine 1.9.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erste Version eines HID-Minitreibers.</li> + <li>Unterstützung von Listen im RichEdit-Steuerelement.</li> + <li>Systray-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

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

Dec. 8, 2016

Module: website Branch: master Commit: fe24e474cc6d60f8faf1b833fa61d54163d20c02 URL: http://source.winehq.org/git/website.git/?a=commit;h=fe24e474cc6d60f8faf1b8… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 16:06:16 2016 +0100 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016112501.xml b/news/de/2016112501.xml new file mode 100644 index 0000000..4d73e88 --- /dev/null +++ b/news/de/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>25. November 2016</date> +<title>Wine 1.9.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von ungeordneten View-Zugriffen in Direct3D.</li> + <li>Viele Fehlerkorrekturen in den Regressionstests.</li> + <li>Kleinere Verbesserungen an der HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.23
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: e4a52d13f83c2d6a791875f69e6b0ceae501bb00 URL: http://source.winehq.org/git/website.git/?a=commit;h=e4a52d13f83c2d6a791875… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:58:35 2016 +0100 German translation for release 1.9.23 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016111101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016111101.xml b/news/de/2016111101.xml new file mode 100644 index 0000000..1bb8eed --- /dev/null +++ b/news/de/2016111101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. November 2016</date> +<title>Wine 1.9.23 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.23 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.23">Neuerungen (en)</a> in dieser Version: +<ul> + <li>HID-Bus-Unterstützung für MacOS.</li> + <li>Farbschriftartenunterstützung in Direct2D.</li> + <li>Weitere Farbformate in Direct3D.</li> + <li>Deinstallations-Korrekturen in MSI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.23.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.22
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: 3ff05e9fdcbf5ac270b46463b249c7f9a919c9d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ff05e9fdcbf5ac270b464… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:55:41 2016 +0100 German translation for release 1.9.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016102801.xml b/news/de/2016102801.xml new file mode 100644 index 0000000..e0d57c0 --- /dev/null +++ b/news/de/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. Oktober 2016</date> +<title>Wine 1.9.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Clipboard-Unterstützung unter MacOS an das neue Design angepasst.</li> + <li>Erste Implementierung von Bitmap-Rendering in Direct2D.</li> + <li>Weitere Implementierung von WebServices.</li> + <li>Weitere Fortschritte in Richtung HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Aric Stewart : hid: Initialize outgoing usages in HidP_GetUsages.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 78a547a11ce0b15e8dde7b1b50900c36c2adf1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a547a11ce0b15e8dde7b1b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:32:20 2016 -0600 hid: Initialize outgoing usages 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index cac9d4e..56616b4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -278,6 +278,8 @@ 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) return HIDP_STATUS_INVALID_PREPARSED_DATA;

1 0

Bruno Jesus : xinput1_3/tests: Explain an important test and fix remaining style issues.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 547d9491af58a8626fafb18da9e4942911bf9155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d9491af58a8626fafb18da… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:34 2016 -0200 xinput1_3/tests: Explain an important test and fix remaining style issues. It's important to explain why the test is done like that so in the future nobody changes it without knowing the impacts. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f08acff..eb0bab3 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -50,7 +50,7 @@ static void test_set_state(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); @@ -59,6 +59,9 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + /* Disabling XInput here, queueing a vibration and then re-enabling XInput + * is used to prove that vibrations are auto enabled when resuming XInput. + * If XInputEnable is removed the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; @@ -133,7 +136,7 @@ static void test_get_keystroke(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); @@ -158,7 +161,7 @@ static void test_get_capabilities(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -188,7 +191,7 @@ static void test_get_dsoundaudiodevice(void) GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); @@ -221,7 +224,7 @@ static void test_get_batteryinformation(void) DWORD result; XINPUT_BATTERY_INFORMATION batteryInfo; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION));

1 0

Aric Stewart : hidclass.sys: Some descriptor values should be unsigned.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: b5646efe398712e0295e85ec1173822d678521b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5646efe398712e0295e85ec1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 13:11:49 2016 -0600 hidclass.sys: Some descriptor values should be unsigned. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9805511..c20e51d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -383,7 +383,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) } } -static int getValue(int bsize, int source) +static int getValue(int bsize, int source, BOOL allow_negative) { int mask = 0xff; int negative = 0x80; @@ -401,7 +401,7 @@ static int getValue(int bsize, int source) outofrange = (outofrange<<8); } value = (source&mask); - if (value&negative) + if (allow_negative && value&negative) value = -1 * (outofrange - value); return value; } @@ -566,34 +566,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l switch(bTag) { case TAG_GLOBAL_USAGE_PAGE: - caps->UsagePage = getValue(bSize, itemVal); + caps->UsagePage = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_LOGICAL_MINIMUM: - caps->LogicalMin = getValue(bSize, itemVal); + caps->LogicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_LOGICAL_MAXIMUM: - caps->LogicalMax = getValue(bSize, itemVal); + caps->LogicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MINIMUM: - caps->PhysicalMin = getValue(bSize, itemVal); + caps->PhysicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MAXIMUM: - caps->PhysicalMax = getValue(bSize, itemVal); + caps->PhysicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT_EXPONENT: - caps->UnitsExp = getValue(bSize, itemVal); + caps->UnitsExp = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT: - caps->Units = getValue(bSize, itemVal); + caps->Units = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_REPORT_SIZE: - caps->BitSize = getValue(bSize, itemVal); + caps->BitSize = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_ID: - caps->ReportID = getValue(bSize, itemVal); + caps->ReportID = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_COUNT: - caps->ReportCount = getValue(bSize, itemVal); + caps->ReportCount = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_PUSH: { @@ -633,46 +633,46 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l FIXME("More than %i individual usages defined\n",USAGE_MAX); else { - caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal); + caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal, FALSE); caps->IsRange = FALSE; } break; case TAG_LOCAL_USAGE_MINIMUM: caps->usage_count = 1; - caps->u.Range.UsageMin = getValue(bSize, itemVal); + caps->u.Range.UsageMin = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_USAGE_MAXIMUM: caps->usage_count = 1; - caps->u.Range.UsageMax = getValue(bSize, itemVal); + caps->u.Range.UsageMax = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_INDEX: - caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal); + caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = FALSE; break; case TAG_LOCAL_DESIGNATOR_MINIMUM: - caps->u.Range.DesignatorMin = getValue(bSize, itemVal); + caps->u.Range.DesignatorMin = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_MAXIMUM: - caps->u.Range.DesignatorMax = getValue(bSize, itemVal); + caps->u.Range.DesignatorMax = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_STRING_INDEX: - caps->u.NotRange.StringIndex = getValue(bSize, itemVal); + caps->u.NotRange.StringIndex = getValue(bSize, itemVal, FALSE); caps->IsStringRange = FALSE; break; case TAG_LOCAL_STRING_MINIMUM: - caps->u.Range.StringMin = getValue(bSize, itemVal); + caps->u.Range.StringMin = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_STRING_MAXIMUM: - caps->u.Range.StringMax = getValue(bSize, itemVal); + caps->u.Range.StringMax = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - caps->Delim = getValue(bSize, itemVal); + caps->Delim = getValue(bSize, itemVal, FALSE); break; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType);

1 0

Bruno Jesus : explorer: Ensure launchers_per_row is at least 1 as it is used in divisions.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 3eaf58614921cafd5e1413d1bec388ae57d25183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaf58614921cafd5e1413d1b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 21:32:27 2016 -0200 explorer: Ensure launchers_per_row is at least 1 as it is used in divisions. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d306bb9..7a8252f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -555,6 +555,7 @@ static void initialize_launchers( HWND hwnd ) title_offset_cy = BORDER_SIZE + icon_size + PADDING_SIZE; desktop_width = GetSystemMetrics( SM_CXSCREEN ); launchers_per_row = desktop_width / launcher_size; + if (!launchers_per_row) launchers_per_row = 1; hr = SHGetKnownFolderPath( &FOLDERID_Desktop, KF_FLAG_CREATE, NULL, &desktop_folder ); if (FAILED( hr ))

1 0

Hugh McMaster : reg/tests: Add Unicode tests for comment parsing.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 896c5205d96c7f4b62e507ebeb974cd7d5f372e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896c5205d96c7f4b62e507ebe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:22 2016 +0000 reg/tests: Add Unicode tests for comment parsing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b9d446d..f19f6f7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1246,6 +1246,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " #comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " ;comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Add tests for parsing comments.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 0a827326b03c87d3542528cc3c70b1ee178c9c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a827326b03c87d3542528cc3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:10 2016 +0000 reg/tests: Add tests for parsing comments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cbd4149..b9d446d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -988,6 +988,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,69,6e,65,20,\\\n" + " #comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,69,6e,65,20,\\\n" + " ;comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for filesystem objects.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: eda5d61c543522c637682a40bb461fab44c9c0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5d61c543522c637682a40b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:59 2016 +0300 scrrun: Added IProvideClassInfo support for filesystem objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 110 ++++++++++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++ 2 files changed, 122 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda5d61c543522c637682…

1 0

Nikolay Sivov : dwrite: Use system default locale when filling LOGFONT.lfFaceName.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: bf23b8a529f5081a278c7beffc92648d6b63c87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23b8a529f5081a278c7beff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:38 2016 +0300 dwrite: Use system default locale when filling LOGFONT.lfFaceName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/tests/font.c | 2 +- include/winnls.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4a6d62c..c666275 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 987eac9..ce4145e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3544,7 +3544,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) /* Fallback to en-us if there's no string for user locale. */ exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); if (!exists) diff --git a/include/winnls.h b/include/winnls.h index 35521fd..96f60de 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -915,6 +915,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD); #define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx) WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void); +WINBASEAPI INT WINAPI GetSystemDefaultLocaleName(LPWSTR,int); WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);

1 0

Bruno Jesus : xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ea4edbe1799ef1a4ebb416cf2fed392e4196880d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4edbe1799ef1a4ebb416cf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:32 2016 -0200 xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 17884e1..25126be 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -175,18 +175,31 @@ static void test_get_dsoundaudiodevice(void) { DWORD controllerNum; DWORD result; - GUID soundRender; - GUID soundCapture; + GUID soundRender, soundCapture; + GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; + GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { + soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetDSoundAudioDeviceGuids failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + if (!IsEqualGUID(&soundRender, &emptyGuid)) + ok(!IsEqualGUID(&soundRender, &testGuid), "Broken GUID returned for sound render device\n"); + else + trace("Headset phone not attached\n"); + + if (!IsEqualGUID(&soundCapture, &emptyGuid)) + ok(!IsEqualGUID(&soundCapture, &testGuid), "Broken GUID returned for sound capture device\n"); + else + trace("Headset microphone not attached\n"); } result = pXInputGetDSoundAudioDeviceGuids(XUSER_MAX_COUNT+1, &soundRender, &soundCapture);

1 0

Hugh McMaster : reg/tests: Add verify_reg_nonexist helper function.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: be3a4c26137dcfe81c80de7aca834f96dea45515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3a4c26137dcfe81c80de7ac… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:47:58 2016 +0000 reg/tests: Add verify_reg_nonexist helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6447d45..cbd4149 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -81,6 +81,16 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); } +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) +static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +{ + LONG err; + + err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); + lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + value, err); +} + static void test_add(void) { HKEY hkey, subkey; @@ -499,18 +509,15 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "bar"); run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + verify_reg_nonexist(hkey, ""); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "foo"); err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); ok(err == ERROR_SUCCESS, "got %d\n", err); RegCloseKey(hsubkey);

1 0

Nikolay Sivov : dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: c22b2192e5710f6a4eacf39b88ece6186c995338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22b2192e5710f6a4eacf39b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:39 2016 +0300 dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 18 +++ dlls/dwrite/gdiinterop.c | 55 +------ dlls/dwrite/tests/font.c | 331 ++++++++++++++++++++++++------------------- 4 files changed, 208 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c22b2192e5710f6a4eacf…

1 0

Bruno Jesus : xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 67eec14ca00214481af8cfdf2bf56f0bd0ddfeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eec14ca00214481af8cfdf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:33 2016 -0200 xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities. Important to show that they changed between XInput versions 1.3 and 1.4. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 25126be..f08acff 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -32,6 +32,18 @@ static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE); static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*); static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); +static void dump_gamepad(XINPUT_GAMEPAD *data) +{ + trace("-- Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", data->wButtons); + trace("Gamepad.bLeftTrigger: %d\n", data->bLeftTrigger); + trace("Gamepad.bRightTrigger: %d\n", data->bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", data->sThumbLX); + trace("Gamepad.sThumbLY: %d\n", data->sThumbLY); + trace("Gamepad.sThumbRX: %d\n", data->sThumbRX); + trace("Gamepad.sThumbRY: %d\n\n", data->sThumbRY); +} + static void test_set_state(void) { XINPUT_VIBRATION vibrator; @@ -96,14 +108,7 @@ static void test_get_state(void) else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - trace("Gamepad Variables --\n"); - trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons); - trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger); - trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger); - trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX); - trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY); - trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX); - trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY); + dump_gamepad(&xinput.state.Gamepad); } } @@ -163,7 +168,11 @@ static void test_get_capabilities(void) if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + /* Important to show that the results changed between 1.3 and 1.4 XInput version */ + dump_gamepad(&capabilities.Gamepad); } ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));

1 0

Aric Stewart : winebus.sys: Handle older kernel headers lacking feature ioctls.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ea9df98c692175065a80f113100f92d13d3cae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9df98c692175065a80f1131… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 13:09:27 2016 -0600 winebus.sys: Handle older kernel headers lacking feature ioctls. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 515ae70..d6bb48a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -319,7 +319,7 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) { -#ifdef HAVE_LINUX_HIDRAW_H +#if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCGFEATURE) int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); report[0] = id; @@ -343,7 +343,7 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { -#ifdef HAVE_LINUX_HIDRAW_H +#if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCSFEATURE) int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer;

1 0

Hugh McMaster : reg/tests: Fix copy/paste errors in some tests.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: a4d892e244943844f7af7ca91a5f8c2a5c7349e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d892e244943844f7af7ca91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:33 2016 +0000 reg/tests: Fix copy/paste errors in some tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f19f6f7..e8a9d80 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -124,19 +124,19 @@ static void test_add(void) run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), - "got exit code %d\n", r); + "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -144,7 +144,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -152,7 +152,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r);

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for dictionary.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ba2e6fb2bec63a0ecb23c29b4f0d61ba57dc8c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2e6fb2bec63a0ecb23c29b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:58 2016 +0300 scrrun: Added IProvideClassInfo support for dictionary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 8 ++++- dlls/scrrun/scrrun.c | 77 ++++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/scrrun_private.h | 8 +++++ dlls/scrrun/tests/dictionary.c | 27 +++++++++++++++ 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 3c8fc82..7ebf4a4 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -65,6 +65,7 @@ struct keyitem_pair { typedef struct { + struct provideclassinfo classinfo; IDictionary IDictionary_iface; LONG ref; @@ -386,6 +387,10 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, { *obj = &This->IDictionary_iface; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } else if ( IsEqualGUID( riid, &IID_IDispatchEx )) { TRACE("Interface IDispatchEx not supported - returning NULL\n"); @@ -404,7 +409,7 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, return E_NOINTERFACE; } - IDictionary_AddRef(iface); + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -901,6 +906,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, list_init(&This->notifier); memset(This->buckets, 0, sizeof(This->buckets)); + init_classinfo(&CLSID_Dictionary, (IUnknown *)&This->IDictionary_iface, &This->classinfo); *obj = &This->IDictionary_iface; return S_OK; diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 5201f1f..42b62b6 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include <initguid.h> @@ -35,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static HINSTANCE scrrun_instance; +static inline struct provideclassinfo *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, struct provideclassinfo, IProvideClassInfo_iface); +} + typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) @@ -118,6 +124,9 @@ static HRESULT load_typelib(void) HRESULT hres; ITypeLib *tl; + if(typelib) + return S_OK; + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); @@ -129,13 +138,21 @@ static HRESULT load_typelib(void) return hres; } +static HRESULT get_typeinfo_of_guid(const GUID *guid, ITypeInfo **tinfo) +{ + HRESULT hres; + + if(FAILED(hres = load_typelib())) + return hres; + + return ITypeLib_GetTypeInfoOfGuid(typelib, guid, tinfo); +} + HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) - hres = load_typelib(); - if (!typelib) + if (FAILED(hres = load_typelib())) return hres; if(!typeinfos[tid]) { @@ -170,6 +187,60 @@ static void release_typelib(void) ITypeLib_Release(typelib); } +static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, REFIID riid, void **obj) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IProvideClassInfo)) { + *obj = iface; + IProvideClassInfo_AddRef(iface); + return S_OK; + } + else + return IUnknown_QueryInterface(This->outer, riid, obj); + + *obj = NULL; + WARN("interface %s not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI provideclassinfo_Release(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI provideclassinfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ti) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%p)\n", This, ti); + + return get_typeinfo_of_guid(This->guid, ti); +} + +static const IProvideClassInfoVtbl provideclassinfovtbl = { + provideclassinfo_QueryInterface, + provideclassinfo_AddRef, + provideclassinfo_Release, + provideclassinfo_GetClassInfo +}; + +void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) +{ + classinfo->IProvideClassInfo_iface.lpVtbl = &provideclassinfovtbl; + classinfo->outer = outer; + classinfo->guid = guid; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 43b20a9..e2023f9 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -38,6 +38,14 @@ typedef enum tid_t HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +struct provideclassinfo { + IProvideClassInfo IProvideClassInfo_iface; + IUnknown *outer; + const GUID *guid; +}; + +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a94782f..78922b7 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -30,6 +30,31 @@ #include "scrrun.h" +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} + static void test_interfaces(void) { static const WCHAR key_add[] = {'a', 0}; @@ -60,6 +85,8 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + test_provideclassinfo(disp, &CLSID_Dictionary); + V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_add); V_VT(&value) = VT_BSTR;

1 0

Hans Leidekker : setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: cdb72f3997174afeb9bc6a8ecafc5de7b5d25afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb72f3997174afeb9bc6a8ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:00 2016 +0100 setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 10 ++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef1a6b7..63e578c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1561,6 +1561,16 @@ BOOL WINAPI SetupDiRemoveDevice( } /*********************************************************************** + * SetupDiRemoveDeviceInterface (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +{ + FIXME("(%p, %p): stub\n", info, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index da6bf5d..0eb8359 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,7 +381,7 @@ @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) -@ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiRemoveDeviceInterface(ptr ptr) @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv

1 0

Hans Leidekker : setupapi/tests: Clean up properly after each device test.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: c84080fb5977284bfd1429ce6ea602fdd33ecab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84080fb5977284bfd1429ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:01 2016 +0100 setupapi/tests: Clean up properly after each device test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 405 +++++++++++------------------------------- 1 file changed, 100 insertions(+), 305 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c84080fb5977284bfd142…

1 0

Nikolay Sivov : scrrun: Improved tracing of IDictionary methods.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 62cb1f8d6fea65259425363ea25fc332d403535f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cb1f8d6fea65259425363ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:57 2016 +0300 scrrun: Improved tracing of IDictionary methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 844b4d1..3c8fc82 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -240,19 +240,19 @@ static HRESULT WINAPI dict_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { list_remove(&This->notify); IDictionary_Release(&This->dict->IDictionary_iface); heap_free(This); @@ -411,20 +411,21 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, static ULONG WINAPI dictionary_AddRef(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)\n", This); + ULONG ref = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + + return ref; } static ULONG WINAPI dictionary_Release(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { IDictionary_RemoveAll(iface); heap_free(This); } @@ -436,7 +437,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -885,7 +886,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, { dictionary *This; - TRACE("(%p)\n", obj); + TRACE("(%p, %p, %s, %p)\n", factory, outer, debugstr_guid(riid), obj); *obj = NULL;

1 0

Hans Leidekker : bcrypt/tests: Add BcryptEncrypt/Decrypt tests.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: fd8f32aa8e0c34b8960246c41915874ce6316f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8f32aa8e0c34b8960246c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 2 18:36:43 2016 -0200 bcrypt/tests: Add BcryptEncrypt/Decrypt tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 173 +++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 3 + 2 files changed, 176 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ae7432e..3e41335 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -916,6 +916,177 @@ static void test_BCryptGenerateSymmetricKey(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_BCryptEncrypt(void) +{ + static UCHAR secret[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR iv[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR data[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10}; + static UCHAR expected[] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; + static UCHAR expected2[] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, + 0x28,0x73,0x3d,0xef,0x84,0x8f,0xb0,0xa6,0x5d,0x1a,0x51,0xb7,0xec,0x8f,0xea,0xe9}; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + UCHAR *buf, ciphertext[32], ivbuf[16]; + ULONG size, len, i; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + if (ret != STATUS_SUCCESS) /* remove whole IF when Wine is fixed */ + { + todo_wine ok(0, "AES provider not available\n"); + return; + } + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* input size is a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + /* input size is not a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected2, sizeof(expected2)), "wrong data\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected2[i], "%u: %02x != %02x\n", i, ciphertext[i], expected2[i]); + + /* output size too small */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + +static void test_BCryptDecrypt(void) +{ + static UCHAR secret[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR iv[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR expected[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR ciphertext[32] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, + 0x28,0x73,0x3d,0xef,0x84,0x8f,0xb0,0xa6,0x5d,0x1a,0x51,0xb7,0xec,0x8f,0xea,0xe9}; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + UCHAR *buf, plaintext[32], ivbuf[16]; + ULONG size, len; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + if (ret != STATUS_SUCCESS) /* remove whole IF when Wine is fixed */ + { + todo_wine ok(0, "AES provider not available\n"); + return; + } + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* input size is a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); + + /* output size too small */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 31, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + /* input size is not a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -953,6 +1124,8 @@ START_TEST(bcrypt) test_rng(); test_aes(); test_BCryptGenerateSymmetricKey(); + test_BCryptEncrypt(); + test_BCryptDecrypt(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); diff --git a/include/bcrypt.h b/include/bcrypt.h index e327a65..05d0691 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,9 @@ typedef PVOID BCRYPT_HASH_HANDLE; /* Flags for BCryptOpenAlgorithmProvider */ #define BCRYPT_ALG_HANDLE_HMAC_FLAG 0x00000008 +/* Flags for BCryptEncrypt/BCryptDecrypt */ +#define BCRYPT_BLOCK_PADDING 0x00000001 + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);

1 0