February 2017 - Wine-Commits

Alistair Leslie-Hughes : dxgi: Silence a noisy fixme.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: a55cf3586d5f8f1b16954dc50fc4500c2f2b9ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55cf3586d5f8f1b16954dc50… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 04:38:22 2017 +0000 dxgi: Silence a noisy fixme. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 0cf8084..737ba29 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -268,7 +268,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput *iface) { - FIXME("iface %p stub!\n", iface); + static BOOL once = FALSE; + + if (!once++) + FIXME("iface %p stub!\n", iface); + else + TRACE("iface %p stub!\n", iface); return E_NOTIMPL; }

1 0

Louis Lenders : virtdisk: Add stub dll.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: e0d4b6896aa4158407826faf4775bed09de78913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d4b6896aa4158407826faf4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 2 20:41:20 2017 +0100 virtdisk: Add stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/virtdisk/Makefile.in | 4 ++++ dlls/virtdisk/virtdisk.spec | 21 ++++++++++++++++++++ dlls/virtdisk/virtdisk_main.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/configure b/configure index b2ec13a..1cac4e0 100755 --- a/configure +++ b/configure @@ -1439,6 +1439,7 @@ enable_vcomp90 enable_vcruntime140 enable_vdmdbg enable_version +enable_virtdisk enable_vssapi enable_wbemdisp enable_wbemprox @@ -18365,6 +18366,7 @@ wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 wine_fn_config_dll version enable_version implib wine_fn_config_test dlls/version/tests version_test +wine_fn_config_dll virtdisk enable_virtdisk wine_fn_config_dll vmm.vxd enable_win16 wine_fn_config_dll vnbt.vxd enable_win16 wine_fn_config_dll vnetbios.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 43f19de..cae8d72 100644 --- a/configure.ac +++ b/configure.ac @@ -3423,6 +3423,7 @@ WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) WINE_CONFIG_DLL(version,,[implib]) WINE_CONFIG_TEST(dlls/version/tests) +WINE_CONFIG_DLL(virtdisk) WINE_CONFIG_DLL(vmm.vxd,enable_win16) WINE_CONFIG_DLL(vnbt.vxd,enable_win16) WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in new file mode 100644 index 0000000..b91f0e2 --- /dev/null +++ b/dlls/virtdisk/Makefile.in @@ -0,0 +1,4 @@ +MODULE = virtdisk.dll + +C_SRCS = \ + virtdisk_main.c diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec new file mode 100644 index 0000000..2946b66 --- /dev/null +++ b/dlls/virtdisk/virtdisk.spec @@ -0,0 +1,21 @@ +@ stub AddVirtualDiskParent +@ stub AttachVirtualDisk +@ stub BreakMirrorVirtualDisk +@ stub CompactVirtualDisk +@ stub CreateVirtualDisk +@ stub DeleteVirtualDiskMetadata +@ stub DetachVirtualDisk +@ stub EnumerateVirtualDiskMetadata +@ stub ExpandVirtualDisk +@ stub GetAllAttachedVirtualDiskPhysicalPaths +@ stub GetStorageDependencyInformation +@ stub GetVirtualDiskInformation +@ stub GetVirtualDiskMetadata +@ stub GetVirtualDiskOperationProgress +@ stub GetVirtualDiskPhysicalPath +@ stub MergeVirtualDisk +@ stub MirrorVirtualDisk +@ stub OpenVirtualDisk +@ stub ResizeVirtualDisk +@ stub SetVirtualDiskInformation +@ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c new file mode 100644 index 0000000..0da0dca --- /dev/null +++ b/dlls/virtdisk/virtdisk_main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2017 Louis Lenders + * + * 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" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(virtdisk); + +/***************************************************** + * DllMain (VIRTDISK.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + + return TRUE; +}

1 0

