wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Józef Kucia : wined3d: Do not modify depth test state in wined3d_device_reset().
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 198340ff6728b73c57b76993b23de624b72e20c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198340ff6728b73c57b76993b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:24 2017 +0100 wined3d: Do not modify depth test state in wined3d_device_reset(). For consistency with wined3d_device_init_3d(). 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/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2655702..a25b98d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4880,8 +4880,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->update_state = &device->state; device_init_swapchain_state(device, swapchain); - wined3d_device_set_render_state(device, - WINED3D_RS_ZENABLE, !!swapchain->desc.enable_auto_depth_stencil); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); }

1 0

Józef Kucia : ddraw: Set depth test state while resetting device.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 46fa862dc47cbd0ca40b29ab2ee63f63f612c62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa862dc47cbd0ca40b29ab2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:23 2017 +0100 ddraw: Set depth test state while resetting device. wined3d will not do this anymore. 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/ddraw/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 394e915..26d83cd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6002,6 +6002,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return hr_ddraw_from_wined3d(hr); } + + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); } }

1 0

Józef Kucia : d3d9: Set depth test state while resetting device.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 48504e73e97b0edcef9ab267211521ff4cd70f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48504e73e97b0edcef9ab2672… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:22 2017 +0100 d3d9: Set depth test state while resetting device. wined3d will not do this anymore. 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/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 20f73c0..51b4896 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -812,11 +812,13 @@ static HRESULT d3d9_device_get_swapchains(struct d3d9_device *device) static HRESULT d3d9_device_reset(struct d3d9_device *device, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { + BOOL extended = device->d3d_parent->extended; struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode wined3d_mode; HRESULT hr; - if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) + + if (!extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; @@ -831,8 +833,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.scanline_ordering = mode->ScanLineOrdering; } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, - device->d3d_parent->extended)) + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); @@ -852,10 +853,16 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) + mode ? &wined3d_mode : NULL, reset_enum_callback, !extended))) { HeapFree(GetProcessHeap(), 0, device->implicit_swapchains); + if (!extended) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + } + if (FAILED(hr = d3d9_device_get_swapchains(device))) { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; @@ -871,7 +878,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } } - else if (!device->d3d_parent->extended) + else if (!extended) { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; }

1 0

Józef Kucia : d3d8: Set depth test state while resetting device.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: a34c7f26169dbfde077cf6609e02a86403177d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34c7f26169dbfde077cf6609… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:21 2017 +0100 d3d8: Set depth test state while resetting device. wined3d will not do this anymore. 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/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f77fb27..506961a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -747,6 +747,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, { present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); device->device_state = D3D8_DEVICE_STATE_OK; } else

1 0

