October 2017 - Wine-commits

Józef Kucia : d3d11/tests: Add test for shaders interstage interface.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 9a5e0bdb3d660f2ee2a6e5ea38ed5af3d0d4bcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5e0bdb3d660f2ee2a6e5ea3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:10 2017 +0200 d3d11/tests: Add test for shaders interstage interface. 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 | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8df683e..163d1a2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11970,6 +11970,167 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_shader_interstage_interface(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + ID3D11Texture2D *render_target; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + UINT stride, offset; + ID3D11Buffer *vb; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_Position; + float2 t0 : TEXCOORD0; + nointerpolation float t1 : TEXCOORD1; + uint t2 : TEXCOORD2; + uint t3 : TEXCOORD3; + float t4 : TEXCOORD4; + }; + + void main(in vertex vin, out vertex vout) + { + vout = vin; + } +#endif + 0x43425844, 0xd55780bf, 0x76866b06, 0x45d697a2, 0xafac2ecd, 0x00000001, 0x000002bc, 0x00000003, + 0x0000002c, 0x000000e4, 0x0000019c, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000a4, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000101, 0x000000a4, + 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000101, 0x000000a4, 0x00000004, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x00000c03, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000b04, 0x000000a4, + 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x000000a4, 0x00000002, 0x00000000, + 0x00000001, 0x00000002, 0x00000d02, 0x000000a4, 0x00000003, 0x00000000, 0x00000001, 0x00000002, + 0x00000b04, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, + 0x00000118, 0x00010040, 0x00000046, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101032, + 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, + 0x00101012, 0x00000004, 0x0300005f, 0x00101012, 0x00000005, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102042, 0x00000001, 0x03000065, + 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x03000065, 0x00102042, 0x00000002, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032, 0x00000001, + 0x00101046, 0x00000001, 0x05000036, 0x00102042, 0x00000001, 0x0010100a, 0x00000005, 0x05000036, + 0x00102012, 0x00000002, 0x0010100a, 0x00000002, 0x05000036, 0x00102022, 0x00000002, 0x0010100a, + 0x00000003, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000004, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, + nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2, + uint t3 : TEXCOORD3, float t4 : TEXCOORD4, out float4 o : SV_Target) + { + o.x = t0.y + t1; + o.y = t2 + t3; + o.z = t4; + o.w = t0.x; + } +#endif + 0x43425844, 0x8a7ef706, 0xc8f2cbf1, 0x83a05df1, 0xfab8e613, 0x00000001, 0x000001dc, 0x00000003, + 0x0000002c, 0x000000e4, 0x00000118, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, + 0x00000404, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000101, 0x000000a4, + 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x000000a4, 0x00000003, 0x00000000, + 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000bc, + 0x00000040, 0x0000002f, 0x03001062, 0x00101032, 0x00000001, 0x03001062, 0x00101042, 0x00000001, + 0x03000862, 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862, 0x00101042, + 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e, 0x00100012, + 0x00000000, 0x0010101a, 0x00000002, 0x0010102a, 0x00000002, 0x05000056, 0x00102022, 0x00000000, + 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, + 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 2, DXGI_FORMAT_R32_UINT, 0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 3, DXGI_FORMAT_R32_UINT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 4, DXGI_FORMAT_R32_FLOAT, 0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec2 position; + struct vec2 t0; + float t1; + unsigned int t2; + unsigned int t3; + float t4; + } + quad[] = + { + {{-1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{-1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f}; + + 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 pixel shader, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &render_target); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)render_target, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, white); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + offset = 0; + stride = sizeof(*quad); + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_Draw(context, 4, 0); + check_texture_vec4(render_target, &expected_result, 0); + + ID3D11InputLayout_Release(input_layout); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(render_target); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11Buffer_Release(vb); + release_test_context(&test_context); +} + static void test_sm4_if_instruction(void) { struct d3d11_test_context test_context; @@ -21341,6 +21502,7 @@ START_TEST(d3d11) test_cb_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching(); + test_shader_interstage_interface(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction();

1 0

Alex Henrie : wininet/tests: Skip cookie attributes tests on IE < 8.0.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 16226c44dadec1b08042b93d4c2ce7044b7cb5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16226c44dadec1b08042b93d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:54:17 2017 -0600 wininet/tests: Skip cookie attributes tests on IE < 8.0. INTERNET_COOKIE_HTTPONLY was introduced in IE 8.0. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b43d01..dd15a4b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -565,7 +565,7 @@ static void test_cookie_attrs(void) DWORD size, state; BOOL ret; - if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "InternetGetSecurityInfoByURLA")) { + if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "DeleteWpadCacheForNetworks")) { win_skip("Skipping cookie attributes tests. Too old IE.\n"); return; }

1 0

