July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : explorerframe/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: dc5dd6ac0af8c7baf67bd8354d0549e3d7840730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5dd6ac0af8c7baf67bd8354… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:58:55 2016 +0200 explorerframe/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 80be883..54365b0 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1603,10 +1603,8 @@ static void test_basics(void) /* The NamespaceTreeControl returns screen coordinates. */ MapWindowPoints(NULL, hwnd, (POINT*)&rc, 2); - ok(rc.left == tv_rc.left, "Differed, got %d and %d\n", rc.left, tv_rc.left); - ok(rc.top == tv_rc.top, "Differed, got %d and %d\n", rc.top, tv_rc.top); - ok(rc.right == tv_rc.right, "Differed, got %d and %d\n", rc.right, tv_rc.right); - ok(rc.bottom == tv_rc.bottom, "Differed, got %d and %d\n", rc.bottom, tv_rc.bottom); + ok(EqualRect(&rc, &tv_rc), "Differed, got %s and %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&tv_rc)); /* Save the height and compare to that of other items. Observed values: 18, 19, 21 */

1 0

Michael Stefaniuc : wordpad: Use InflateRect() instead of open coding it.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 0a3700e051f3e9473c5daa40a5cdd951b1310b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3700e051f3e9473c5daa40a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:53:12 2016 +0200 wordpad: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 6c7c4f6..d34fd66 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -381,8 +381,7 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) GetClientRect(hWnd, &drawRect); FillRect(hdc, &drawRect, hBrush); - drawRect.top += 3; - drawRect.bottom -= 3; + InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; drawRect.right = twips_to_pixels(printRect.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); FillRect(hdc, &drawRect, GetStockObject(WHITE_BRUSH));

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_PRESENT resource access.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 3ef2bca823da8128f4fa135ac996f2a9f5b59e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef2bca823da8128f4fa135ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:16 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_PRESENT resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 46f623a..21f783a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -264,17 +264,25 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; + unsigned int i; swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); + + wined3d_resource_release(&swapchain->front_buffer->resource); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + wined3d_resource_release(&swapchain->back_buffers[i]->resource); + } } void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) { struct wined3d_cs_present *op; + unsigned int i; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_PRESENT; @@ -284,6 +292,12 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw op->dst_rect = *dst_rect; op->flags = flags; + wined3d_resource_acquire(&swapchain->front_buffer->resource); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + wined3d_resource_acquire(&swapchain->back_buffers[i]->resource); + } + cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_CLEAR resource access.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: ff584b98a7962d33c5ea85317e6816a61b16ef48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff584b98a7962d33c5ea85317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:17 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_CLEAR resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 21f783a..c456b5b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -304,20 +304,36 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_clear *op = data; + const struct wined3d_state *state; struct wined3d_device *device; + unsigned int i; RECT draw_rect; device = cs->device; - wined3d_get_draw_rect(&device->state, &draw_rect); + state = &device->state; + wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); + + if (op->flags & WINED3DCLEAR_TARGET) + { + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_release(state->fb->render_targets[i]->resource); + } + } + if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + wined3d_resource_release(state->fb->depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { + const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_clear *op; + unsigned int i; op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count])); op->opcode = WINED3D_CS_OP_CLEAR; @@ -328,6 +344,17 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); + if (flags & WINED3DCLEAR_TARGET) + { + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_acquire(state->fb->render_targets[i]->resource); + } + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + wined3d_resource_acquire(state->fb->depth_stencil->resource); + cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_DRAW resource access.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: c4ccdb248440d2e1dfb2083511d043245cb84b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ccdb248440d2e1dfb208351… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:18 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_DRAW resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c456b5b..8ed049e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -361,7 +361,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; const struct wined3d_cs_draw *op = data; + struct wined3d_shader *shader; + unsigned int i, j; if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && state->load_base_vertex_index != op->base_vertex_idx) @@ -372,12 +376,58 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); + + if (op->indexed) + wined3d_resource_release(&state->index_buffer->resource); + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (state->streams[i].buffer) + wined3d_resource_release(&state->streams[i].buffer->resource); + } + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + if (state->textures[i]) + wined3d_resource_release(&state->textures[i]->resource); + } + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_release(state->fb->render_targets[i]->resource); + } + if (state->fb->depth_stencil) + wined3d_resource_release(state->fb->depth_stencil->resource); + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_release(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_release(view->resource); + } + } } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { + const struct wined3d_state *state = &cs->device->state; + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; struct wined3d_cs_draw *op; + unsigned int i, j; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_DRAW; @@ -388,6 +438,47 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i op->instance_count = instance_count; op->indexed = indexed; + if (indexed) + wined3d_resource_acquire(&state->index_buffer->resource); + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (state->streams[i].buffer) + wined3d_resource_acquire(&state->streams[i].buffer->resource); + } + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + if (state->textures[i]) + wined3d_resource_acquire(&state->textures[i]->resource); + } + for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + { + if (state->fb->render_targets[i]) + wined3d_resource_acquire(state->fb->render_targets[i]->resource); + } + if (state->fb->depth_stencil) + wined3d_resource_acquire(state->fb->depth_stencil->resource); + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_acquire(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_acquire(view->resource); + } + } + cs->ops->submit(cs); }