Józef Kucia : wined3d: Fix relative addressing for SM4+ vertex shader inputs.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 72ecfb0ae41c5e27e9eed433d43f48d90fd616d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ecfb0ae41c5e27e9eed433d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:18 2017 +0100 wined3d: Fix relative addressing for SM4+ vertex shader inputs. Relative addressing doesn't necessarily work for SM3. 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 | 1 - dlls/wined3d/glsl_shader.c | 24 +++++++++++++++++++++--- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 96b3b05..7d317dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12339,7 +12339,6 @@ static void test_vs_input_relative_addressing(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, index, 0, 0); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if(i > 0) check_texture_color(test_context.backbuffer, colors[i], 1); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 18822c5..32a75bf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2854,10 +2854,18 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (reg->idx[0].rel_addr) - FIXME("VS3+ input registers relative addressing.\n"); + FIXME("VS3 input registers relative addressing.\n"); if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) *is_color = TRUE; - sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + if (reg->idx[0].rel_addr) + { + sprintf(register_name, "%s_in[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); + } + else + { + sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + } break; } @@ -7850,7 +7858,17 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "void main()\n{\n"); - /* Base Shader Body */ + if (reg_maps->input_rel_addressing) + { + unsigned int highest_input_register = wined3d_log2i(reg_maps->input_registers); + shader_addline(buffer, "vec4 vs_in[%u];\n", highest_input_register + 1); + for (i = 0; i < shader->input_signature.element_count; ++i) + { + const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; + shader_addline(buffer, "vs_in[%u] = vs_in%u;\n", e->register_idx, e->register_idx); + } + } + if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) return 0; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d976573..04ced90 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -709,6 +709,8 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w break; case WINED3DSPR_INPUT: + if (reg->idx[0].rel_addr) + reg_maps->input_rel_addressing = 1; if (shader_type == WINED3D_SHADER_TYPE_PIXEL) { /* If relative addressing is used, we must assume that all @@ -721,7 +723,9 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w shader->u.ps.input_reg_used |= 1u << reg->idx[0].offset; } else + { reg_maps->input_registers |= 1u << reg->idx[0].offset; + } break; case WINED3DSPR_RASTOUT: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79a68f..3c6a347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1024,7 +1024,8 @@ struct wined3d_shader_reg_maps DWORD usespow : 1; DWORD point_size : 1; DWORD vocp : 1; - DWORD padding : 17; + DWORD input_rel_addressing : 1; + DWORD padding : 16; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Józef Kucia : d3d11/tests: Add test for relative addressing of vertex shader inputs.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 8cb937f71928c6a511eebb6c621bcf772573b525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb937f71928c6a511eebb6c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:17 2017 +0100 d3d11/tests: Add test for relative addressing of vertex shader inputs. 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 | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 705be4f..96b3b05 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12228,6 +12228,127 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_vs_input_relative_addressing(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + unsigned int offset, stride; + unsigned int index[4] = {0}; + ID3D11PixelShader *ps; + ID3D11Buffer *vb, *cb; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : POSITION; + float4 colors[4] : COLOR; + }; + + uint index; + + void main(vertex vin, out float4 position : SV_Position, + out float4 color : COLOR) + { + position = vin.position; + color = vin.colors[index]; + } +#endif + 0x43425844, 0x8623dd89, 0xe37fecf5, 0xea3fdfe1, 0xdf36e4e4, 0x00000001, 0x000001f4, 0x00000003, + 0x0000002c, 0x000000c4, 0x00000118, 0x4e475349, 0x00000090, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000089, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000089, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x00000089, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000f0f, 0x00000089, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, + 0xab00524f, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000d4, + 0x00010040, 0x00000035, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2, 0x00000002, 0x0300005f, + 0x001010f2, 0x00000003, 0x0300005f, 0x001010f2, 0x00000004, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x001010f2, + 0x00000001, 0x00000004, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x06000036, + 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000001, + 0x00d01e46, 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct vs_out i) : SV_TARGET + { + return i.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 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 D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 0, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 1, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 4, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 2, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 8, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 3, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 12, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + }; + static const unsigned int colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000, 0xff0f0f0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &cb); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(colors), colors); + stride = sizeof(colors); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 1, 1, &vb, &stride, &offset); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.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); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < ARRAY_SIZE(colors); ++i) + { + *index = i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, index, 0, 0); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine_if(i > 0) + check_texture_color(test_context.backbuffer, colors[i], 1); + } + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(vb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_getdc(void) { static const struct @@ -23420,6 +23541,7 @@ START_TEST(d3d11) test_draw_depth_only(); test_draw_uav_only(); test_cb_relative_addressing(); + test_vs_input_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching(); test_shader_interstage_interface();

1 0

Józef Kucia : ddraw: Also store supported user clip planes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 8999dfac6169e363d90c9d5e6f7db9546d3c7b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8999dfac6169e363d90c9d5e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:16 2017 +0100 ddraw: Also store supported user clip planes. 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/ddraw/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 32a2f1a..542f23a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6469,11 +6469,14 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); - if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + if (idx < ARRAY_SIZE(device->user_clip_planes)) { - WARN("Clip plane %u is not supported.\n", idx); device->user_clip_planes[idx] = *wined3d_plane; - hr = D3D_OK; + if (hr == WINED3DERR_INVALIDCALL) + { + WARN("Clip plane %u is not supported.\n", idx); + hr = D3D_OK; + } } wined3d_mutex_unlock();

1 0

Austin English : loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: f1512cf25f0c8ef3df192bc1980d047cfa650059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1512cf25f0c8ef3df192bc19… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 17:35:49 2017 -0600 loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf..c487d0a 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine

1 0

Andrew Eikum : ntdll: Don't require full-page reads in NtReadFileScatter.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: f87a2f0e4cd4d36f3a218ac499d7a8f1933335a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87a2f0e4cd4d36f3a218ac49… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 6 15:08:00 2017 -0600 ntdll: Don't require full-page reads in NtReadFileScatter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 94feee6..410c3f0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4492,6 +4492,34 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + ResetEvent( evt ); + + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize / 2, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d4a949..570e46c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) {

1 0

Andrew Eikum : ntdll: Don' t return an error when reading past EOF in NtReadFileScatter.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 64edbfa6fe3f27de8519a5548f996ca2c6319ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64edbfa6fe3f27de8519a5548… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 6 15:07:54 2017 -0600 ntdll: Don't return an error when reading past EOF in NtReadFileScatter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 34 +++++++++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4980e02..94feee6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4380,6 +4380,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); @@ -4461,6 +4464,34 @@ static void test_WriteFileGather(void) ResetEvent( evt ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); @@ -4481,6 +4512,7 @@ static void test_WriteFileGather(void) VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9df15ff..3d4a949 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; if (needs_close) close( unix_handle );

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017