wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity).
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: fde563b0d49b00d277b67605d3e99436dd68327f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde563b0d49b00d277b67605d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 22:28:23 2016 +0300 wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 22b5c06..bf2af5b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -154,9 +154,9 @@ static void format_filelist_filename(LPWSTR file, LPWSTR out) { LPWSTR pos_basename; LPWSTR truncpos1, truncpos2; - WCHAR myDocs[MAX_STRING_LEN]; + WCHAR myDocs[MAX_PATH]; - SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, (LPWSTR)&myDocs); + SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, myDocs); pos_basename = file_basename(file); truncpos1 = NULL; truncpos2 = NULL;

1 0

Francois Gouget : mshtml: Fix spelling of an HTMLEmbedElement method implementation name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 91c3e75bb58de0e5c5e06393809681abc35e162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3e75bb58de0e5c5e063938… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 11:30:10 2016 +0200 mshtml: Fix spelling of an HTMLEmbedElement method implementation name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlembed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index 506b4b5..5b3c1c1 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -110,7 +110,7 @@ static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR return E_NOTIMPL; } -static HRESULT WINAPI HTMLEmbedElement_get_palete(IHTMLEmbedElement *iface, BSTR *p) +static HRESULT WINAPI HTMLEmbedElement_get_palette(IHTMLEmbedElement *iface, BSTR *p) { HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); @@ -204,7 +204,7 @@ static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_Invoke, HTMLEmbedElement_put_hidden, HTMLEmbedElement_get_hidden, - HTMLEmbedElement_get_palete, + HTMLEmbedElement_get_palette, HTMLEmbedElement_get_pluginspage, HTMLEmbedElement_put_src, HTMLEmbedElement_get_src,

1 0

Paul Gofman : d3dx9: D3DXVec3Transform should support input and output parameter overlap.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 1ba9cfb5c33f71cd1e1a2ba832b843ca4219a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba9cfb5c33f71cd1e1a2ba83… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Apr 12 13:09:17 2016 +0300 d3dx9: D3DXVec3Transform should support input and output parameter overlap. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 11 +++++++---- dlls/d3dx9_36/tests/math.c | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index da33074..394ff05 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1898,12 +1898,15 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3* out, UINT outstride, const D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cbe94b5..0fe6796 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1361,8 +1361,12 @@ static void D3DXVector3Test(void) /*_______________D3DXVec3Transform_______________________*/ expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; - D3DXVec3Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + D3DXVec3Transform(&gottrans, &u, &mat); + expect_vec4(expectedtrans, gottrans); + + gottrans.x = u.x; gottrans.y = u.y; gottrans.z = u.z; + D3DXVec3Transform(&gottrans, (D3DXVECTOR3 *)&gottrans, &mat); + expect_vec4(expectedtrans, gottrans); /*_______________D3DXVec3TransformCoord_______________________*/ expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f;

1 0