1 0

Henri Verbeet : d3d10: Validate offsets in parse_shader() (AFL).
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 7f6520a2bb662d9e3caac2f4dc08880951269c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6520a2bb662d9e3caac2f4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:19 2016 +0200 d3d10: Validate offsets in parse_shader() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ff00aa1..4736fa9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -475,12 +475,11 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag return S_OK; } -static HRESULT parse_shader(ID3D10EffectVariable *variable, const char *data) +static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_variable *v) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable(variable); ID3D10Device *device = v->effect->device; - const char *ptr = data; DWORD dxbc_size; + const char *ptr; HRESULT hr; if (v->effect->used_shader_current >= v->effect->used_shader_count) @@ -492,11 +491,22 @@ static HRESULT parse_shader(ID3D10EffectVariable *variable, const char *data) v->effect->used_shaders[v->effect->used_shader_current] = v; ++v->effect->used_shader_current; - if (!ptr) return S_OK; + if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + ptr = data + offset; read_dword(&ptr, &dxbc_size); TRACE("dxbc size: %#x\n", dxbc_size); + if (!require_space(ptr - data, 1, dxbc_size, data_size)) + { + WARN("Invalid dxbc size %#x (data size %#lx, offset %#x).\n", offset, (long)data_size, offset); + return E_FAIL; + } + /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; @@ -1304,6 +1314,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; + struct d3d10_effect_variable *v; DWORD tmp, variable_idx = 0; const char *name; size_t name_len; @@ -1431,12 +1442,12 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, read_dword(&data_ptr, &offset); TRACE("Effect object starts at offset %#x.\n", offset); - data_ptr = data + offset; - - hr = parse_fx10_anonymous_shader(effect, &effect->anonymous_shaders[effect->anonymous_shader_current], o->type); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_anonymous_shader(effect, + &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) + return hr; - variable = &effect->anonymous_shaders[effect->anonymous_shader_current].shader.ID3D10EffectVariable_iface; + v = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; + variable = &v->ID3D10EffectVariable_iface; ++effect->anonymous_shader_current; switch (o->type) @@ -1444,7 +1455,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_VERTEXSHADER: case D3D10_EOT_PIXELSHADER: case D3D10_EOT_GEOMETRYSHADER: - if (FAILED(hr = parse_shader(variable, data_ptr))) + if (FAILED(hr = parse_fx10_shader(data, data_size, offset, v))) return hr; break; @@ -1800,8 +1811,8 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); - hr = parse_shader(&var->ID3D10EffectVariable_iface, data + shader_offset); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) + return hr; } break;

1 0

