September 2012 - Wine-commits

Henri Verbeet : d3d10: Properly cleanup shader variables.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: a03910c903ea651db3f40a9ae8b7307efba2e084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03910c903ea651db3f40a9ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:18 2012 +0200 d3d10: Properly cleanup shader variables. --- dlls/d3d10/effect.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e2a4744..df284e9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2117,6 +2117,35 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) } } +static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, + D3D10_SHADER_VARIABLE_TYPE type) +{ + shader_free_signature(&s->input_signature); + shader_free_signature(&s->output_signature); + + switch (type) + { + case D3D10_SVT_VERTEXSHADER: + if (s->shader.vs) + ID3D10VertexShader_Release(s->shader.vs); + break; + + case D3D10_SVT_PIXELSHADER: + if (s->shader.ps) + ID3D10PixelShader_Release(s->shader.ps); + break; + + case D3D10_SVT_GEOMETRYSHADER: + if (s->shader.gs) + ID3D10GeometryShader_Release(s->shader.gs); + break; + + default: + FIXME("Unhandled shader type %s.\n", debug_d3d10_shader_variable_type(type)); + break; + } +} + static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { unsigned int i; @@ -2159,8 +2188,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->input_signature); - shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->output_signature); + d3d10_effect_shader_variable_destroy(v->data, v->type->basetype); break; default:

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetVertexShader().
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 63b20223024e168b1ecbeabf87fb1601036a6c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b20223024e168b1ecbeabf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:19 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetVertexShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index df284e9..0d8bd0e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5617,9 +5617,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_VERTEXSHADER) + { + WARN("Shader is not a vertex shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.vs)) + ID3D10VertexShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader(

1 0

Henri Verbeet : wined3d: wined3d_device_set_vertex_declaration() never fails.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 01918d05ed17ae01016b7d05e67024d4bd4c1e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01918d05ed17ae01016b7d05e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:20 2012 +0200 wined3d: wined3d_device_set_vertex_declaration() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 12 ++++-------- dlls/ddraw/device.c | 37 ++++--------------------------------- dlls/wined3d/device.c | 10 +++++----- include/wine/wined3d.h | 2 +- 5 files changed, 16 insertions(+), 50 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5e21a38..244e4c0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2138,10 +2138,9 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; } - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_device_set_vertex_declaration(device->wined3d_device, shader_impl->vertex_declaration->wined3d_vertex_declaration); - if (SUCCEEDED(hr)) - hr = wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + hr = wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); TRACE("Returning hr %#x\n", hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 06988f7..ea2fd1f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2073,16 +2073,15 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); - HRESULT hr; TRACE("iface %p, declaration %p.\n", iface, declaration); wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_device_set_vertex_declaration(device->wined3d_device, decl_impl ? decl_impl->wined3d_declaration : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface, @@ -2188,7 +2187,6 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_vertex_declaration *decl; - HRESULT hr; TRACE("iface %p, fvf %#x.\n", iface, fvf); @@ -2206,12 +2204,10 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) return D3DERR_DRIVERINTERNALERROR; } - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, decl); - if (FAILED(hr)) - ERR("Failed to set vertex declaration.\n"); + wined3d_device_set_vertex_declaration(device->wined3d_device, decl); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 20b2510..86cd5c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3406,16 +3406,8 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, /* Get the stride */ stride = get_flexible_vertex_size(fvf); - /* Set the FVF */ wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); - if (hr != D3D_OK) - { - wined3d_mutex_unlock(); - return hr; - } - - /* This method translates to the user pointer draw of WineD3D */ + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_primitive_up(device->wined3d_device, vertex_count, vertices, stride); wined3d_mutex_unlock(); @@ -3518,14 +3510,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); - if (FAILED(hr)) - { - WARN("Failed to set vertex declaration, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive_up(device->wined3d_device, index_count, indices, WINED3DFMT_R16_UINT, vertices, get_flexible_vertex_size(fvf)); @@ -3992,15 +3977,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb->fvf); wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_declaration(device->wined3d_device, vb->wineD3DVertexDeclaration); - if (FAILED(hr)) - { - WARN("Failed to set vertex declaration, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - /* Set the vertex stream source */ + wined3d_device_set_vertex_declaration(device->wined3d_device, vb->wineD3DVertexDeclaration); hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride); if (FAILED(hr)) { @@ -4091,13 +4068,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); - if (FAILED(hr)) - { - ERR(" (%p) Setting the FVF failed, hr = %x!\n", This, hr); - wined3d_mutex_unlock(); - return hr; - } + wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); /* check that the buffer is large enough to hold the indices, * reallocate if necessary. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9daeb60..4d6d03c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2411,7 +2411,7 @@ void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); } -HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, +void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { struct wined3d_vertex_declaration *prev = device->updateStateBlock->state.vertex_declaration; @@ -2429,17 +2429,17 @@ HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *devic if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } - else if (declaration == prev) + + if (declaration == prev) { /* Checked after the assignment to allow proper stateblock recording. */ TRACE("Application is setting the old declaration over, nothing to do.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_VDECL); - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d84adc..90e71c0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2235,7 +2235,7 @@ HRESULT __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *de UINT stage, enum wined3d_texture_stage_state state, DWORD value); void __cdecl wined3d_device_set_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); -HRESULT __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, +void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration); HRESULT __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport);

1 0

Henri Verbeet : wined3d: Just return the declaration from wined3d_device_get_vertex_declaration().
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 2f03ad1a40e48884d1d4ddeb6edfa3991f785faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f03ad1a40e48884d1d4ddeb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:21 2012 +0200 wined3d: Just return the declaration from wined3d_device_get_vertex_declaration(). --- dlls/d3d8/device.c | 19 +++++-------------- dlls/d3d9/device.c | 23 +++++------------------ dlls/wined3d/device.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 5 files changed, 15 insertions(+), 43 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 244e4c0..baa8b63 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2153,33 +2153,24 @@ static HRESULT WINAPI d3d8_device_GetVertexShader(IDirect3DDevice8 *iface, DWORD struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d8_vertex_declaration *d3d8_declaration; - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration))) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { - wined3d_mutex_unlock(); - WARN("Failed to get wined3d vertex declaration, hr %#x.\n", hr); - return hr; + d3d8_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *shader = d3d8_declaration->shader_handle; } - - if (!wined3d_declaration) + else { - wined3d_mutex_unlock(); *shader = 0; - return D3D_OK; } - - d3d8_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); - wined3d_vertex_declaration_decref(wined3d_declaration); wined3d_mutex_unlock(); - *shader = d3d8_declaration->shader_handle; TRACE("Returning %#x.\n", *shader); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DWORD shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ea2fd1f..b1b7b80 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2088,22 +2088,19 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface IDirect3DVertexDeclaration9 **declaration) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_vertex_declaration *wined3d_declaration = NULL; + struct wined3d_vertex_declaration *wined3d_declaration; struct d3d9_vertex_declaration *declaration_impl; - HRESULT hr; TRACE("iface %p, declaration %p.\n", iface, declaration); if (!declaration) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration); - if (SUCCEEDED(hr) && wined3d_declaration) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; IDirect3DVertexDeclaration9_AddRef(*declaration); - wined3d_vertex_declaration_decref(wined3d_declaration); } else { @@ -2112,7 +2109,7 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_unlock(); TRACE("Returning %p.\n", *declaration); - return hr; + return D3D_OK; } static struct wined3d_vertex_declaration *device_get_fvf_declaration(struct d3d9_device *device, DWORD fvf) @@ -2215,24 +2212,14 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d9_vertex_declaration *d3d9_declaration; - HRESULT hr; TRACE("iface %p, fvf %p.\n", iface, fvf); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration))) - { - wined3d_mutex_unlock(); - WARN("Failed to get vertex declaration, hr %#x.\n", hr); - *fvf = 0; - return hr; - } - - if (wined3d_declaration) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *fvf = d3d9_declaration->fvf; - wined3d_vertex_declaration_decref(wined3d_declaration); } else { @@ -2242,7 +2229,7 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) TRACE("Returning FVF %#x.\n", *fvf); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4d6d03c..1b63104 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2442,16 +2442,11 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, device_invalidate_state(device, STATE_VDECL); } -HRESULT CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device, - struct wined3d_vertex_declaration **declaration) +struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) { - TRACE("device %p, declaration %p.\n", device, declaration); - - *declaration = device->stateBlock->state.vertex_declaration; - if (*declaration) - wined3d_vertex_declaration_incref(*declaration); + TRACE("device %p.\n", device); - return WINED3D_OK; + return device->stateBlock->state.vertex_declaration; } HRESULT CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c50dd29..091f6d5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -88,7 +88,7 @@ @ cdecl wined3d_device_get_texture(ptr long ptr) @ cdecl wined3d_device_get_texture_stage_state(ptr long long ptr) @ cdecl wined3d_device_get_transform(ptr long ptr) -@ cdecl wined3d_device_get_vertex_declaration(ptr ptr) +@ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 90e71c0..bf16b55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2164,8 +2164,7 @@ HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_devi UINT stage, enum wined3d_texture_stage_state state, DWORD *value); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); -HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device, - struct wined3d_vertex_declaration **declaration); +struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_destroy() control flow a bit.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: f298b96972b16f3a3306318760aae90755ee204e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f298b96972b16f3a330631876… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:22 2012 +0200 wined3d: Simplify shader_glsl_destroy() control flow a bit. --- dlls/wined3d/glsl_shader.c | 89 ++++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3759709..5c0cdfb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4735,8 +4735,6 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) const struct list *linked_programs; struct wined3d_context *context; - char pshader = shader_is_pshader_version(shader->reg_maps.shader_version.type); - if (!shader_data || !shader_data->num_gl_shaders) { HeapFree(GetProcessHeap(), 0, shader_data); @@ -4755,54 +4753,65 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) LEAVE_GL(); } + TRACE("Deleting linked programs.\n"); linked_programs = &shader->linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { + if (linked_programs->next) + { struct glsl_shader_prog_link *entry, *entry2; + UINT i; ENTER_GL(); - if(pshader) { - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { - delete_glsl_program_entry(priv, gl_info, entry); - } - } else { - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { - delete_glsl_program_entry(priv, gl_info, entry); + + switch (shader->reg_maps.shader_version.type) + { + case WINED3D_SHADER_TYPE_PIXEL: + { + struct glsl_ps_compiled_shader *gl_shaders = shader_data->gl_shaders.ps; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, + struct glsl_shader_prog_link, pshader_entry) + { + delete_glsl_program_entry(priv, gl_info, entry); + } + + for (i = 0; i < shader_data->num_gl_shaders; ++i) + { + TRACE("Deleting pixel shader %u.\n", gl_shaders[i].prgId); + GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); + checkGLcall("glDeleteObjectARB"); + } + HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders.ps); + + break; } - } - LEAVE_GL(); - } - if (pshader) - { - struct glsl_ps_compiled_shader *gl_shaders = shader_data->gl_shaders.ps; - UINT i; + case WINED3D_SHADER_TYPE_VERTEX: + { + struct glsl_vs_compiled_shader *gl_shaders = shader_data->gl_shaders.vs; - ENTER_GL(); - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - TRACE("Deleting pixel shader %u.\n", gl_shaders[i].prgId); - GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); - checkGLcall("glDeleteObjectARB"); - } - LEAVE_GL(); - HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders.ps); - } - else - { - struct glsl_vs_compiled_shader *gl_shaders = shader_data->gl_shaders.vs; - UINT i; + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, + struct glsl_shader_prog_link, vshader_entry) + { + delete_glsl_program_entry(priv, gl_info, entry); + } - ENTER_GL(); - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - TRACE("Deleting vertex shader %u.\n", gl_shaders[i].prgId); - GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); - checkGLcall("glDeleteObjectARB"); + for (i = 0; i < shader_data->num_gl_shaders; ++i) + { + TRACE("Deleting vertex shader %u.\n", gl_shaders[i].prgId); + GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); + checkGLcall("glDeleteObjectARB"); + } + HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders.vs); + + break; + } + + default: + ERR("Unhandled shader type %#x.\n", shader->reg_maps.shader_version.type); + break; } + LEAVE_GL(); - HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders.vs); } HeapFree(GetProcessHeap(), 0, shader->backend_data);

