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

Henri Verbeet : wined3d: Only update the stateblock's "changed" field if we 're recording.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: b4d6f90f207adb8f548570529a4c3dfbecee5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d6f90f207adb8f548570529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:16 2013 +0200 wined3d: Only update the stateblock's "changed" field if we're recording. --- dlls/wined3d/device.c | 106 +++++++++++++++++++++++++++------------------ dlls/wined3d/stateblock.c | 7 +-- 2 files changed, 66 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4d6f90f207adb8f54857…

1 0

Stefan Dösinger : wined3d: Separate volume allocation and loading.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: e08e2b2ade0eccd0a0e3db76eaeb071c4e61accb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08e2b2ade0eccd0a0e3db76e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:55 2013 +0200 wined3d: Separate volume allocation and loading. --- dlls/wined3d/volume.c | 30 ++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d88282f..a452e0b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -78,7 +78,20 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture } /* Context activation is done by the caller. */ -void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, + const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = volume->resource.format; + + GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, format->glInternal, + volume->resource.width, volume->resource.height, volume->resource.depth, + 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); +} + +/* Context activation is done by the caller. */ +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; @@ -89,19 +102,28 @@ void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_con volume_bind_and_dirtify(volume, context); - GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, format->glInternal, + if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) + { + wined3d_volume_allocate_texture(volume, context); + volume->flags |= WINED3D_VFLAG_ALLOCATED; + } + + GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, volume->resource.width, volume->resource.height, volume->resource.depth, - 0, format->glFormat, format->glType, volume->resource.allocatedMemory)); - checkGLcall("glTexImage3D"); + format->glFormat, format->glType, volume->resource.allocatedMemory)); + checkGLcall("glTexSubImage3D"); } /* Do not call while under the GL lock. */ static void volume_unload(struct wined3d_resource *resource) { + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("texture %p.\n", resource); /* The whole content is shadowed on This->resource.allocatedMemory, and * the texture name is managed by the VolumeTexture container. */ + volume->flags &= ~WINED3D_VFLAG_ALLOCATED; resource_unload(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba7f03f..564ab67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2051,6 +2051,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_LOCKED 0x00000001 +#define WINED3D_VFLAG_ALLOCATED 0x00000002 struct wined3d_volume { @@ -2070,7 +2071,7 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc } void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) DECLSPEC_HIDDEN; -void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; struct wined3d_surface_dib

1 0

Stefan Dösinger : wined3d: Move volume data uploading into a separate function.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 518ac4c275b5fe3a83681e1dc7d9472412a111bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=518ac4c275b5fe3a83681e1dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:56 2013 +0200 wined3d: Move volume data uploading into a separate function. --- dlls/wined3d/volume.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a452e0b..14a5d5d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -91,15 +91,39 @@ static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, } /* Context activation is done by the caller. */ -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +static void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, + const struct wined3d_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; - TRACE("volume %p, context %p, level %u, srgb %#x, format %s (%#x).\n", - volume, context, volume->texture_level, srgb_mode, debug_d3dformat(format->id), + TRACE("volume %p, context %p, level %u, format %s (%#x).\n", + volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + + if (data->buffer_object) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, data->buffer_object)); + checkGLcall("glBindBufferARB"); + } + + GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, + volume->resource.width, volume->resource.height, volume->resource.depth, + format->glFormat, format->glType, data->addr)); + checkGLcall("glTexSubImage3D"); + + if (data->buffer_object) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); + } +} + +/* Context activation is done by the caller. */ +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +{ + struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; volume_bind_and_dirtify(volume, context); if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) @@ -108,10 +132,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * volume->flags |= WINED3D_VFLAG_ALLOCATED; } - GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - volume->resource.width, volume->resource.height, volume->resource.depth, - format->glFormat, format->glType, volume->resource.allocatedMemory)); - checkGLcall("glTexSubImage3D"); + wined3d_volume_upload_data(volume, context, &data); } /* Do not call while under the GL lock. */

1 0