Henri Verbeet : d3d10: Validate offsets and size in parse_fx10_type() (AFL ).
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 1bcc7ce75f64f2894de43379674bc5c53c52bb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcc7ce75f64f2894de433796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 10 15:09:20 2016 +0200 d3d10: Validate offsets and size in parse_fx10_type() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4736fa9..4760489 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -598,11 +598,18 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - const char *ptr = data + offset; + const char *ptr; DWORD unknown0; DWORD typeinfo; unsigned int i; + if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + + ptr = data + offset; read_dword(&ptr, &offset); TRACE("Type name at offset %#x.\n", offset); @@ -631,9 +638,14 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, switch (unknown0) { case 1: - t->member_count = 0; + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } read_dword(&ptr, &typeinfo); + t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); @@ -651,13 +663,18 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, case 2: TRACE("Type is an object.\n"); + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + + read_dword(&ptr, &typeinfo); t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->type_class = D3D10_SVC_OBJECT; - - read_dword(&ptr, &typeinfo); t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->type_class = D3D10_SVC_OBJECT; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); @@ -667,6 +684,12 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, case 3: TRACE("Type is a structure.\n"); + if (!require_space(ptr - data, 1, sizeof(t->member_count), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } + read_dword(&ptr, &t->member_count); TRACE("Member count: %u.\n", t->member_count); @@ -681,6 +704,13 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_OUTOFMEMORY; } + if (!require_space(ptr - data, t->member_count, 4 * sizeof(DWORD), data_size)) + { + WARN("Invalid member count %#x (data size %#lx, offset %#x).\n", + t->member_count, (long)data_size, offset); + return E_FAIL; + } + for (i = 0; i < t->member_count; ++i) { struct d3d10_effect_type_member *typem = &t->members[i];

1 0

Alexandre Julliard : Wine release 1.9.14
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: website Branch: master Commit: 1362bf1abc83a65ea2075d69a5565f495d0d6c10 URL: http://source.winehq.org/git/website.git/?a=commit;h=1362bf1abc83a65ea2075d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 00:02:16 2016 +0900 Wine release 1.9.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016070901.xml b/news/en/2016070901.xml new file mode 100644 index 0000000..9a91dcb --- /dev/null +++ b/news/en/2016070901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 9, 2016</date> +<title>Wine 1.9.14 Released</title> +<body> + The Wine development release 1.9.14 is now available. + <a href="{$root}/announce/1.9.14">What's new</a> in this release: +<ul> + <li>More Shader Model 5 support in Direct3D.</li> + <li>Some more write support in WebServices.</li> + <li>Performance improvements in GDI.</li> + <li>Some more progress towards the Direct3D command stream.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Müller : wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: cacad1df98aceee3b2bf4f9a9c6978287b897be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacad1df98aceee3b2bf4f9a9… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 12:07:43 2016 +0200 wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 +--- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 19cf470..4e1f3b9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1917,9 +1917,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF } else { - if (lpUC->lpszUrlPath && (lpUC->dwUrlPathLength > 0)) - lpUC->lpszUrlPath[0] = 0; - lpUC->dwUrlPathLength = 0; + set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, 0); } TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_wn(lpszUrl,dwUrlLength), diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 00a457a..0af1d77 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -130,6 +130,9 @@ static const crack_url_test_t crack_url_tests[] = { {"HtTp://www.winehq.org/scheme", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, "HtTp", "www.winehq.org", "", "", "/scheme", ""}, + {"http://www.winehq.org", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, -1, 0, + "http", "www.winehq.org", "", "", "", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Sebastian Lackner : wininet/tests: Avoid unnecessary initialization of variables.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 259b517f2b929aee40db15ff3654a51496430997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259b517f2b929aee40db15ff3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 8 12:08:39 2016 +0200 wininet/tests: Avoid unnecessary initialization of variables. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 0af1d77..9be3839 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -717,11 +717,7 @@ static void InternetCrackUrlW_test(void) ok( comp.dwExtraInfoLength == 29, "extra length wrong\n"); urlpart[0]=0; - scheme[0]=0; - extra[0]=0; host[0]=0; - user[0]=0; - pwd[0]=0; memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; @@ -739,11 +735,7 @@ static void InternetCrackUrlW_test(void) ok( comp.dwExtraInfoLength == 0, "extra length wrong\n"); urlpart[0]=0; - scheme[0]=0; - extra[0]=0; host[0]=0; - user[0]=0; - pwd[0]=0; memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host;

1 0