1 0

Vincent Povirk : gdiplus: Implement LineCapSquare in GdipWidenPath.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 47c433de8ce9fd894b83a0b96d1963b2ce7ffc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c433de8ce9fd894b83a0b96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 20 15:16:58 2012 -0500 gdiplus: Implement LineCapSquare in GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 16f5e2d..0515175 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1774,6 +1774,31 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, if (add_last_point) add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; + case LineCapSquare: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL bevel_dx, bevel_dy; + REAL extend_dx, extend_dy; + + extend_dx = -distance * segment_dx / segment_length; + extend_dy = -distance * segment_dy / segment_length; + + bevel_dx = -distance * segment_dy / segment_length; + bevel_dy = distance * segment_dx / segment_length; + + if (add_first_points) + *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx + bevel_dx, + endpoint->Y + extend_dy + bevel_dy, PathPointTypeLine); + + if (add_last_point) + *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx - bevel_dx, + endpoint->Y + extend_dy - bevel_dy, PathPointTypeLine); + + break; + } } } @@ -1878,10 +1903,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap != LineCapFlat) + if (pen->endcap > LineCapSquare) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap != LineCapFlat) + if (pen->startcap > LineCapSquare) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Vincent Povirk : gdiplus: Properly set the first point to start when widening open figures.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 8871af7ea563725fb92b75ec88a1fa946dccb574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8871af7ea563725fb92b75ec8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 20 16:44:47 2012 -0500 gdiplus: Properly set the first point to start when widening open figures. --- dlls/gdiplus/graphicspath.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 0515175..8b3a132 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1806,15 +1806,16 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, path_list_node_t **last_point) { int i; + path_list_node_t *prev_point; if (end <= start) return; + prev_point = *last_point; + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); - (*last_point)->type = PathPointTypeStart; - for (i=start+1; i<end; i++) widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], &path->pathdata.Points[i+1], pen, last_point); @@ -1829,6 +1830,7 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; }