Stefan Dösinger : wined3d: Remove locked and dirty boxes from volumes.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 07079d11097d11a6e7e6d33d52104cab0b4db800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07079d11097d11a6e7e6d33d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:57 2013 +0200 wined3d: Remove locked and dirty boxes from volumes. --- dlls/wined3d/texture.c | 2 -- dlls/wined3d/volume.c | 40 ---------------------------------------- dlls/wined3d/wined3d_private.h | 4 ---- 3 files changed, 0 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7a09445..f918540 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1095,7 +1095,6 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB for (i = 0; i < texture->level_count; ++i) { struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); - volume_add_dirty_box(volume, NULL); wined3d_volume_load(volume, context, texture->flags & WINED3D_TEXTURE_IS_SRGB); } } @@ -1113,7 +1112,6 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { - volume_add_dirty_box(volume_from_resource(sub_resource), dirty_region); } static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 14a5d5d..0852a7a 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -48,28 +48,6 @@ static void volume_bind_and_dirtify(const struct wined3d_volume *volume, struct container->texture_ops->texture_bind(container, context, FALSE); } -void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) -{ - if (dirty_box) - { - volume->lockedBox.left = min(volume->lockedBox.left, dirty_box->left); - volume->lockedBox.top = min(volume->lockedBox.top, dirty_box->top); - volume->lockedBox.front = min(volume->lockedBox.front, dirty_box->front); - volume->lockedBox.right = max(volume->lockedBox.right, dirty_box->right); - volume->lockedBox.bottom = max(volume->lockedBox.bottom, dirty_box->bottom); - volume->lockedBox.back = max(volume->lockedBox.back, dirty_box->back); - } - else - { - volume->lockedBox.left = 0; - volume->lockedBox.top = 0; - volume->lockedBox.front = 0; - volume->lockedBox.right = volume->resource.width; - volume->lockedBox.bottom = volume->resource.height; - volume->lockedBox.back = volume->resource.depth; - } -} - void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) { TRACE("volume %p, container %p.\n", volume, container); @@ -248,12 +226,6 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, { TRACE("No box supplied - all is ok\n"); map_desc->data = volume->resource.allocatedMemory; - volume->lockedBox.left = 0; - volume->lockedBox.top = 0; - volume->lockedBox.front = 0; - volume->lockedBox.right = volume->resource.width; - volume->lockedBox.bottom = volume->resource.height; - volume->lockedBox.back = volume->resource.depth; } else { @@ -263,17 +235,10 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, + (map_desc->slice_pitch * box->front) /* FIXME: is front < back or vica versa? */ + (map_desc->row_pitch * box->top) + (box->left * volume->resource.format->byte_count); - volume->lockedBox.left = box->left; - volume->lockedBox.top = box->top; - volume->lockedBox.front = box->front; - volume->lockedBox.right = box->right; - volume->lockedBox.bottom = box->bottom; - volume->lockedBox.back = box->back; } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) { - volume_add_dirty_box(volume, &volume->lockedBox); wined3d_texture_set_dirty(volume->container, TRUE); } @@ -301,7 +266,6 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) } volume->flags &= ~WINED3D_VFLAG_LOCKED; - memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); return WINED3D_OK; } @@ -337,12 +301,8 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return hr; } - memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); - - volume_add_dirty_box(volume, NULL); volume->texture_level = level; - return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 564ab67..e19a61e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,9 +2058,6 @@ struct wined3d_volume struct wined3d_resource resource; struct wined3d_texture *container; - struct wined3d_box lockedBox; - struct wined3d_box dirtyBox; - DWORD flags; GLint texture_level; }; @@ -2070,7 +2067,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } -void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: bcb651ca802f0c64949abb0d662f0bee5165cb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb651ca802f0c64949abb0d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:58 2013 +0200 wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH. --- dlls/wined3d/resource.c | 4 +--- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index eb1dcd0..59fced9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -53,12 +53,10 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) case WINED3D_POOL_MANAGED: return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + case WINED3D_POOL_SCRATCH: case WINED3D_POOL_SYSTEM_MEM: return WINED3D_RESOURCE_ACCESS_CPU; - case WINED3D_POOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_SCRATCH; - default: FIXME("Unhandled pool %#x.\n", pool); return 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e19a61e..c9be67e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,9 +1917,6 @@ static inline void invalidate_active_texture(const struct wined3d_device *device #define WINED3D_RESOURCE_ACCESS_GPU 0x1 #define WINED3D_RESOURCE_ACCESS_CPU 0x2 -/* SCRATCH is mostly the same as CPU, but can't be used by the GPU at all, - * not even for resource uploads. */ -#define WINED3D_RESOURCE_ACCESS_SCRATCH 0x4 struct wined3d_resource_ops {

1 0

Stefan Dösinger : wined3d: Implement basic volume location management.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 52fb1cc245f2b5156e2416d9630fa1cd857a5ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fb1cc245f2b5156e2416d96… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:59 2013 +0200 wined3d: Implement basic volume location management. --- dlls/wined3d/utils.c | 15 +++++ dlls/wined3d/volume.c | 121 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 8 ++- 3 files changed, 138 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9462a3c..03b4d3a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3711,3 +3711,18 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) IntersectRect(rect, rect, &state->scissor_rect); } + +const char *wined3d_debug_location(DWORD location) +{ + char buf[200]; + + buf[0] = '\0'; +#define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } + LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); + LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); + LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB); +#undef LOCATION_TO_STR + if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; +} diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0852a7a..8ef841d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -98,10 +98,100 @@ static void wined3d_volume_upload_data(struct wined3d_volume *volume, const stru } } +static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) +{ + TRACE("Volume %p, setting %s.\n", volume, wined3d_debug_location(location)); + volume->locations |= location; + TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); +} + +static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) +{ + TRACE("Volume %p, clearing %s.\n", volume, wined3d_debug_location(location)); + volume->locations &= ~location; + TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); +} + +/* Context activation is done by the caller. */ +static void wined3d_volume_load_location(struct wined3d_volume *volume, + struct wined3d_context *context, DWORD location) +{ + TRACE("Volume %p, loading %s, have %s.\n", volume, wined3d_debug_location(location), + wined3d_debug_location(volume->locations)); + + if ((volume->locations & location) == location) + { + TRACE("Location(s) already up to date.\n"); + return; + } + + if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_GPU)) + { + if (location & ~WINED3D_LOCATION_SYSMEM) + { + ERR("Trying to load a cpu-only access volume into %s.\n", + wined3d_debug_location(location)); + return; + } + } + + switch (location) + { + case WINED3D_LOCATION_TEXTURE_RGB: + if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) + { + ERR("Trying to load RGB texture without prior allocation.\n"); + return; + } + + if (volume->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Volume previously discarded, nothing to do.\n"); + wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED); + } + else if (volume->locations & WINED3D_LOCATION_SYSMEM) + { + struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; + wined3d_volume_upload_data(volume, context, &data); + } + else + { + FIXME("Implement texture loading from %s.\n", wined3d_debug_location(volume->locations)); + return; + } + wined3d_volume_validate_location(volume, WINED3D_LOCATION_TEXTURE_RGB); + break; + + case WINED3D_LOCATION_SYSMEM: + if (!volume->resource.allocatedMemory || !volume->resource.heap_memory) + { + ERR("Trying to load WINED3D_LOCATION_SYSMEM without setting it up first.\n"); + return; + } + + if (volume->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Volume previously discarded, nothing to do.\n"); + wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED); + } + else + { + FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", + wined3d_debug_location(volume->locations)); + return; + } + wined3d_volume_validate_location(volume, WINED3D_LOCATION_SYSMEM); + break; + + default: + FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), + wined3d_debug_location(volume->locations)); + } +} + /* Context activation is done by the caller. */ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) { - struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; volume_bind_and_dirtify(volume, context); if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) @@ -110,18 +200,29 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * volume->flags |= WINED3D_VFLAG_ALLOCATED; } - wined3d_volume_upload_data(volume, context, &data); + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_TEXTURE_RGB); } -/* Do not call while under the GL lock. */ static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); + struct wined3d_device *device = volume->resource.device; + struct wined3d_context *context; + + if (volume->resource.pool == WINED3D_POOL_DEFAULT) + ERR("Unloading DEFAULT pool volume.\n"); TRACE("texture %p.\n", resource); - /* The whole content is shadowed on This->resource.allocatedMemory, and - * the texture name is managed by the VolumeTexture container. */ + context = context_acquire(device, NULL); + + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); + + context_release(context); + + wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); + + /* The texture name is managed by the container. */ volume->flags &= ~WINED3D_VFLAG_ALLOCATED; resource_unload(resource); @@ -217,6 +318,14 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, volume->resource.allocatedMemory = volume->resource.heap_memory; } + if (!(volume->locations & WINED3D_LOCATION_SYSMEM)) + { + struct wined3d_device *device = volume->resource.device; + struct wined3d_context *context = context_acquire(device, NULL); + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); + context_release(context); + } + TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory); map_desc->row_pitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ @@ -240,6 +349,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) { wined3d_texture_set_dirty(volume->container, TRUE); + wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); } volume->flags |= WINED3D_VFLAG_LOCKED; @@ -302,6 +412,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device } volume->texture_level = level; + volume->locations = WINED3D_LOCATION_DISCARDED; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9be67e..c9e92f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2050,12 +2050,18 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECL #define WINED3D_VFLAG_LOCKED 0x00000001 #define WINED3D_VFLAG_ALLOCATED 0x00000002 +#define WINED3D_LOCATION_DISCARDED 0x00000001 +#define WINED3D_LOCATION_SYSMEM 0x00000002 +#define WINED3D_LOCATION_TEXTURE_RGB 0x00000004 + +const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; + struct wined3d_volume { struct wined3d_resource resource; struct wined3d_texture *container; - DWORD flags; + DWORD flags, locations; GLint texture_level; };

1 0

Nikolay Sivov : oledb32: Report IRowPositionChange as supported sink type.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 2139a402c74ad3e338fce343e621c65fc0365152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2139a402c74ad3e338fce343e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:23:21 2013 +0400 oledb32: Report IRowPositionChange as supported sink type. --- dlls/oledb32/rowpos.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 96a36a5..3461842 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -21,6 +21,7 @@ #include "windef.h" #include "ole2.h" +#include "olectl.h" #include "oledb.h" #include "oledberr.h" @@ -194,8 +195,20 @@ static HRESULT WINAPI cpc_EnumConnectionPoints(IConnectionPointContainer *iface, static HRESULT WINAPI cpc_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **point) { rowpos *This = impl_from_IConnectionPointContainer(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), point); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), point); + + if (IsEqualIID(riid, &IID_IRowPositionChange)) + { + *point = &This->cp.IConnectionPoint_iface; + IConnectionPoint_AddRef(*point); + return S_OK; + } + else + { + FIXME("unsupported riid %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; + } } static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl =

1 0

Nikolay Sivov : oledb32: Implement Advise/Unadvise for IRowPositionChange.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: f339c2fa0d6e4df480e9e9a6507a831051f1f657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f339c2fa0d6e4df480e9e9a65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:33:31 2013 +0400 oledb32: Implement Advise/Unadvise for IRowPositionChange. --- dlls/oledb32/oledb_private.h | 10 ++++++ dlls/oledb32/rowpos.c | 72 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 1570529..c232464 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -27,6 +27,16 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void *heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 3461842..d322a9d 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -36,6 +36,8 @@ typedef struct { IConnectionPoint IConnectionPoint_iface; rowpos *container; + IRowPositionChange **sinks; + DWORD sinks_size; } rowpos_cp; struct rowpos @@ -48,6 +50,8 @@ struct rowpos rowpos_cp cp; }; +static void rowposchange_cp_destroy(rowpos_cp*); + static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) { return CONTAINING_RECORD(iface, rowpos, IRowPosition_iface); @@ -108,6 +112,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (ref == 0) { if (This->rowset) IRowset_Release(This->rowset); + rowposchange_cp_destroy(&This->cp); heap_free(This); } @@ -263,18 +268,62 @@ static HRESULT WINAPI rowpos_cp_GetConnectionPointContainer(IConnectionPoint *if return S_OK; } -static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *sink, DWORD *cookie) +static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksink, DWORD *cookie) { rowpos_cp *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p %p): stub\n", This, sink, cookie); - return E_NOTIMPL; + IRowPositionChange *sink; + HRESULT hr; + DWORD i; + + TRACE("(%p)->(%p %p)\n", This, unksink, cookie); + + hr = IUnknown_QueryInterface(unksink, &IID_IRowPositionChange, (void**)&sink); + if (FAILED(hr)) + { + FIXME("sink doesn't support IRowPositionChange\n"); + return CONNECT_E_CANNOTCONNECT; + } + + if (This->sinks) + { + for (i = 0; i < This->sinks_size; i++) + { + if (!This->sinks[i]) + break; + } + + if (i == This->sinks_size) + { + This->sinks_size *= 2; + This->sinks = heap_realloc_zero(This->sinks, This->sinks_size*sizeof(*This->sinks)); + } + } + else + { + This->sinks_size = 10; + This->sinks = heap_alloc_zero(This->sinks_size*sizeof(*This->sinks)); + i = 0; + } + + This->sinks[i] = sink; + if (cookie) *cookie = i + 1; + + return S_OK; } static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie) { rowpos_cp *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%d): stub\n", This, cookie); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, cookie); + + if (!cookie || cookie > This->sinks_size || !This->sinks[cookie-1]) + return CONNECT_E_NOCONNECTION; + + IRowPositionChange_Release(This->sinks[cookie-1]); + This->sinks[cookie-1] = NULL; + + return S_OK; } static HRESULT WINAPI rowpos_cp_EnumConnections(IConnectionPoint *iface, IEnumConnections **enum_c) @@ -300,6 +349,19 @@ static void rowposchange_cp_init(rowpos_cp *cp, rowpos *container) { cp->IConnectionPoint_iface.lpVtbl = &rowpos_cp_vtbl; cp->container = container; + cp->sinks = NULL; + cp->sinks_size = 0; +} + +void rowposchange_cp_destroy(rowpos_cp *cp) +{ + DWORD i; + for (i = 0; i < cp->sinks_size; i++) + { + if (cp->sinks[i]) + IRowPositionChange_Release(cp->sinks[i]); + } + heap_free(cp->sinks); } HRESULT create_oledb_rowpos(IUnknown *outer, void **obj)

