wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Nikolay Sivov : dwrite: Fix typo in SetStrikethrough().
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 1d815a2801f6a5f78ccb772138e19f1f5fcbae6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d815a2801f6a5f78ccb77213… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:33:24 2015 +0300 dwrite: Fix typo in SetStrikethrough(). --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 22fbbd3..5935918 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1533,7 +1533,7 @@ static HRESULT WINAPI dwritetextlayout_SetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%d %s)\n", This, strikethrough, debugstr_range(&range)); value.range = range; - value.u.underline = strikethrough; + value.u.strikethrough = strikethrough; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRIKETHROUGH, &value); }

1 0

Alexandre Julliard : ws2_32: Avoid UINT32_MAX.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 57e2d9ef753951e3f2e041d61b98e64cc679cf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e2d9ef753951e3f2e041d61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 15:45:11 2015 +0900 ws2_32: Avoid UINT32_MAX. --- dlls/ws2_32/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 52b5394..ef43186 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -33,6 +33,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> +#include <limits.h> #ifdef HAVE_SYS_IPC_H # include <sys/ipc.h> #endif @@ -3633,7 +3634,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; timeout = get_rcvsnd_timeo(fd, optname == WS_SO_RCVTIMEO); - *(int *)optval = timeout <= UINT32_MAX ? timeout : UINT32_MAX; + *(int *)optval = timeout <= UINT_MAX ? timeout : UINT_MAX; release_sock_fd( s, fd ); return ret;

1 0

Matteo Bruni : ddraw/tests: Add a ddraw4 specular lighting test.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 27de4f25cf4065422eec4e340fe8b520d561648f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27de4f25cf4065422eec4e340… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:19 2015 +0200 ddraw/tests: Add a ddraw4 specular lighting test. --- dlls/ddraw/tests/ddraw4.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27de4f25cf4065422eec4…

1 0

Matteo Bruni : wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 213f7d9f4580482d8e8194dc27c92f00d454425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=213f7d9f4580482d8e8194dc2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:18 2015 +0200 wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp. --- dlls/ddraw/light.c | 3 --- dlls/wined3d/device.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a3660a3..0cc237d 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -175,9 +175,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; - if (data->dltType == D3DLIGHT_PARALLELPOINT) - FIXME("D3DLIGHT_PARALLELPOINT not implemented.\n"); - /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f4216a..6b40c62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1455,7 +1455,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, { case WINED3D_LIGHT_POINT: case WINED3D_LIGHT_SPOT: - case WINED3D_LIGHT_PARALLELPOINT: case WINED3D_LIGHT_GLSPOT: /* Incorrect attenuation values can cause the gl driver to crash. * Happens with Need for speed most wanted. */ @@ -1467,6 +1466,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, break; case WINED3D_LIGHT_DIRECTIONAL: + case WINED3D_LIGHT_PARALLELPOINT: /* Ignores attenuation */ break; @@ -1582,6 +1582,13 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, /* FIXME: Range */ break; + case WINED3D_LIGHT_PARALLELPOINT: + object->position.x = light->position.x; + object->position.y = light->position.y; + object->position.z = light->position.z; + object->position.w = 1.0f; + break; + default: FIXME("Unrecognized light type %#x.\n", light->type); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 909b158..b9d95e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1186,6 +1186,11 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c GL_EXTCALL(glUniform3fv(prog->vs.light_location[light].direction, 1, &vec4.x)); break; + case WINED3D_LIGHT_PARALLELPOINT: + multiply_vector_matrix(&vec4, &light_info->position, view); + GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x)); + break; + default: FIXME("Unrecognized light type %#x.\n", light_info->OriginalParms.type); } @@ -5538,6 +5543,18 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer " * ffp_light[%u].specular;\n", i); break; + case WINED3D_LIGHT_PARALLELPOINT: + shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz;\n", i); + if (!settings->normal) + break; + shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * ffp_light[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); + shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)" + " * ffp_light[%u].specular;\n", i); + break; + default: if (light_type) FIXME("Unhandled light type %#x.\n", light_type);

1 0