Hans Leidekker : webservices: Fix handling of namespace attributes in WsWriteNode.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 6d2f4471ed541abeb3c8377a74b7736c5517f494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2f4471ed541abeb3c8377a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 17 11:37:27 2017 +0200 webservices: Fix handling of namespace attributes in WsWriteNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1baac07..f6917c6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4472,9 +4472,20 @@ static HRESULT write_set_attributes( struct writer *writer, WS_XML_ATTRIBUTE **a for (i = 0; i < count; i++) { - if ((hr = write_add_attribute( writer, attrs[i]->prefix, attrs[i]->localName, attrs[i]->ns, - attrs[i]->singleQuote )) != S_OK) return hr; - if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + const WS_XML_STRING *prefix = attrs[i]->prefix; + const WS_XML_STRING *localname = attrs[i]->localName; + const WS_XML_STRING *ns = attrs[i]->ns; + BOOL single = attrs[i]->singleQuote; + + if (attrs[i]->isXmlNs) + { + if ((hr = add_namespace_attribute( writer, prefix, ns, single )) != S_OK) return hr; + } + else + { + if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) != S_OK) return hr; + if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + } } return S_OK; }

1 0

Alexandre Julliard : user32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 3dd6046d7c641d0096d790d400b0953ddb2429db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd6046d7c641d0096d790d40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:14:28 2017 +0200 user32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_appstarting.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_cross.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_cross.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_hand.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_hand.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_help.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_ibeam.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_ibeam.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_no.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_normal.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_pen.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_pen.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_size.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_size.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizeall.cur | Bin 35374 -> 35374 bytes dlls/user32/resources/ocr_sizeall.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizenesw.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizens.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_sizens.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizenwse.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizewe.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_sizewe.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_up.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_up.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_wait.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_wait.svg | 28 +++++++++++++++++++++------- tools/buildimage | 11 +++++++++-- 27 files changed, 345 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd6046d7c641d0096d79…

1 0

Alexandre Julliard : ole32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 0a199813d9f44adf279c26827f5afc3df8902b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a199813d9f44adf279c26827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:21:47 2017 +0200 ole32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/drag_copy.svg | 28 +++++++++++++++++++++------- dlls/ole32/drag_link.svg | 28 +++++++++++++++++++++------- dlls/ole32/drag_move.svg | 28 +++++++++++++++++++++------- dlls/ole32/nodrop.svg | 28 +++++++++++++++++++++------- 4 files changed, 84 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/drag_copy.svg b/dlls/ole32/drag_copy.svg index 42867cb..deb126f 100644 --- a/dlls/ole32/drag_copy.svg +++ b/dlls/ole32/drag_copy.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/drag_link.svg b/dlls/ole32/drag_link.svg index 0b1dc7e..e8a1c0e 100644 --- a/dlls/ole32/drag_link.svg +++ b/dlls/ole32/drag_link.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/drag_move.svg b/dlls/ole32/drag_move.svg index 2f2514b..66045e7 100644 --- a/dlls/ole32/drag_move.svg +++ b/dlls/ole32/drag_move.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/nodrop.svg b/dlls/ole32/nodrop.svg index cb5a0f0..481a7b4 100644 --- a/dlls/ole32/nodrop.svg +++ b/dlls/ole32/nodrop.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot;32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054"

1 0

Alexandre Julliard : riched20: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 70eef947a1bf27dc8f5e2ad5e7c35294c9e5b29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eef947a1bf27dc8f5e2ad5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:23:18 2017 +0200 riched20: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/ocr_reverse.cur | Bin 33134 -> 33134 bytes dlls/riched20/ocr_reverse.svg | 28 +++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/ocr_reverse.cur b/dlls/riched20/ocr_reverse.cur index f6b5ca2..6392093 100644 Binary files a/dlls/riched20/ocr_reverse.cur and b/dlls/riched20/ocr_reverse.cur differ diff --git a/dlls/riched20/ocr_reverse.svg b/dlls/riched20/ocr_reverse.svg index a6a356a..d88aceb 100644 --- a/dlls/riched20/ocr_reverse.svg +++ b/dlls/riched20/ocr_reverse.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="27" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="20" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="13" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="13" - style="fill:none" /> <g id="g4928" transform="matrix(1.9642525,0,0,1.9642525,-194.7906,458.0998)">

1 0