1 0

Nikolay Sivov : oledb32: Added IChapteredRowset definition.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 8b45127e85e00b1b9f477e961c4bcff084145949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b45127e85e00b1b9f477e961… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:41:02 2013 +0400 oledb32: Added IChapteredRowset definition. --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++++++++++++++ include/Makefile.in | 1 + include/chprst.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index e5be7b6..b70d3f4 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1491,3 +1491,27 @@ HRESULT CALLBACK IRowPositionChange_OnRowPositionChange_Proxy(IRowPositionChange FIXME("(%p)->(0x%x 0x%x %d): stub\n", This, reason, phase, cant_deny); return E_NOTIMPL; } + +HRESULT __RPC_STUB IChapteredRowset_ReleaseChapter_Stub(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %p %p): stub\n", This, chapter, refcount, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IChapteredRowset_AddRefChapter_Stub(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %p %p): stub\n", This, chapter, refcount, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IChapteredRowset_AddRefChapter_Proxy(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); + return E_NOTIMPL; +} + +HRESULT CALLBACK IChapteredRowset_ReleaseChapter_Proxy(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8615a99..d6e08e0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -164,6 +164,7 @@ SRCDIR_INCLUDES = \ cderr.h \ cfgmgr32.h \ cguid.h \ + chprst.idl \ cierror.h \ clusapi.h \ cmdbas.idl \ diff --git a/include/chprst.idl b/include/chprst.idl new file mode 100644 index 0000000..90aed71 --- /dev/null +++ b/include/chprst.idl @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2013 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733a93-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IChapteredRowset : IUnknown +{ + [local] + HRESULT AddRefChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount); + + [call_as(AddRefChapter)] + HRESULT RemoteAddRefChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT ReleaseChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount); + + [call_as(ReleaseChapter)] + HRESULT RemoteReleaseChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount, + [out] IErrorInfo **errorinfo); +} diff --git a/include/oledb.idl b/include/oledb.idl index 3f038c7..34cbd34 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -49,6 +49,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "rstbas.idl" #include "rstinf.idl" #include "rstloc.idl" +#include "chprst.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "dbccmd.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 5f89683..567e929 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -140,6 +140,7 @@ my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1, + "chprst.idl" => 1, "cmdbas.idl" => 1, "cmdtxt.idl" => 1, "crtrow.idl" => 1,

