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

Nikolay Sivov : comctl32/listview: Remove redundant check in LVM_DELETECOLUMN handler.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: e0361765ab3bea4eae6d970176032dc6f4ce2df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0361765ab3bea4eae6d97017… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 12:18:51 2016 +0300 comctl32/listview: Remove redundant check in LVM_DELETECOLUMN handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 4 ++-- dlls/comctl32/tests/listview.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a32c594..6ab360b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5621,8 +5621,8 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) TRACE("nColumn=%d\n", nColumn); - if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) == 0 - || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; + if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) + return FALSE; /* While the MSDN specifically says that column zero should not be deleted, what actually happens is that the column itself is deleted but no items or subitems diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8214d7b..97f611f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1420,6 +1420,12 @@ static void test_columns(void) 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); + rc = SendMessageA(hwnd, LVM_DELETECOLUMN, -1, 0); + ok(!rc, "got %d\n", rc); + + rc = SendMessageA(hwnd, LVM_DELETECOLUMN, 0, 0); + ok(!rc, "got %d\n", rc); + /* Add a column with no mask */ memset(&column, 0xcc, sizeof(column)); column.mask = 0;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_texture_3d().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 1cc4d8486b817681ff7e519a2ff190f52edf1c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc4d8486b817681ff7e519a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 12:49:03 2016 +0200 wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_texture_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dfcebc0..1ada36e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3607,7 +3607,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, data.buffer_object = 0; data.addr = src.data; - wined3d_volume_upload_data(dst_texture, i, context, &data); + wined3d_texture_upload_data(dst_texture, i, context, &data, src.row_pitch, src.slice_pitch); wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a9ed42..51b02d8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1426,7 +1426,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e933909..c1bc638 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2768,6 +2768,9 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN; +void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use texture3d_upload_data() in texture3d_srgb_transfer().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 0bf35ec975ec90654911659a9da5c7db1ac948f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf35ec975ec90654911659a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 12:49:04 2016 +0200 wined3d: Use texture3d_upload_data() in texture3d_srgb_transfer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 51b02d8..4f9fb0a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2122,6 +2122,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, BOOL dest_is_srgb) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + unsigned int row_pitch, slice_pitch; struct wined3d_bo_address data; /* Optimisations are possible, but the effort should be put into either @@ -2135,10 +2136,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, sub_resource->size))) return; + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - wined3d_volume_upload_data(texture, sub_resource_idx, context, wined3d_const_bo_address(&data)); + texture3d_upload_data(texture, sub_resource_idx, context, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); HeapFree(GetProcessHeap(), 0, data.addr); }

1 0

Henri Verbeet : wined3d: Use texture3d_upload_data() in texture3d_load_location().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 61fa6ea2c547ccd1b1274b473328a6134b57469e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fa6ea2c547ccd1b1274b473… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 12:49:05 2016 +0200 wined3d: Use texture3d_upload_data() in texture3d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4f9fb0a..bf4b43d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2152,6 +2152,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; DWORD required_access = wined3d_resource_access_from_location(location); + unsigned int row_pitch, slice_pitch; TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); @@ -2192,14 +2193,16 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) {

1 0

Henri Verbeet : wined3d: Merge wined3d_volume_upload_data() into texture3d_upload_data().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 9b7ff40d7e2bf1a6bafffe65a94d2381e8fb1c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7ff40d7e2bf1a6bafffe65a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 12:49:06 2016 +0200 wined3d: Merge wined3d_volume_upload_data() into texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/texture.c | 58 ++++++++++++++++++++++++++-- dlls/wined3d/volume.c | 87 ------------------------------------------ dlls/wined3d/wined3d_private.h | 3 -- 4 files changed, 54 insertions(+), 95 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index e631a15..edee588 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -29,7 +29,6 @@ C_SRCS = \ utils.c \ vertexdeclaration.c \ view.c \ - volume.c \ wined3d_main.c RC_SRCS = version.rc diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bf4b43d..5a59f17 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2072,17 +2072,67 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } +/* This call just uploads data, the caller is responsible for binding the + * correct texture. */ +/* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { + const struct wined3d_format *format = texture->resource.format; + unsigned int level = sub_resource_idx % texture->level_count; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int dst_row_pitch, dst_slice_pitch; + unsigned int width, height, depth; + const void *mem = data->addr; + void *converted_mem = NULL; + + TRACE("texture %p, sub_resource_idx %u, context %p, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", + texture, sub_resource_idx, context, data->buffer_object, data->addr, row_pitch, slice_pitch); + + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); + depth = wined3d_texture_get_level_depth(texture, level); + + if (format->convert) + { + if (data->buffer_object) + ERR("Loading a converted texture from a PBO.\n"); + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + dst_row_pitch = width * format->conv_byte_count; + dst_slice_pitch = dst_row_pitch * height; + + converted_mem = wined3d_calloc(depth, dst_slice_pitch); + format->convert(data->addr, converted_mem, row_pitch, slice_pitch, + dst_row_pitch, dst_slice_pitch, width, height, depth); + mem = converted_mem; + } + else + { + wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); + if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) + FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + } + + GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, 0, 0, 0, + width, height, depth, format->glFormat, format->glType, mem)); + checkGLcall("glTexSubImage3D"); - wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); - if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } - wined3d_volume_upload_data(texture, sub_resource_idx, context, data); + HeapFree(GetProcessHeap(), 0, converted_mem); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c deleted file mode 100644 index a44f411..0000000 --- a/dlls/wined3d/volume.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2002-2005 Jason Edmeades - * Copyright 2002-2005 Raphael Junqueira - * Copyright 2005 Oliver Stieber - * Copyright 2009-2011 Henri Verbeet for CodeWeavers - * Copyright 2013 Stefan Dösinger for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" -#include "wined3d_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d); - -/* This call just uploads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data) -{ - const struct wined3d_format *format = texture->resource.format; - unsigned int level = sub_resource_idx % texture->level_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int width, height, depth; - const void *mem = data->addr; - void *converted_mem = NULL; - - TRACE("texture %p, sub_resource_idx %u, context %p, format %s (%#x).\n", - texture, level, context, debug_d3dformat(format->id), format->id); - - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - if (format->convert) - { - UINT dst_row_pitch, dst_slice_pitch; - UINT src_row_pitch, src_slice_pitch; - - if (data->buffer_object) - ERR("Loading a converted texture from a PBO.\n"); - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); - - dst_row_pitch = width * format->conv_byte_count; - dst_slice_pitch = dst_row_pitch * height; - - wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); - - converted_mem = wined3d_calloc(depth, dst_slice_pitch); - format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, width, height, depth); - mem = converted_mem; - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, 0, 0, 0, - width, height, depth, format->glFormat, format->glType, mem)); - checkGLcall("glTexSubImage3D"); - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - HeapFree(GetProcessHeap(), 0, converted_mem); -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c1bc638..f428245 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2786,9 +2786,6 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; -void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; - struct wined3d_renderbuffer_entry { struct list entry;

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_load_location().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 3b61af6306361953d6fff924078c9017db397b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b61af6306361953d6fff9240… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 12:49:07 2016 +0200 wined3d: Introduce wined3d_texture_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5a59f17..1f0a97a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -174,6 +174,14 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, sub_resource_idx, texture); } +/* Context activation is done by the caller. Context may be NULL in + * WINED3D_NO3D mode. */ +static BOOL wined3d_texture_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) +{ + return texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); +} + /* Context activation is done by the caller. */ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size_t size, const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) @@ -352,7 +360,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) for (i = 0; i < sub_count; ++i) { if (texture->sub_resources[i].locations == texture->resource.map_binding - && !texture->texture_ops->texture_load_location(texture, i, context, map_binding)) + && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) wined3d_texture_remove_buffer_object(texture, i, context->gl_info); @@ -914,7 +922,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, TRACE("Reloading because of color key value change.\n"); for (i = 0; i < sub_count; i++) { - if (!texture->texture_ops->texture_load_location(texture, i, context, texture->resource.map_binding)) + if (!wined3d_texture_load_location(texture, i, context, texture->resource.map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); else wined3d_texture_invalidate_location(texture, i, ~texture->resource.map_binding); @@ -932,7 +940,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - if (!texture->texture_ops->texture_load_location(texture, i, context, + if (!wined3d_texture_load_location(texture, i, context, srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load location (srgb %#x).\n", srgb); } @@ -1413,8 +1421,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); context = context_acquire(texture->resource.device, NULL); - if (!texture->texture_ops->texture_load_location(texture, sub_resource_idx, - context, texture->resource.map_binding)) + if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) { ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); context_release(context); @@ -1591,7 +1598,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; if (resource->pool != WINED3D_POOL_DEFAULT - && texture->texture_ops->texture_load_location(texture, i, context, resource->map_binding)) + && wined3d_texture_load_location(texture, i, context, resource->map_binding)) { wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); } @@ -1710,8 +1717,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour { if (resource->usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic texture without WINED3D_MAP_DISCARD.\n"); - ret = texture->texture_ops->texture_load_location(texture, - sub_resource_idx, context, texture->resource.map_binding); + ret = wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } if (!ret)

1 0

Michael Stefaniuc : mshtml: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 85916a10ad8e4372139c3bfa65935264dff61fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85916a10ad8e4372139c3bfa6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 22:06:02 2016 +0200 mshtml: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index fb77ee1..275ba0c 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1328,7 +1328,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) if(doc->ip_window) call_set_active_object(doc->ip_window, &doc->basedoc.IOleInPlaceActiveObject_iface); - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + SetRectEmpty(&rcBorderWidths); if(doc->frame) IOleInPlaceFrame_SetBorderSpace(doc->frame, &rcBorderWidths); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 4470a43..2a55938 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -650,7 +650,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f if(This->doc_obj->ip_window) call_set_active_object(This->doc_obj->ip_window, &This->IOleInPlaceActiveObject_iface); - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + SetRectEmpty(&rcBorderWidths); IOleInPlaceFrame_SetBorderSpace(This->doc_obj->frame, &rcBorderWidths); This->doc_obj->ui_active = TRUE;

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMViewport*::Init.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 74b27abb63e5f595af69e9665022013b60fc2051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b27abb63e5f595af69e9665… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 28 23:06:47 2016 +0530 d3drm: Implement IDirect3DRMViewport*::Init. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 14 ++++ dlls/d3drm/d3drm_private.h | 5 ++ dlls/d3drm/frame.c | 4 +- dlls/d3drm/tests/d3drm.c | 181 +++++++++++++++++++++++++++++++++++++++++---- dlls/d3drm/viewport.c | 131 ++++++++++++++++++++++++++++++-- 5 files changed, 311 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74b27abb63e5f595af69e…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM*::CreateViewport.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 202df3e1ecf489c12e6965aaeddde8fee889cd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202df3e1ecf489c12e6965aae… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 28 23:06:48 2016 +0530 d3drm: Implement IDirect3DRM*::CreateViewport. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 77 ++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=202df3e1ecf489c12e696…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMViewport:: GetDirect3DViewport.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: c17fd6a8591d754b9fdec19b2f8aeb8a8ccd499f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17fd6a8591d754b9fdec19b2… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 28 23:06:49 2016 +0530 d3drm: Implement IDirect3DRMViewport::GetDirect3DViewport. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/viewport.c | 18 ++++++++++--- 2 files changed, 80 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index eaa52b2..8278954 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1474,12 +1474,13 @@ static void test_Viewport(void) IDirect3DRMFrame3 *frame3; IDirect3DRMViewport *viewport; IDirect3DRMViewport2 *viewport2; + IDirect3DViewport *d3d_viewport; IDirect3DRMObject *obj, *obj2; GUID driver; HWND window; RECT rc; DWORD size, data, ref1, ref2, ref3, ref4; - DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2; + DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; CHAR cname[64] = {0}; window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); @@ -1638,13 +1639,47 @@ static void test_Viewport(void) hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + viewport_ref = get_refcount((IUnknown *)d3d_viewport); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); IDirect3DRMViewport_Release(viewport); + hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + viewport_ref = get_refcount((IUnknown *)d3d_viewport); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); IDirect3DRMViewport2_Release(viewport2); hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + viewport_ref = get_refcount((IUnknown *)d3d_viewport); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); @@ -1710,6 +1745,9 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -1737,6 +1775,18 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame); ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + viewport_ref = get_refcount((IUnknown *)d3d_viewport); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -1765,6 +1815,9 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom); @@ -1785,6 +1838,18 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame3); ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + viewport_ref = get_refcount((IUnknown *)d3d_viewport); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + ref4 = get_refcount((IUnknown *)d3d_viewport); + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); + IDirect3DViewport_Release(d3d_viewport); + hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 99b2217..46d0f7c 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -825,17 +825,27 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport1_GetProjection(IDirect3DRMViewp static HRESULT WINAPI d3drm_viewport2_GetDirect3DViewport(IDirect3DRMViewport2 *iface, IDirect3DViewport **viewport) { - FIXME("iface %p, viewport %p stub!\n", iface, viewport); + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport2(iface); - return E_NOTIMPL; + TRACE("iface %p, viewport %p.\n", iface, viewport); + + if (!viewport_object->d3d_viewport) + return D3DRMERR_BADOBJECT; + + *viewport = viewport_object->d3d_viewport; + IDirect3DViewport_AddRef(*viewport); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *iface, IDirect3DViewport **viewport) { - FIXME("iface %p, viewport %p stub!\n", iface, viewport); + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport(iface); - return E_NOTIMPL; + TRACE("iface %p, viewport %p.\n", iface, viewport); + + return d3drm_viewport2_GetDirect3DViewport(&viewport_object->IDirect3DRMViewport2_iface, viewport); } static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface,

1 0