Alexandre Julliard : comctl32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 4d577f9662c9de5207ff944736fa4e0eb84f2675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d577f9662c9de5207ff94473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:26:26 2017 +0200 comctl32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/idc_copy.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_divider.cur | Bin 33134 -> 33134 bytes dlls/comctl32/idc_divider.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_divideropen.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_movebutton.svg | 28 +++++++++++++++++++++------- 5 files changed, 84 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/idc_copy.svg b/dlls/comctl32/idc_copy.svg index 70a21ac..6bd0de6 100644 --- a/dlls/comctl32/idc_copy.svg +++ b/dlls/comctl32/idc_copy.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/comctl32/idc_divider.cur b/dlls/comctl32/idc_divider.cur index 9627a9d..0ec6178 100644 Binary files a/dlls/comctl32/idc_divider.cur and b/dlls/comctl32/idc_divider.cur differ diff --git a/dlls/comctl32/idc_divider.svg b/dlls/comctl32/idc_divider.svg index 337c0f2..6c12913 100644 --- a/dlls/comctl32/idc_divider.svg +++ b/dlls/comctl32/idc_divider.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="18" + x="20" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="14" + x="15" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="9" + x="10" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="9" - x="10" - style="fill:none" /> <g style="display:inline;opacity:1" id="g8966" diff --git a/dlls/comctl32/idc_divideropen.svg b/dlls/comctl32/idc_divideropen.svg index cdf13a5..3046974 100644 --- a/dlls/comctl32/idc_divideropen.svg +++ b/dlls/comctl32/idc_divideropen.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="18" + x="26" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="13" + x="19" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="9" + x="13" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="9" - x="13" - style="fill:none" /> <g style="display:inline;opacity:1" id="g8966" diff --git a/dlls/comctl32/idc_movebutton.svg b/dlls/comctl32/idc_movebutton.svg index acd23d6..91cf866 100644 --- a/dlls/comctl32/idc_movebutton.svg +++ b/dlls/comctl32/idc_movebutton.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="20" + x="28" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="15" + x="21" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="10" + x="14" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="10" - x="14" - style="fill:none" /> <g id="g6096" transform="matrix(1.704871,0,0,1.7043829,-121.23079,-1354.1285)"

1 0

Alexandre Julliard : wordpad: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 86aad73177f70eb4c759d3f2ddbf86b762a19ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86aad73177f70eb4c759d3f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:26:37 2017 +0200 wordpad: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/zoom.cur | Bin 33134 -> 33134 bytes programs/wordpad/zoom.svg | 28 +++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/zoom.cur b/programs/wordpad/zoom.cur index eb2d01d..adb941c 100644 Binary files a/programs/wordpad/zoom.cur and b/programs/wordpad/zoom.cur differ diff --git a/programs/wordpad/zoom.svg b/programs/wordpad/zoom.svg index 516d23d..4154186 100644 --- a/programs/wordpad/zoom.svg +++ b/programs/wordpad/zoom.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="15" + x="15" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="11" + x="11" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="7" + x="7" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="7" - x="7" - style="fill:none" /> <g style="display:inline;opacity:1;stroke-width:0.95640075" transform="matrix(1.902027,0,0,1.902027,-431.17055,-1616.8392)"

1 0

Andrey Gusev : winepulse.drv: Remove redundant comparison.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: d9131acb895bc777379e92bb843a7a41d62c5226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9131acb895bc777379e92bb8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 13 17:15:02 2017 +0300 winepulse.drv: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f6946ce..50b4188 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -611,7 +611,7 @@ fail: static HRESULT pulse_stream_valid(ACImpl *This) { if (!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - if (!This->stream || pa_stream_get_state(This->stream) != PA_STREAM_READY) + if (pa_stream_get_state(This->stream) != PA_STREAM_READY) return AUDCLNT_E_DEVICE_INVALIDATED; return S_OK; }

1 0

Piotr Caban : msvcp120: Fix _Xtime_diff_to_millis2 overflow behavior.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 1d35db9f570490b664f97d3b7e5152be4f07fcb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d35db9f570490b664f97d3b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 17 17:08:15 2017 +0200 msvcp120: Fix _Xtime_diff_to_millis2 overflow behavior. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1dcc590..9f26a48 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -362,6 +362,7 @@ void __thiscall _Container_base12__Swap_all( #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) #define NANOSEC_PER_MILLISEC 1000000 #define MILLISEC_PER_SEC 1000 +#define NANOSEC_PER_SEC (NANOSEC_PER_MILLISEC * MILLISEC_PER_SEC) typedef int MSVCRT_long; @@ -401,16 +402,24 @@ int __cdecl xtime_get(xtime* t, int unknown) /* _Xtime_diff_to_millis2 */ MSVCRT_long __cdecl _Xtime_diff_to_millis2(const xtime *t1, const xtime *t2) { - __time64_t diff_sec; - MSVCRT_long diff_nsec, ret; + LONGLONG diff_sec, diff_nsec; TRACE("(%p, %p)\n", t1, t2); diff_sec = t1->sec - t2->sec; diff_nsec = t1->nsec - t2->nsec; - ret = diff_sec * MILLISEC_PER_SEC + - (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; - return ret > 0 ? ret : 0; + + diff_sec += diff_nsec / NANOSEC_PER_SEC; + diff_nsec %= NANOSEC_PER_SEC; + if (diff_nsec < 0) { + diff_sec -= 1; + diff_nsec += NANOSEC_PER_SEC; + } + + if (diff_sec<0 || (diff_sec==0 && diff_nsec<0)) + return 0; + return diff_sec * MILLISEC_PER_SEC + + (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; } /* _Xtime_diff_to_millis */

1 0