1 0

Nikolay Sivov : oledb32/tests: A basic test for IRowPosition_Initialize().
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: b5a73035048e193120c594397a7f98c4b2b2b446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a73035048e193120c594397… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:44:17 2013 +0400 oledb32/tests: A basic test for IRowPosition_Initialize(). --- dlls/oledb32/tests/database.c | 138 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f41fd6c..585196c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -20,6 +20,7 @@ #include <stdio.h> #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -277,6 +278,142 @@ if (hr == S_OK) { IRowPosition_Release(rowpos); } +typedef struct +{ + IRowset IRowset_iface; + IChapteredRowset IChapteredRowset_iface; +} test_rset_t; + +static test_rset_t test_rset; + +static HRESULT WINAPI rset_QI(IRowset *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRowset)) + { + *obj = &test_rset.IRowset_iface; + return S_OK; + } + else if (IsEqualIID(riid, &IID_IChapteredRowset)) + { + *obj = &test_rset.IChapteredRowset_iface; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI rset_AddRef(IRowset *iface) +{ + return 2; +} + +static ULONG WINAPI rset_Release(IRowset *iface) +{ + return 1; +} + +static HRESULT WINAPI rset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, + const HROW rghRows[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], DBROWOPTIONS rgRowOptions[], + DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_RestartPosition(IRowset *iface, HCHAPTER hReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IRowsetVtbl rset_vtbl = { + rset_QI, + rset_AddRef, + rset_Release, + rset_AddRefRows, + rset_GetData, + rset_GetNextRows, + rset_ReleaseRows, + rset_RestartPosition +}; + +static HRESULT WINAPI chrset_QI(IChapteredRowset *iface, REFIID riid, void **obj) +{ + return IRowset_QueryInterface(&test_rset.IRowset_iface, riid, obj); +} + +static ULONG WINAPI chrset_AddRef(IChapteredRowset *iface) +{ + return IRowset_AddRef(&test_rset.IRowset_iface); +} + +static ULONG WINAPI chrset_Release(IChapteredRowset *iface) +{ + return IRowset_Release(&test_rset.IRowset_iface); +} + +static HRESULT WINAPI chrset_AddRefChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI chrset_ReleaseChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IChapteredRowsetVtbl chrset_vtbl = { + chrset_QI, + chrset_AddRef, + chrset_Release, + chrset_AddRefChapter, + chrset_ReleaseChapter +}; + +static void init_test_rset(void) +{ + test_rset.IRowset_iface.lpVtbl = &rset_vtbl; + test_rset.IChapteredRowset_iface.lpVtbl = &chrset_vtbl; +} + +static void test_rowpos_initialize(void) +{ + IRowPosition *rowpos; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + init_test_rset(); + hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); + ok(hr == S_OK, "got %08x\n", hr); + + IRowPosition_Release(rowpos); +} + START_TEST(database) { OleInitialize(NULL); @@ -287,6 +424,7 @@ START_TEST(database) /* row position */ test_rowposition(); + test_rowpos_initialize(); OleUninitialize(); }

1 0