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

Jacek Caban : user32: Use top level window as dialog parent for modal dialogs.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 9da0c00a68c43348c2c00878f9a874dbb260147f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da0c00a68c43348c2c00878f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:40:54 2016 +0200 user32: Use top level window as dialog parent for modal dialogs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 3ea426d..2bacf4d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -587,24 +587,24 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (modal && owner) { HWND parent; - disabled_owner = owner; /* * Owner needs to be top level window. We need to duplicate the logic from server, - * because we need to disable it before creating dialog window. + * because we need to disable it before creating dialog window. Note that we do that + * even if dialog has WS_CHILD, but only for modal dialogs, which matched what + * Windows does. */ - while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) { - parent = GetParent( disabled_owner ); + parent = GetParent( owner ); if (!parent || parent == GetDesktopWindow()) break; - disabled_owner = parent; + owner = parent; } - if (IsWindowEnabled( disabled_owner )) + if (IsWindowEnabled( owner )) { flags |= DF_OWNERENABLED; + disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } - else - disabled_owner = NULL; } if (unicode)

1 0

Jacek Caban : user32: Use GWLP_HWNDPARENT to find an owner in EndDialog.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 2f8f9d20aa50b5ae0c65f42196d3c7f513a61fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8f9d20aa50b5ae0c65f4219… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:03 2016 +0200 user32: Use GWLP_HWNDPARENT to find an owner in EndDialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2bacf4d..2804ed2 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -914,7 +914,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) dlgInfo->idResult = retval; dlgInfo->flags |= DF_END; - owner = GetWindow( hwnd, GW_OWNER ); + owner = (HWND)GetWindowLongPtrA( hwnd, GWLP_HWNDPARENT ); if (owner) EnableWindow( owner, TRUE );

1 0

Jacek Caban : user32: Don't enable owner in DIALOG_DoDialogBox.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: fc4b906d784db3681d1626d29becb886cf1a6d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b906d784db3681d1626d29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:10 2016 +0200 user32: Don't enable owner in DIALOG_DoDialogBox. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 - dlls/user32/dialog.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 542bf39..4fdab62 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -241,7 +241,6 @@ typedef struct tagDIALOGINFO } DIALOGINFO; #define DF_END 0x0001 -#define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2804ed2..b5ed902 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -601,7 +601,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } if (IsWindowEnabled( owner )) { - flags |= DF_OWNERENABLED; disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } @@ -822,7 +821,6 @@ INT DIALOG_DoDialogBox( HWND hwnd ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval;

1 0

Józef Kucia : include: Add D3D11_KEEP_* constants.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: d8ebf2efed676be6bbe196b662ea3777e03e730b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ebf2efed676be6bbe196b66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:34 2016 +0200 include: Add D3D11_KEEP_* constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 805a557..b49d6f4 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -103,6 +103,9 @@ const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX = 15; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +const UINT D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL = 0xffffffff; +const UINT D3D11_KEEP_UNORDERED_ACCESS_VIEWS = 0xffffffff; + const UINT D3D11_SHADER_MAJOR_VERSION = 5; const UINT D3D11_SHADER_MAX_INSTANCES = 65535; const UINT D3D11_SHADER_MAX_INTERFACES = 253;

1 0