1 0

Vincent Povirk : gdiplus: Implement LineCapRound in GdipWidenPath.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 0b40c9cb4101fa0891df4b1e6baaba73aeffb1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b40c9cb4101fa0891df4b1e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 20 16:45:36 2012 -0500 gdiplus: Implement LineCapRound in GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8b3a132..47a864b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1799,6 +1799,49 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, break; } + case LineCapRound: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy, dx2, dy2; + const REAL control_point_distance = 0.5522847498307935; /* 4/3 * (sqrt(2) - 1) */ + + if (add_first_points) + { + dx = -distance * segment_dx / segment_length; + dy = -distance * segment_dy / segment_length; + + dx2 = dx * control_point_distance; + dy2 = dy * control_point_distance; + + /* first 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X + dy, + endpoint->Y - dx, PathPointTypeLine); + + *last_point = add_path_list_node(*last_point, endpoint->X + dy + dx2, + endpoint->Y - dx + dy2, PathPointTypeBezier); + + *last_point = add_path_list_node(*last_point, endpoint->X + dx + dy2, + endpoint->Y + dy - dx2, PathPointTypeBezier); + + /* midpoint */ + *last_point = add_path_list_node(*last_point, endpoint->X + dx, + endpoint->Y + dy, PathPointTypeBezier); + + /* second 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X + dx - dy2, + endpoint->Y + dy + dx2, PathPointTypeBezier); + + *last_point = add_path_list_node(*last_point, endpoint->X - dy + dx2, + endpoint->Y + dx + dy2, PathPointTypeBezier); + + *last_point = add_path_list_node(*last_point, endpoint->X - dy, + endpoint->Y + dx, PathPointTypeBezier); + } + break; + } } } @@ -1905,10 +1948,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapSquare) + if (pen->endcap > LineCapRound) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapSquare) + if (pen->startcap > LineCapRound) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Dmitry Timoshkov : windowscodecs: Avoid unnecessary memory allocations.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 6715b186f66b14e70a7c587311861fbc3cc887c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6715b186f66b14e70a7c58731… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 21 09:42:37 2012 +0900 windowscodecs: Avoid unnecessary memory allocations. --- dlls/windowscodecs/gifformat.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 1dce11d..81bde20 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -413,10 +413,7 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti result[1].id.u.pwszVal = strdupAtoW("Data"); result[1].value.vt = VT_UI1|VT_VECTOR; result[1].value.u.caub.cElems = data_size; - result[1].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, data_size); - memcpy(result[1].value.u.caub.pElems, data, data_size); - - HeapFree(GetProcessHeap(), 0, data); + result[1].value.u.caub.pElems = data; *items = result; *count = 2; @@ -449,7 +446,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO ULONG bytesread, data_size; MetadataItem *result; BYTE subblock_size; - BYTE *data; + char *data; *items = NULL; *count = 0; @@ -474,10 +471,10 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO if (!subblock_size) break; if (!data) - data = HeapAlloc(GetProcessHeap(), 0, subblock_size); + data = HeapAlloc(GetProcessHeap(), 0, subblock_size + 1); else { - BYTE *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size); + char *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size + 1); if (!new_data) { HeapFree(GetProcessHeap(), 0, data); @@ -494,6 +491,8 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO data_size += subblock_size; } + data[data_size] = 0; + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); if (!result) { @@ -508,11 +507,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO result->id.vt = VT_LPWSTR; result->id.u.pwszVal = strdupAtoW("TextEntry"); result->value.vt = VT_LPSTR; - result->value.u.pszVal = HeapAlloc(GetProcessHeap(), 0, data_size + 1); - memcpy(result->value.u.pszVal, data, data_size); - result->value.u.pszVal[data_size] = 0; - - HeapFree(GetProcessHeap(), 0, data); + result->value.u.pszVal = data; *items = result; *count = 1;

1 0

André Hentschel : iphlpapi: Improved GetTcpStatisticsEx stub.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 07316882a55c14f6ab68a668f0e838611e2a85fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07316882a55c14f6ab68a668f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 20 23:57:33 2012 +0200 iphlpapi: Improved GetTcpStatisticsEx stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/ipstats.c | 30 +++++++++++++++++++++++++++--- dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++--- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 368159a..36ba13f 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -134,7 +134,7 @@ #@ stub GetSessionCompartmentId @ stdcall GetTcp6Table( ptr ptr long ) @ stdcall GetTcp6Table2( ptr ptr long ) -#@ stub GetTcpStatisticsEx +@ stdcall GetTcpStatisticsEx( ptr long ) @ stdcall GetTcpStatistics( ptr ) @ stub GetTcpStatsFromStack @ stdcall GetTcpTable( ptr ptr long ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 79dac58..a56e753 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -975,24 +975,32 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) } /****************************************************************** - * GetTcpStatistics (IPHLPAPI.@) + * GetTcpStatisticsEx (IPHLPAPI.@) * - * Get the TCP statistics for the local computer. + * Get the IPv4 and IPv6 TCP statistics for the local computer. * * PARAMS * stats [Out] buffer for TCP statistics + * family [In] specifies wether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) +DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) { DWORD ret = ERROR_NOT_SUPPORTED; if (!stats) return ERROR_INVALID_PARAMETER; + if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); + if (family == WS_AF_INET6) + { + FIXME( "unimplemented for IPv6\n" ); + return ret; + } + #ifdef __linux__ { FILE *fp; @@ -1111,6 +1119,22 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) return ret; } +/****************************************************************** + * GetTcpStatistics (IPHLPAPI.@) + * + * Get the TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) +{ + return GetTcpStatisticsEx(stats, WS_AF_INET); +} /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index eb96189..26bf26e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -659,7 +659,7 @@ static void testGetTcpStatisticsEx(void) if (!pGetTcpStatisticsEx) { - skip( "GetTcpStatisticsEx not available\n" ); + win_skip( "GetTcpStatisticsEx not available\n" ); return; } @@ -667,6 +667,10 @@ static void testGetTcpStatisticsEx(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetTcpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, + "GetTcpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetTcpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -690,8 +694,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP IPv6 Ex stats:\n" );

1 0