Józef Kucia : wined3d: Implement SM5 store_uav_typed instruction.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 94a214b2bbf8f486619bc0d1d88003b2f6f3b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a214b2bbf8f486619bc0d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 8 11:54:15 2017 +0100 wined3d: Implement SM5 store_uav_typed instruction. 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 | 10 +++++----- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca27354..da5b02c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12776,18 +12776,18 @@ static void test_ps_cs_uav_binding(void) check_texture_float(ps_texture, 0.0f, 2); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 1.0f, 2); - todo_wine check_texture_float(ps_texture, 1.0f, 2); + check_texture_float(ps_texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); todo_wine check_texture_float(cs_texture, 0.5f, 2); - todo_wine check_texture_float(ps_texture, 1.0f, 2); + check_texture_float(ps_texture, 1.0f, 2); input.x = 2.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 0.5f, 2); - todo_wine check_texture_float(ps_texture, 2.0f, 2); + check_texture_float(ps_texture, 2.0f, 2); input.x = 8.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); @@ -12795,10 +12795,10 @@ static void test_ps_cs_uav_binding(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); todo_wine check_texture_float(cs_texture, 8.0f, 2); - todo_wine check_texture_float(ps_texture, 2.0f, 2); + check_texture_float(ps_texture, 2.0f, 2); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 8.0f, 2); - todo_wine check_texture_float(ps_texture, 4.0f, 2); + check_texture_float(ps_texture, 4.0f, 2); ID3D11ComputeShader_Release(cs); ID3D11PixelShader_Release(ps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e47d18b..2663403 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4922,7 +4922,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); - resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + return; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; @@ -4968,6 +4968,38 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } +static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; + struct glsl_src_param image_coord_param, image_data_param; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type data_type; + unsigned int uav_idx; + DWORD coord_mask; + + uav_idx = ins->dst[0].reg.idx[0].offset; + if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", uav_idx); + return; + } + resource_type = reg_maps->uav_resource_info[uav_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + data_type = reg_maps->uav_resource_info[uav_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); + shader_addline(ins->ctx->buffer, "imageStore(%s_image%u, %s, %s);\n", + shader_glsl_get_prefix(version->type), uav_idx, + image_coord_param.param_str, image_data_param.param_str); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9094,7 +9126,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_STRUCTURED */ NULL, - /* WINED3DSIH_STORE_UAV_TYPED */ NULL, + /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch,

1 0