Józef Kucia : d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 6d05587bafe0dce338ec5811ff5b910abebb50cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d05587bafe0dce338ec5811f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:35 2016 +0200 d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f0bb52e..569d397 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -602,10 +602,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord { FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, unordered_access_views %p, " - "initial_counts %p stub!\n", + "initial_counts %p partial-stub!\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views, initial_counts); + + if (render_target_view_count != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + { + d3d11_immediate_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, + depth_stencil_view); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface,

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 81dae1c6362bcd0d0b2571e535f3a3ed4f9ff616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dae1c6362bcd0d0b2571e53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:57 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c015cc..301aa16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2172,9 +2172,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ - UINT fbwidth = src_surface->resource.width; - UINT fbheight = src_surface->resource.height; const struct wined3d_gl_info *gl_info; + unsigned int src_width, src_height; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; @@ -2192,6 +2191,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); + src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; @@ -2258,7 +2259,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* TODO: Only back up the part that will be overwritten */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, src_width, src_height); checkGLcall("glCopyTexSubImage2D"); @@ -2288,7 +2289,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_surface->pow2Width, src_surface->pow2Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); checkGLcall("glTexImage2D"); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, src_width, src_height); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); @@ -2312,13 +2313,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (!upsidedown) { - top = src_surface->resource.height - src_rect->top; - bottom = src_surface->resource.height - src_rect->bottom; + top = src_height - src_rect->top; + bottom = src_height - src_rect->bottom; } else { - top = src_surface->resource.height - src_rect->bottom; - bottom = src_surface->resource.height - src_rect->top; + top = src_height - src_rect->bottom; + bottom = src_height - src_rect->top; } if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) @@ -2398,20 +2399,20 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glBegin(GL_QUADS); /* top left */ gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(0, fbheight); + gl_info->gl_ops.gl.p_glVertex2i(0, src_height); /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)fbheight / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_surface->pow2Height); gl_info->gl_ops.gl.p_glVertex2i(0, 0); /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, - (float)fbheight / (float)src_surface->pow2Height); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, 0); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, + (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glVertex2i(src_width, 0); /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, fbheight); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, 0.0f); + gl_info->gl_ops.gl.p_glVertex2i(src_width, src_height); gl_info->gl_ops.gl.p_glEnd(); } gl_info->gl_ops.gl.p_glDisable(texture_target);

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 35fdf09643e5f45b7cc688f2c9ceb9b9ade98b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35fdf09643e5f45b7cc688f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:58 2016 +0200 wined3d: Use the texture dimension helpers in surface_translate_drawable_coords(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 301aa16..3e45599 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2447,9 +2447,10 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * origin, while D3D has a top-left origin. */ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) { + struct wined3d_texture *texture = surface->container; UINT drawable_height; - if (surface->container->swapchain && surface->container == surface->container->swapchain->front_buffer) + if (texture->swapchain && texture == texture->swapchain->front_buffer) { POINT offset = {0, 0}; RECT windowsize; @@ -2462,7 +2463,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } else { - drawable_height = surface->resource.height; + drawable_height = wined3d_texture_get_level_height(texture, surface->texture_level); } rect->top = drawable_height - rect->top;

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 8c3b0aead55654a4b349ca0fc263907252e32bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3b0aead55654a4b349ca0fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:59 2016 +0200 wined3d: Use the texture dimension helpers in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e45599..5fd238e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2662,6 +2662,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if ((src_swapchain || src_surface == rt) && !dst_swapchain) { + unsigned int src_width, src_height; /* Blit from render target to texture */ BOOL stretchx; @@ -2695,8 +2696,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - if (!stretchx || dst_rect->right - dst_rect->left > src_surface->resource.width - || dst_rect->bottom - dst_rect->top > src_surface->resource.height) + src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + if (!stretchx || dst_rect->right - dst_rect->left > src_width + || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter);

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 7c9ff85452003ad6ea1b45c9b0d405816b3a3b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9ff85452003ad6ea1b45c9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:38:00 2016 +0200 wined3d: Use the texture dimension helpers 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 5fd238e..8ac3b2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2820,8 +2820,8 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win } else { - w = surface->resource.width; - h = surface->resource.height; + w = wined3d_texture_get_level_width(surface->container, surface->texture_level); + h = wined3d_texture_get_level_height(surface->container, surface->texture_level); } if (surface->current_renderbuffer)

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 11db4d4a1d1b9a63962f3ef1f5dac616dd7d4fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db4d4a1d1b9a63962f3ef1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:38:01 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ac3b2f..5427ee9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3044,8 +3044,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; - const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; + unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -3056,6 +3055,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_format format; POINT dst_point = {0, 0}; BYTE *mem = NULL; + RECT src_rect; sub_resource = surface_get_sub_resource(surface); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3067,6 +3067,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } + width = wined3d_texture_get_level_width(texture, surface->texture_level); + height = wined3d_texture_get_level_height(texture, surface->texture_level); + SetRect(&src_rect, 0, 0, width, height); + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, @@ -3092,10 +3096,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - RECT rect = {0, 0, surface->resource.width, surface->resource.height}; surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, - &rect, surface, dst_location, &rect); + &src_rect, surface, dst_location, &src_rect); return WINED3D_OK; } @@ -3134,8 +3137,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_bind_and_dirtify(texture, context, srgb); wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); - width = surface->resource.width; - format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) format = *wined3d_get_format(gl_info, conversion->dst_format); @@ -3160,8 +3161,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (format.convert) { /* This code is entered for texture formats which need a fixup. */ - UINT height = surface->resource.height; - format.byte_count = format.conv_byte_count; wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -3180,7 +3179,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* This code is only entered for color keying fixups */ struct wined3d_palette *palette = NULL; - UINT height = surface->resource.height; wined3d_format_calculate_pitch(&format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch);

1 0