Stefan Dösinger : wined3d: Explicitly pass a wined3d_state structure to draw_primitive().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: a3401dfaf24b48bf52cd7c891e171cee99e79097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3401dfaf24b48bf52cd7c891… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 13 19:09:56 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/drawprim.c | 23 ++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3692c6b..583f1e2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -311,7 +311,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_draw *op = data; - draw_primitive(cs->device, op->start_idx, op->index_count, + draw_primitive(cs->device, &cs->device->state, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d83b494..6857b0d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -407,10 +407,11 @@ static void remove_vbos(struct wined3d_context *context, } /* Routine common to the draw primitive and draw indexed primitive routines */ -void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed) +void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, + unsigned int instance_count, BOOL indexed) { - const struct wined3d_state *state = &device->state; + const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; struct wined3d_stream_info si_emulated; @@ -423,7 +424,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!index_count) return; - context = context_acquire(device, wined3d_rendertarget_view_get_surface(device->fb.render_targets[0])); + context = context_acquire(device, wined3d_rendertarget_view_get_surface(fb->render_targets[0])); if (!context->valid) { context_release(context); @@ -432,9 +433,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } gl_info = context->gl_info; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_rendertarget_view *rtv = device->fb.render_targets[i]; + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); if (target && rtv->format->id != WINED3DFMT_NULL) @@ -452,16 +453,16 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } } - if (device->fb.depth_stencil) + if (fb->depth_stencil) { /* Note that this depends on the context_acquire() call above to set * context->render_offscreen properly. We don't currently take the * Z-compare function into account, but we could skip loading the * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? device->fb.depth_stencil->resource->draw_binding + DWORD location = context->render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(device->fb.depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) { @@ -494,9 +495,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co return; } - if (device->fb.depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + if (fb->depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(device->fb.depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d74f143..4f0a9f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1181,8 +1181,9 @@ struct wined3d_stream_info WORD use_map; /* MAX_ATTRIBS, 16 */ }; -void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, + unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_set().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: c9d82ffa434f7ffca67259c1e1931c9d5bb0afd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d82ffa434f7ffca67259c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:55 2016 +0200 wined3d: Use the texture dimension helpers in arbfp_blit_set(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 06163ab..fac97fe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7681,8 +7681,6 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) { - GLuint shader; - float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; const struct wined3d_texture *texture = surface->container; struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; @@ -7691,6 +7689,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; struct wined3d_color float_color_key[2]; + struct wined3d_vec4 size; + GLuint shader; + + size.x = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); + size.y = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + size.z = 1.0f; + size.w = 1.0f; if (is_complex_fixup(texture->resource.format->color_fixup)) fixup = get_complex_fixup(texture->resource.format->color_fixup); @@ -7787,7 +7792,7 @@ err_out: checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, size)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, &size.x)); checkGLcall("glProgramLocalParameter4fvARB"); if (type.use_color_key) {

1 0

Henri Verbeet : wined3d: Store the power-of-two dimensions in the texture.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 1e0603eb58aaa3e28880bf82782619867ae441f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0603eb58aaa3e28880bf827… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:54 2016 +0200 wined3d: Store the power-of-two dimensions in the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 ++------------------- dlls/wined3d/texture.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cbaa14f..de82dda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4501,25 +4501,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex unsigned int resource_size; HRESULT hr; - if (container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - unsigned int pow2_width = 1, pow2_height = 1; - - /* Find the nearest pow2 match. */ - while (pow2_width < desc->width) - pow2_width <<= 1; - while (pow2_height < desc->height) - pow2_height <<= 1; - - surface->pow2Width = pow2_width; - surface->pow2Height = pow2_height; - } - else - { - surface->pow2Width = desc->width; - surface->pow2Height = desc->height; - } - /* Quick lockable sanity check. * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this. @@ -4564,6 +4545,8 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex } surface->container = container; + surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); + surface->pow2Height = wined3d_texture_get_level_pow2_height(container, level); surface->texture_target = target; surface->texture_level = level; surface->texture_layer = layer; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1d60cb..2ca94c0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -899,18 +899,20 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = surface->pow2Height = 1; - while (surface->pow2Width < width) - surface->pow2Width <<= 1; - while (surface->pow2Height < height) - surface->pow2Height <<= 1; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = width; - surface->pow2Height = height; + texture->pow2_width = width; + texture->pow2_height = height; } + surface->pow2Width = texture->pow2_width; + surface->pow2Height = texture->pow2_height; sub_resource->locations = 0; @@ -1556,6 +1558,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } } + texture->pow2_width = pow2_width; + texture->pow2_height = pow2_height; if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) && (desc->usage & WINED3DUSAGE_TEXTURE)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 967f39e..d74f143 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2449,6 +2449,8 @@ struct wined3d_texture const struct wined3d_texture_ops *texture_ops; struct gl_texture texture_rgb, texture_srgb; struct wined3d_swapchain *swapchain; + unsigned int pow2_width; + unsigned int pow2_height; UINT layer_count; UINT level_count; unsigned int download_count; @@ -2521,6 +2523,18 @@ static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_ return max(1, texture->resource.depth >> level); } +static inline unsigned int wined3d_texture_get_level_pow2_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_width >> level); +} + +static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_height >> level); +} + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: fca93ef017262657f56aa72796a2fd6fe447d27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca93ef017262657f56aa7279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:53 2016 +0200 wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2e5081..cbaa14f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2836,7 +2836,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { @@ -2882,7 +2882,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target);

1 0

Henri Verbeet : wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 64767de27798c79a91e9b3a93f2e8a14aadd258f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64767de27798c79a91e9b3a93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:52 2016 +0200 wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bada5fe..e5c7da6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -682,9 +682,9 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("offset %s.\n", wine_dbgstr_point(&offset)); draw_rect.left = 0; - draw_rect.right = front->resource.width; + draw_rect.right = swapchain->front_buffer->resource.width; draw_rect.top = 0; - draw_rect.bottom = front->resource.height; + draw_rect.bottom = swapchain->front_buffer->resource.height; IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y,

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: d7e051902df31578af302dfbd743df199a52b575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e051902df31578af302dfbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:51 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 02b5db6..cb60a24 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -79,9 +79,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = volume->container; const struct wined3d_format *format = texture->resource.format; - UINT width = volume->resource.width; - UINT height = volume->resource.height; - UINT depth = volume->resource.depth; + unsigned int width, height, depth; const void *mem = data->addr; void *converted_mem = NULL; @@ -89,6 +87,10 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + width = wined3d_texture_get_level_width(texture, volume->texture_level); + height = wined3d_texture_get_level_height(texture, volume->texture_level); + depth = wined3d_texture_get_level_depth(texture, volume->texture_level); + if (format->convert) { UINT dst_row_pitch, dst_slice_pitch;

1 0

Nikolay Sivov : webservices: Fix unsupported options detection (Coverity).
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 1ccc52169730079414eb3e4d1a18ec1131bb6ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc52169730079414eb3e4d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 19:00:40 2016 +0300 webservices: Fix unsupported options detection (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c2c9d0b..09b370e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2761,7 +2761,7 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) { - if (options & !(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + if (options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) { FIXME( "options %08x not supported\n", options ); return 0;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016