Józef Kucia : d3d11/tests: Add test for interleaved Draw() and Dispatch() calls.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: dc92de848b95234b1b5f10f6d8e0e982489d652e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc92de848b95234b1b5f10f6d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 8 11:54:14 2017 +0100 d3d11/tests: Add test for interleaved Draw() and Dispatch() calls. 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 | 182 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e966d4..ca27354 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12631,6 +12631,187 @@ static void test_cs_uav_store(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_ps_cs_uav_binding(void) +{ + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + ID3D11UnorderedAccessView *cs_uav, *ps_uav; + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D11Texture2D *cs_texture, *ps_texture; + struct d3d11_test_context test_context; + static const float zero[4] = {0.0f}; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Buffer *cs_cb, *ps_cb; + struct vec4 input = {1.0f}; + ID3D11ComputeShader *cs; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD cs_code[] = + { +#if 0 + RWTexture2D<float> u; + + float value; + + [numthreads(1, 1, 1)] + void main() + { + uint x, y, width, height; + u.GetDimensions(width, height); + for (y = 0; y < height; ++y) + { + for (x = 0; x < width; ++x) + u[uint2(x, y)] = value; + } + } +#endif + 0x43425844, 0x6503503a, 0x4cd524e6, 0x2473915d, 0x93cf1201, 0x00000001, 0x000001c8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000174, 0x00050050, 0x0000005d, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555, + 0x02000068, 0x00000003, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x8900103d, 0x800000c2, + 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000000, 0x05000036, + 0x00100042, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100082, 0x00000000, + 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x03040003, 0x0010003a, 0x00000000, 0x05000036, + 0x001000e2, 0x00000001, 0x00100aa6, 0x00000000, 0x05000036, 0x00100082, 0x00000000, 0x00004001, + 0x00000000, 0x01000030, 0x07000050, 0x00100012, 0x00000002, 0x0010003a, 0x00000000, 0x0010000a, + 0x00000000, 0x03040003, 0x0010000a, 0x00000002, 0x05000036, 0x00100012, 0x00000001, 0x0010003a, + 0x00000000, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000001, 0x00208006, 0x00000000, + 0x00000000, 0x0700001e, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x00004001, 0x00000001, + 0x01000016, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, 0x00004001, 0x00000001, + 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<float> u : register(u1); + + float value; + + void main() + { + uint x, y, width, height; + u.GetDimensions(width, height); + for (y = 0; y < height; ++y) + { + for (x = 0; x < width; ++x) + u[uint2(x, y)] = value; + } + } +#endif + 0x43425844, 0x2e14423b, 0x62c015c8, 0x5ea5ab9f, 0x514f1e22, 0x00000001, 0x000001b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000164, 0x00000050, 0x00000059, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, + 0x02000068, 0x00000003, 0x8900103d, 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, + 0x00000000, 0x0011ee46, 0x00000001, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x00000000, + 0x01000030, 0x07000050, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, + 0x03040003, 0x0010003a, 0x00000000, 0x05000036, 0x001000e2, 0x00000001, 0x00100aa6, 0x00000000, + 0x05000036, 0x00100082, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100012, + 0x00000002, 0x0010003a, 0x00000000, 0x0010000a, 0x00000000, 0x03040003, 0x0010000a, 0x00000002, + 0x05000036, 0x00100012, 0x00000001, 0x0010003a, 0x00000000, 0x080000a4, 0x0011e0f2, 0x00000001, + 0x00100e46, 0x00000001, 0x00208006, 0x00000000, 0x00000000, 0x0700001e, 0x00100082, 0x00000000, + 0x0010003a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0700001e, 0x00100042, 0x00000000, + 0x0010002a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ps_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(input), &input.x); + cs_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(input), &input.x); + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &cs_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &ps_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + uav_desc.Format = texture_desc.Format; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D; + U(uav_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)cs_texture, &uav_desc, &cs_uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)ps_texture, &uav_desc, &ps_uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cs_cb); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &cs_uav, NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &ps_cb); + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + 1, &test_context.backbuffer_rtv, NULL, 1, 1, &ps_uav, NULL); + + ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, cs_uav, zero); + check_texture_float(cs_texture, 0.0f, 2); + ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, ps_uav, zero); + check_texture_float(ps_texture, 0.0f, 2); + + hr = ID3D11Device_CreateComputeShader(device, cs_code, sizeof(cs_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(ps_texture, 0.0f, 2); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 1.0f, 2); + todo_wine check_texture_float(ps_texture, 1.0f, 2); + + input.x = 0.5f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 0.5f, 2); + todo_wine check_texture_float(ps_texture, 1.0f, 2); + input.x = 2.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 0.5f, 2); + todo_wine check_texture_float(ps_texture, 2.0f, 2); + + input.x = 8.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); + input.x = 4.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 8.0f, 2); + todo_wine check_texture_float(ps_texture, 2.0f, 2); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 8.0f, 2); + todo_wine check_texture_float(ps_texture, 4.0f, 2); + + ID3D11ComputeShader_Release(cs); + ID3D11PixelShader_Release(ps); + ID3D11Buffer_Release(cs_cb); + ID3D11Buffer_Release(ps_cb); + ID3D11Texture2D_Release(cs_texture); + ID3D11Texture2D_Release(ps_texture); + ID3D11UnorderedAccessView_Release(cs_uav); + ID3D11UnorderedAccessView_Release(ps_uav); + ID3D11DeviceContext_Release(context); + release_test_context(&test_context); +} + static void test_sm4_ret_instruction(void) { struct d3d11_test_context test_context; @@ -13440,6 +13621,7 @@ START_TEST(d3d11) test_stencil_separate(); test_uav_load(); test_cs_uav_store(); + test_ps_cs_uav_binding(); test_sm4_ret_instruction(); test_primitive_restart(); test_sm5_bufinfo_instruction();

1 0

Francois Gouget : include: Add a couple of INTERNET_SCHEME_XXX constants.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: b436a15a87e2652062f7aa6f35ec499f64abfbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b436a15a87e2652062f7aa6f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 12:10:20 2017 +0100 include: Add a couple of INTERNET_SCHEME_XXX constants. Also add comments noting that it is not a mistake for the wininet.h constants to be incompatible with the winhttp.h ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winhttp.h | 3 +++ include/wininet.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 3d87280..52c60e4 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -38,8 +38,11 @@ typedef HINTERNET *LPHINTERNET; typedef WORD INTERNET_PORT; typedef INTERNET_PORT *LPINTERNET_PORT; +/* Yes, these values contradict wininet.h */ #define INTERNET_SCHEME_HTTP 1 #define INTERNET_SCHEME_HTTPS 2 +#define INTERNET_SCHEME_FTP 3 +#define INTERNET_SCHEME_SOCKS 4 typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ICU_ESCAPE 0x80000000 diff --git a/include/wininet.h b/include/wininet.h index 9e0fb40..39a6646 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -136,14 +136,14 @@ typedef enum { INTERNET_SCHEME_PARTIAL = -2, INTERNET_SCHEME_UNKNOWN = -1, INTERNET_SCHEME_DEFAULT = 0, - INTERNET_SCHEME_FTP, + INTERNET_SCHEME_FTP, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_GOPHER, - INTERNET_SCHEME_HTTP, - INTERNET_SCHEME_HTTPS, + INTERNET_SCHEME_HTTP, /* yes, this contradicts winhttp.h */ + INTERNET_SCHEME_HTTPS, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_FILE, INTERNET_SCHEME_NEWS, INTERNET_SCHEME_MAILTO, - INTERNET_SCHEME_SOCKS, + INTERNET_SCHEME_SOCKS, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_JAVASCRIPT, INTERNET_SCHEME_VBSCRIPT, INTERNET_SCHEME_RES,

1 0

Detlef Riekenberg : localspl: Clear LastError on success in AddMonitor.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 54e52897f89ad09a7e4d2d7c1fecd31b46d7989a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e52897f89ad09a7e4d2d7c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:44 2017 +0000 localspl: Clear LastError on success in AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f359b73..4f6bac3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1507,6 +1507,8 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE;

1 0

Detlef Riekenberg : winspool/tests: Test LastError on success of AddMonitor.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 72ca331431feef9cc3f5251876bf64caff7e19ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ca331431feef9cc3f525187… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:45 2017 +0000 winspool/tests: Test LastError on success of AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f6527c5..3c28bc0 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -434,7 +434,9 @@ static void test_AddMonitor(void) mi2a.pDLLName = entry->dllname; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + /* Some apps depend on the result of GetLastError() also on success of AddMonitor */ + ok(res && (GetLastError() == ERROR_SUCCESS), + "returned %d with %d (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError()); /* add a monitor twice */ SetLastError(MAGIC_DEAD);

1 0

Austin English : wine.inf: Set default Windows version to win7.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 6737ac70d6233f6b10f397ee8f94cb23c3ea04fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6737ac70d6233f6b10f397ee8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 31 12:59:44 2017 -0600 wine.inf: Set default Windows version to win7. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 6 +----- loader/wine.inf.in | 20 ++++++++++---------- programs/winecfg/appdefaults.c | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..1fa40e0 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -489,16 +489,12 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - if (is_win64 || is_wow64) - current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ - else - current_version = &VersionData[WINXP]; + current_version = &VersionData[WIN7]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a55b38..5dfbd7f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3366,23 +3366,23 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [Wow64] diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..d272d1c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -146,7 +146,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("winxp"); + else winver = strdupA("win7"); } WINE_TRACE("winver is %s\n", winver);

1 0

Francois Gouget : include: Add prototypes for IStream_{Reset, Size}().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: abf2be0ab874a2bb07e2bcfad016b93fe72c02bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf2be0ab874a2bb07e2bcfad… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:13:46 2017 +0100 include: Add prototypes for IStream_{Reset,Size}(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/shlwapi.h b/include/shlwapi.h index 4c91c1c..2c68b7f 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -984,6 +984,9 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); #endif /* NO_SHLWAPI_STREAM */ +HRESULT WINAPI IStream_Reset(IStream*); +HRESULT WINAPI IStream_Size(IStream*,ULARGE_INTEGER*); + /* SHAutoComplete flags */ #define SHACF_DEFAULT 0x00000000 #define SHACF_FILESYSTEM 0x00000001

1 0

Alistair Leslie-Hughes : dpnet/tests: Don't hardcode paths.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: d9610706e527dbc470af7696f41c8d2b31870204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9610706e527dbc470af7696f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 7 21:27:32 2017 +0000 dpnet/tests: Don't hardcode paths. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/address.c | 12 +++++++++--- dlls/dpnet/tests/client.c | 12 +++++++++--- dlls/dpnet/tests/server.c | 32 +++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 4aed626..a1dcdef 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -358,10 +358,16 @@ static void address_duplicate(void) START_TEST(address) { HRESULT hr; + char path[MAX_PATH]; - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); + + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index d2edcbe..bbd77fe 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -613,10 +613,16 @@ static void test_cleanup_dp_peer(void) START_TEST(client) { BOOL firewall_enabled; + char path[MAX_PATH]; - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); + + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return; diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 2f52c58..422e6d6 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -236,11 +236,8 @@ done: HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = - {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', - 'd','p','n','s','v','r','.','e','x','e',0}; - static const WCHAR dpnsvr_wow64W[] = - {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\', - 'd','p','n','s','v','r','.','e','x','e',0}; + {'d','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR seperator[] = {'\\',0}; static const WCHAR clientW[] = {'d','p','n','e','t','_','c','l','i','e','n','t',0}; static const WCHAR serverW[] = @@ -252,7 +249,7 @@ HRESULT set_firewall( enum firewall_op op ) INetFwAuthorizedApplication *app = NULL; INetFwAuthorizedApplications *apps = NULL; BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); - BOOL is_wow64; + WCHAR path[MAX_PATH]; if (!GetModuleFileNameW( NULL, image, MAX_PATH )) { @@ -260,6 +257,14 @@ HRESULT set_firewall( enum firewall_op op ) return E_FAIL; } + if(!GetSystemDirectoryW(path, MAX_PATH)) + { + SysFreeString( image ); + return E_FAIL; + } + lstrcatW(path, seperator); + lstrcatW(path, dpnsvrW); + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, @@ -307,8 +312,7 @@ HRESULT set_firewall( enum firewall_op op ) if (hr != S_OK) goto done; SysFreeString( image ); - IsWow64Process( GetCurrentProcess(), &is_wow64 ); - image = is_wow64 ? SysAllocString( dpnsvr_wow64W ) : SysAllocString( dpnsvrW ); + image = SysAllocString( path ); hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; @@ -366,10 +370,16 @@ START_TEST(server) { HRESULT hr; BOOL firewall_enabled; + char path[MAX_PATH]; + + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return;

1 0