Matteo Bruni : include: Fix comments about the availability of D3D light types.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: e35f82665cfdb40231c2e0a8a41c81642273160d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f82665cfdb40231c2e0a8a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:17 2015 +0200 include: Fix comments about the availability of D3D light types. --- include/wine/wined3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a5f53c4..bb7007c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -76,8 +76,8 @@ enum wined3d_light_type WINED3D_LIGHT_POINT = 1, WINED3D_LIGHT_SPOT = 2, WINED3D_LIGHT_DIRECTIONAL = 3, - WINED3D_LIGHT_PARALLELPOINT = 4, /* D3D7 */ - WINED3D_LIGHT_GLSPOT = 5, /* D3D7 */ + WINED3D_LIGHT_PARALLELPOINT = 4, /* < D3D7 */ + WINED3D_LIGHT_GLSPOT = 5, /* < D3D5, not actually usable */ }; enum wined3d_primitive_type

1 0

Matteo Bruni : wined3d: Implement legacy light attenuation behavior in the GLSL vertex ffp.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 4388fb41e72f58e71c2280434b1af4a7640296bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4388fb41e72f58e71c2280434… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:16 2015 +0200 wined3d: Implement legacy light attenuation behavior in the GLSL vertex ffp. --- dlls/wined3d/glsl_shader.c | 66 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 19c3d31..909b158 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -106,6 +106,7 @@ struct shader_glsl_priv { struct wine_rb_tree ffp_vertex_shaders; struct wine_rb_tree ffp_fragment_shaders; BOOL ffp_proj_control; + BOOL legacy_lighting; }; struct glsl_vs_program @@ -5404,7 +5405,8 @@ static const char *shader_glsl_ffp_mcs(enum wined3d_material_color_source mcs, c } static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer, - const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info) + const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info, + BOOL legacy_lighting) { const char *diffuse, *specular, *emission, *ambient; enum wined3d_light_type light_type; @@ -5438,25 +5440,37 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "dst.z = dot(dir, dir);\n"); shader_addline(buffer, "dst.y = sqrt(dst.z);\n"); shader_addline(buffer, "dst.x = 1.0;\n"); - shader_addline(buffer, "if (dst.y <= ffp_light[%u].range)\n{\n", i); + if (legacy_lighting) + { + shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", i, i); + shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + } + else + { + shader_addline(buffer, "if (dst.y <= ffp_light[%u].range)\n{\n", i); + } shader_addline(buffer, "att = dot(dst.xyz, vec3(ffp_light[%u].c_att," " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", i, i, i); - shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz / att;\n", i); + if (!legacy_lighting) + shader_addline(buffer, "att = 1.0 / att;"); + shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", i); if (!settings->normal) { - shader_addline(buffer, "}\n"); + if (!legacy_lighting) + shader_addline(buffer, "}\n"); break; } shader_addline(buffer, "dir = normalize(dir);\n"); shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" - " * ffp_light[%u].diffuse.xyz) / att;\n", i); + " * ffp_light[%u].diffuse.xyz) * att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" - " * ffp_light[%u].specular) / att;\n", i); - shader_addline(buffer, "}\n"); + " * ffp_light[%u].specular) * att;\n", i); + if (!legacy_lighting) + shader_addline(buffer, "}\n"); break; case WINED3D_LIGHT_SPOT: @@ -5464,20 +5478,35 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "dst.z = dot(dir, dir);\n"); shader_addline(buffer, "dst.y = sqrt(dst.z);\n"); shader_addline(buffer, "dst.x = 1.0;\n"); - shader_addline(buffer, "if (dst.y <= ffp_light[%u].range)\n{\n", i); + if (legacy_lighting) + { + shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", i, i); + shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + } + else + { + shader_addline(buffer, "if (dst.y <= ffp_light[%u].range)\n{\n", i); + } shader_addline(buffer, "dir = normalize(dir);\n"); shader_addline(buffer, "t = dot(-dir, normalize(ffp_light[%u].direction));\n", i); shader_addline(buffer, "if (t > ffp_light[%u].cos_htheta) att = 1.0;\n", i); shader_addline(buffer, "else if (t <= ffp_light[%u].cos_hphi) att = 0.0;\n", i); shader_addline(buffer, "else att = pow((t - ffp_light[%u].cos_hphi)" - " / (ffp_light[%u].cos_htheta - ffp_light[%u].cos_hphi), ffp_light[%u].falloff)" - " / dot(dst.xyz, vec3(ffp_light[%u].c_att," - " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", - i, i, i, i, i, i, i); + " / (ffp_light[%u].cos_htheta - ffp_light[%u].cos_hphi), ffp_light[%u].falloff);\n", + i, i, i, i); + if (legacy_lighting) + shader_addline(buffer, "att *= dot(dst.xyz, vec3(ffp_light[%u].c_att," + " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", + i, i, i); + else + shader_addline(buffer, "att /= dot(dst.xyz, vec3(ffp_light[%u].c_att," + " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", + i, i, i); shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", i); if (!settings->normal) { - shader_addline(buffer, "}\n"); + if (!legacy_lighting) + shader_addline(buffer, "}\n"); break; } shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" @@ -5488,7 +5517,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * ffp_light[%u].specular) * att;\n", i); - shader_addline(buffer, "}\n"); + if (!legacy_lighting) + shader_addline(buffer, "}\n"); break; case WINED3D_LIGHT_DIRECTIONAL: @@ -5523,7 +5553,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffer *buffer, - const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info) + const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info, + BOOL legacy_lighting) { GLuint shader_obj; unsigned int i; @@ -5588,7 +5619,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe else shader_addline(buffer, "vec3 normal = ffp_normal_matrix * gl_Normal;\n"); - shader_glsl_ffp_vertex_lighting(buffer, settings, gl_info); + shader_glsl_ffp_vertex_lighting(buffer, settings, gl_info, legacy_lighting); for (i = 0; i < MAX_TEXTURES; ++i) { @@ -6292,7 +6323,7 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct return NULL; shader->desc.settings = *settings; - shader->id = shader_glsl_generate_ffp_vertex_shader(&priv->shader_buffer, settings, gl_info); + shader->id = shader_glsl_generate_ffp_vertex_shader(&priv->shader_buffer, settings, gl_info, priv->legacy_lighting); list_init(&shader->linked_programs); if (wine_rb_put(&priv->ffp_vertex_shaders, &shader->desc.settings, &shader->desc.entry) == -1) ERR("Failed to insert ffp vertex shader.\n"); @@ -7246,6 +7277,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(gl_info, &fragment_caps); priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + priv->legacy_lighting = device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING; device->vertex_priv = vertex_priv; device->fragment_priv = fragment_priv;

1 0

Matteo Bruni : ddraw: D3DRENDERSTATE_LOCALVIEWER doesn' t exist before d3d7.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 72722222a74b6caa337d8e234fa27b002636f74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72722222a74b6caa337d8e234… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:15 2015 +0200 ddraw: D3DRENDERSTATE_LOCALVIEWER 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 bc19897..408eb24 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2529,6 +2529,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_LIGHTING: case D3DRENDERSTATE_NORMALIZENORMALS: + case D3DRENDERSTATE_LOCALVIEWER: *value = 0xffffffff; return D3D_OK; @@ -2889,6 +2890,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_LIGHTING: case D3DRENDERSTATE_NORMALIZENORMALS: + case D3DRENDERSTATE_LOCALVIEWER: hr = D3D_OK; break;

1 0

Mark Harmstone : uxtheme: Stub out GetThemeTransitionDuration.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 2b36f195b62487d65bcf252c5690f9dd86074ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b36f195b62487d65bcf252c5… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 30 22:48:10 2015 +0100 uxtheme: Stub out GetThemeTransitionDuration. --- dlls/uxtheme/metric.c | 12 ++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 043f836..daf17ca 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -223,3 +223,15 @@ HRESULT WINAPI GetThemeSysString(HTHEME hTheme, int iStringID, return MSSTYLES_GetPropertyString(tp, pszStringBuff, cchMaxStringChars); return E_PROP_ID_UNSUPPORTED; } + +/*********************************************************************** + * GetThemeTransitionDuration (UXTHEME.@) + */ +HRESULT WINAPI GetThemeTransitionDuration(HTHEME hTheme, int iPartId, int iStateIdFrom, + int iStateIdTo, int iPropId, DWORD *pdwDuration) +{ + FIXME("(%p, %u, %u, %u, %u, %p) stub\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, + iPropId, pdwDuration); + + return E_NOTIMPL; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 7d84faf..3f8e89a 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -91,6 +91,7 @@ @ stdcall GetThemeSysString(ptr long wstr long) @ stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr) @ stdcall GetThemeTextMetrics(ptr ptr long long ptr) +@ stdcall GetThemeTransitionDuration(ptr long long long long ptr) @ stdcall GetWindowTheme(ptr) @ stdcall HitTestThemeBackground(ptr long long long long ptr long int64 ptr) @ stdcall IsAppThemed() diff --git a/include/uxtheme.h b/include/uxtheme.h index e6994a1..e167d80 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -146,6 +146,7 @@ HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int); HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD, const RECT*,RECT*); HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRICW*); +HRESULT WINAPI GetThemeTransitionDuration(HTHEME,int,int,int,int,DWORD*); HTHEME WINAPI GetWindowTheme(HWND); #define HTTB_BACKGROUNDSEG 0x0000

1 0

Henri Verbeet : d3drm: Release the child object after we' re done with it in load_mesh_data() (Valgrind).
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 23f0e97071db775778109dc0d6258c324bd225b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f0e97071db775778109dc0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 16:46:41 2015 +0200 d3drm: Release the child object after we're done with it in load_mesh_data() (Valgrind). --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e4d6d86..c24d9dc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1250,20 +1250,21 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, IDirectXFileData *data; char **filename; - hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileData, (void **)&data); - if (FAILED(hr)) + if (FAILED(hr = IDirectXFileObject_QueryInterface(material_child, + &IID_IDirectXFileData, (void **)&data))) { IDirectXFileDataReference *reference; - hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileDataReference, (void **)&reference); - if (FAILED(hr)) - goto end; - - hr = IDirectXFileDataReference_Resolve(reference, &data); - IDirectXFileDataReference_Release(reference); - if (FAILED(hr)) - goto end; + if (SUCCEEDED(IDirectXFileObject_QueryInterface(material_child, + &IID_IDirectXFileDataReference, (void **)&reference))) + { + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + } } + IDirectXFileObject_Release(material_child); + if (FAILED(hr)) + goto end; hr = IDirectXFileData_GetType(data, &guid); if (hr != DXFILE_OK) @@ -1308,6 +1309,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, } } } + IDirectXFileData_Release(data); } else if (hr != DXFILEERR_NOMOREOBJECTS) {

1 0

Henri Verbeet : d3drm: Release the child object after we' re done with it in load_data() (Valgrind).
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 90239052ab5dd011d0bd1f747cf5a7b6312a57b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90239052ab5dd011d0bd1f747… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 16:46:40 2015 +0200 d3drm: Release the child object after we're done with it in load_data() (Valgrind). --- dlls/d3drm/d3drm.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 725093f..7b74cfb 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1173,32 +1173,29 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID IDirectXFileDataReference *reference; IDirectXFileBinary *binary; - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileBinary, (void **)&binary))) { FIXME("Binary Object not supported yet\n"); IDirectXFileBinary_Release(binary); - continue; } - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); - if (SUCCEEDED(hr)) + else if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileData, (void **)&data))) { TRACE("Found Data Object\n"); hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); IDirectXFileData_Release(data); - continue; } - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); - if (SUCCEEDED(hr)) + else if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileDataReference, (void **)&reference))) { TRACE("Found Data Object Reference\n"); IDirectXFileDataReference_Resolve(reference, &data); hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); IDirectXFileData_Release(data); IDirectXFileDataReference_Release(reference); - continue; } + IDirectXFileObject_Release(child); } if (hr != DXFILEERR_NOMOREOBJECTS)

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