wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Michael Stefaniuc : wmp: Forward from a Release to a Release method.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: dbf8bde14616e54abbcf4caca92d4b708170b0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf8bde14616e54abbcf4caca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 31 14:25:07 2015 +0200 wmp: Forward from a Release to a Release method. --- dlls/wmp/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 33c0323..75957a4 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -671,7 +671,7 @@ static ULONG WINAPI OleControl_AddRef(IOleControl *iface) static ULONG WINAPI OleControl_Release(IOleControl *iface) { WindowsMediaPlayer *This = impl_from_IOleControl(iface); - return IOleObject_AddRef(&This->IOleObject_iface); + return IOleObject_Release(&This->IOleObject_iface); } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI)

1 0

Nikolay Sivov : dwrite: Update to IDWriteRenderingParams2.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 7b664095aadfef5e670e8aa19d7dc84bbdcb457e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b664095aadfef5e670e8aa19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 11:39:59 2015 +0300 dwrite: Update to IDWriteRenderingParams2. --- dlls/dwrite/main.c | 121 +++++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 45 +++++++++++++++++- 2 files changed, 125 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b664095aadfef5e670e8…

1 0

Matteo Bruni : ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: fbffd8bae4144ef28a7f45af4514b0be9ba26506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbffd8bae4144ef28a7f45af4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:04 2015 +0200 ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 688f02b..f0f4ac3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6839,6 +6839,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); else if (version == 2) wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + if (version < 7) + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); return D3D_OK; }

1 0

Matteo Bruni : ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn' t exist before d3d7.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 382c8fde0897f1ed2250d6fd136122ae186f68a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382c8fde0897f1ed2250d6fd1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:03 2015 +0200 ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn't exist before d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 582a1d4..688f02b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2525,6 +2525,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: *value = 0xffffffff; return D3D_OK; @@ -2884,6 +2885,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: hr = D3D_OK; break;

1 0

Matteo Bruni : ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: e8aba71529adbcfe349fba53604b296d714dfa49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aba71529adbcfe349fba536… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:02 2015 +0200 ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes. --- dlls/ddraw/light.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index baaf6a3..c632c32 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -201,7 +201,11 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) wined3d_mutex_lock(); memcpy(&light->light, data, sizeof(D3DLIGHT)); - if (flags & D3DLIGHT_ACTIVE) + if (!(light->light.dwFlags & D3DLIGHT_ACTIVE) && flags & D3DLIGHT_ACTIVE) + light_activate(light); + else if (light->light.dwFlags & D3DLIGHT_ACTIVE && !(flags & D3DLIGHT_ACTIVE)) + light_deactivate(light); + else if (flags & D3DLIGHT_ACTIVE) light_update(light); light->light.dwFlags = flags; wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw: Make sure AddLight properly activates lights.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: b41a3ad2193fe59a16a830bf4205fc204ef9405c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41a3ad2193fe59a16a830bf4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:01 2015 +0200 ddraw: Make sure AddLight properly activates lights. --- dlls/ddraw/viewport.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 84c1b14..5ebc41e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -672,8 +672,8 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, This->background->mat.u.diffuse.u4.a); } - /* Need to temporarily activate viewport to clear it. Previously active one will be restored - afterwards. */ + /* Need to temporarily activate the viewport to clear it. The previously + * active one will be restored afterwards. */ viewport_activate(This, TRUE); hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, @@ -740,8 +740,12 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D light_impl->active_viewport = This; /* If active, activate the light */ - if (This->active_device) + if (This->active_device && light_impl->light.dwFlags & D3DLIGHT_ACTIVE) + { + /* Disable the flag so that light_activate actually does its job. */ + light_impl->light.dwFlags &= ~D3DLIGHT_ACTIVE; light_activate(light_impl); + } wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw: D3DLIGHT lights default to active.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ca7e56cfee5887c51b432dad4cab0f1304b70e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7e56cfee5887c51b432dad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:00 2015 +0200 ddraw: D3DLIGHT lights default to active. Actually, there is no way to deactivate them short of removing them from the viewport. --- dlls/ddraw/light.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 755fb41..baaf6a3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -81,7 +81,6 @@ void light_deactivate(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - /* If was not active, activate it */ if (light->light.dwFlags & D3DLIGHT_ACTIVE) { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); @@ -171,6 +170,7 @@ static const float zero_value[] = { static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { struct d3d_light *light = impl_from_IDirect3DLight(iface); + DWORD flags = data->dwSize >= sizeof(D3DLIGHT2) ? ((D3DLIGHT2 *)data)->dwFlags : D3DLIGHT_ACTIVE; D3DLIGHT7 *light7 = &light->light7; TRACE("iface %p, data %p.\n", iface, data); @@ -184,7 +184,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) + if (!(flags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; @@ -200,9 +200,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, data, data->dwSize); - if (light->light.dwFlags & D3DLIGHT_ACTIVE) + memcpy(&light->light, data, sizeof(D3DLIGHT)); + if (flags & D3DLIGHT_ACTIVE) light_update(light); + light->light.dwFlags = flags; wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle ().
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: efe777c8ac9957c1a02282367ca1b597b5ab2d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe777c8ac9957c1a02282367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:25:00 2015 +0200 d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle(). --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c078989..fe7b947 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -617,7 +617,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar /* Invert the matrix. (Because the matrix is applied to the sampling * coordinates. I.e., to scale the bitmap by 2 we need to divide the * coordinates by 2.) */ - d = transform._11 * transform._22 - transform._21 * transform._22; + d = transform._11 * transform._22 - transform._21 * transform._12; if (d != 0.0f) { transform_inverse._11 = transform._22 / d;

1 0

Henri Verbeet : d3d10core/tests: Port the d3d9 vPos test to d3d10.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: f35cc97911b1d52d704b8900bfb1a471defdb094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35cc97911b1d52d704b8900b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:59 2015 +0200 d3d10core/tests: Port the d3d9 vPos test to d3d10. --- dlls/d3d10core/tests/device.c | 217 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 4 +- 2 files changed, 219 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f35cc97911b1d52d704b8…

1 0

Henri Verbeet : wined3d: Use GLSL 1.30 for SM4 shaders when available.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 94b0e895db0e647b06d5a6479a2a52b7b93669b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b0e895db0e647b06d5a6479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:58 2015 +0200 wined3d: Use GLSL 1.30 for SM4 shaders when available. This is required for bitwise operators in particular if no other extension provides them. --- dlls/wined3d/glsl_shader.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c857e76..f89a7c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -258,6 +258,15 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) + return "#version 130"; + else + return "#version 120"; +} + static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { char str[4][17]; @@ -4477,7 +4486,7 @@ static GLuint generate_param_reorder_function(struct wined3d_shader_buffer *buff shader_buffer_clear(buffer); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); if (ps_major < 3) { @@ -4635,7 +4644,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); @@ -4695,7 +4704,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); @@ -4770,7 +4779,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) shader_addline(buffer, "#extension GL_ARB_geometry_shader4 : enable\n");

1 0

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 March 2015