wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Charles Davis : winemac.drv: Support the public UTF-16 type for Unicode text.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: a157c7bd81fc5ed2739c107a0c4adf3164afb85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a157c7bd81fc5ed2739c107a0… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Wed Aug 21 23:07:11 2013 -0600 winemac.drv: Support the public UTF-16 type for Unicode text. --- dlls/winemac.drv/clipboard.c | 169 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 53b1448..80fd689 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -82,14 +82,20 @@ static HANDLE import_unicodetext_to_text(CFDataRef data); static HANDLE import_utf8_to_oemtext(CFDataRef data); static HANDLE import_utf8_to_text(CFDataRef data); static HANDLE import_utf8_to_unicodetext(CFDataRef data); +static HANDLE import_utf16_to_oemtext(CFDataRef data); +static HANDLE import_utf16_to_text(CFDataRef data); +static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); +static CFDataRef export_oemtext_to_utf16(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); +static CFDataRef export_text_to_utf16(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); +static CFDataRef export_unicodetext_to_utf16(HANDLE data); /************************************************************************** @@ -180,6 +186,10 @@ static const struct { CF_TEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_text, export_text_to_utf8, TRUE }, { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, + { CF_TEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_text, export_text_to_utf16, TRUE }, + { CF_OEMTEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_oemtext, export_oemtext_to_utf16, TRUE }, + { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, @@ -953,6 +963,78 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data) /************************************************************************** + * import_utf16_to_oemtext + * + * Import a UTF-16 string, converting the string to CF_OEMTEXT. + */ +static HANDLE import_utf16_to_oemtext(CFDataRef data) +{ + HANDLE unicode_handle = import_utf16_to_unicodetext(data); + HANDLE ret = convert_unicodetext_to_codepage(unicode_handle, CP_OEMCP); + + GlobalFree(unicode_handle); + return ret; +} + + +/************************************************************************** + * import_utf16_to_text + * + * Import a UTF-16 string, converting the string to CF_TEXT. + */ +static HANDLE import_utf16_to_text(CFDataRef data) +{ + HANDLE unicode_handle = import_utf16_to_unicodetext(data); + HANDLE ret = convert_unicodetext_to_codepage(unicode_handle, CP_ACP); + + GlobalFree(unicode_handle); + return ret; +} + + +/************************************************************************** + * import_utf16_to_unicodetext + * + * Import a UTF-8 string, converting the string to CF_UNICODETEXT. + */ +static HANDLE import_utf16_to_unicodetext(CFDataRef data) +{ + const WCHAR *src; + unsigned long data_len; + unsigned long new_lines = 0; + LPWSTR dst; + unsigned long i, j; + HANDLE unicode_handle; + + src = (const WCHAR *)CFDataGetBytePtr(data); + data_len = CFDataGetLength(data); + for (i = 0; i < data_len; i++) + { + if (src[i] == '\n') + new_lines++; + } + + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + { + dst = GlobalLock(unicode_handle); + + for (i = 0, j = 0; i < data_len; i++) + { + if (src[i] == '\n') + dst[j++] = '\r'; + + dst[j++] = src[i]; + } + dst[j] = 0; + + GlobalUnlock(unicode_handle); + } + + return unicode_handle; +} + + +/************************************************************************** * export_clipboard_data * * Generic export clipboard data routine. @@ -1020,6 +1102,30 @@ static CFDataRef export_codepage_to_utf8(HANDLE data, UINT cp) /************************************************************************** + * export_codepage_to_utf16 + * + * Export string data in a specified codepage to UTF-16. + */ +static CFDataRef export_codepage_to_utf16(HANDLE data, UINT cp) +{ + CFDataRef ret = NULL; + const char* str; + + if ((str = GlobalLock(data))) + { + HANDLE unicode = convert_text(str, GlobalSize(data), cp, -1); + + ret = export_unicodetext_to_utf16(unicode); + + GlobalFree(unicode); + GlobalUnlock(data); + } + + return ret; +} + + +/************************************************************************** * export_dib_to_bmp * * Export CF_DIB to BMP file format. This just entails prepending a BMP @@ -1162,6 +1268,17 @@ static CFDataRef export_oemtext_to_utf8(HANDLE data) /************************************************************************** + * export_oemtext_to_utf16 + * + * Export CF_OEMTEXT to UTF-16. + */ +static CFDataRef export_oemtext_to_utf16(HANDLE data) +{ + return export_codepage_to_utf16(data, CP_OEMCP); +} + + +/************************************************************************** * export_text_to_utf8 * * Export CF_TEXT to UTF-8. @@ -1173,6 +1290,17 @@ static CFDataRef export_text_to_utf8(HANDLE data) /************************************************************************** + * export_text_to_utf16 + * + * Export CF_TEXT to UTF-16. + */ +static CFDataRef export_text_to_utf16(HANDLE data) +{ + return export_codepage_to_utf16(data, CP_ACP); +} + + +/************************************************************************** * export_unicodetext_to_utf8 * * Export CF_UNICODETEXT to UTF-8. @@ -1215,6 +1343,47 @@ static CFDataRef export_unicodetext_to_utf8(HANDLE data) /************************************************************************** + * export_unicodetext_to_utf16 + * + * Export CF_UNICODETEXT to UTF-16. + */ +static CFDataRef export_unicodetext_to_utf16(HANDLE data) +{ + CFMutableDataRef ret; + const WCHAR *src; + INT dst_len; + + src = GlobalLock(data); + if (!src) return NULL; + + dst_len = GlobalSize(data) / sizeof(WCHAR); + if (dst_len) dst_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, dst_len); + if (ret) + { + LPWSTR dst; + int i, j; + + CFDataSetLength(ret, dst_len); + dst = (LPWSTR)CFDataGetMutableBytePtr(ret); + + /* Remove carriage returns */ + for (i = 0, j = 0; i < dst_len; i++) + { + if (src[i] == '\r' && + (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + continue; + dst[j++] = src[i]; + } + CFDataSetLength(ret, j); + } + GlobalUnlock(data); + + return ret; +} + + +/************************************************************************** * get_clipboard_info */ static BOOL get_clipboard_info(LPCLIPBOARDINFO cbinfo)

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

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: 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: 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: 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: Store the mipmap level in the volume.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: ac871305f8e646e0eacdae855396755e3a909637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac871305f8e646e0eacdae855… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:54 2013 +0200 wined3d: Store the mipmap level in the volume. --- dlls/d3d10core/device.c | 8 +++++--- dlls/d3d8/d3d8_private.h | 3 ++- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/volume.c | 7 ++++--- dlls/ddraw/ddraw.c | 5 +++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/volume.c | 21 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 6 +++--- 12 files changed, 45 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac871305f8e646e0eacda…

1 0

Nikolay Sivov : oleaut32/tests: Some tests for LoadRegTypeLib() with activated context.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 0473a072ddf5522b85eb46fc6d3279d58167a356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0473a072ddf5522b85eb46fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 16:50:34 2013 +0400 oleaut32/tests: Some tests for LoadRegTypeLib() with activated context. --- dlls/oleaut32/tests/tmarshal.c | 8 +- dlls/oleaut32/tests/tmarshal.idl | 2 +- dlls/oleaut32/tests/typelib.c | 199 +++++++++++++++++++++++++++++++++++++- 3 files changed, 199 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0473a072ddf5522b85eb4…

1 0

Jacek Caban : mshtml/tests: Added IHTMLLabelElement::htmlFor property tests .
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: e5ba71ab7cb68fd193315128ca3ab9afa33fac9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ba71ab7cb68fd193315128c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 17:14:06 2013 +0200 mshtml/tests: Added IHTMLLabelElement::htmlFor property tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7abd19b..f4d30579 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -935,6 +935,17 @@ static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) return ret; } +#define get_label_iface(u) _get_label_iface(__LINE__,u) +static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) +{ + IHTMLLabelElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLabelElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5513,6 +5524,44 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_label_elem(IHTMLElement *elem) +{ + IHTMLLabelElement *label; + BSTR str; + HRESULT hres; + + label = get_label_iface((IUnknown*)elem); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "in"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr(""); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, ""), "htmlFor = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("abc"); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "abc"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLLabelElement_Release(label); +} + #define test_table_cell_spacing(a,b) _test_table_cell_spacing(__LINE__,a,b) static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const char *exstr) { @@ -6268,6 +6317,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "labelid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_label_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Jacek Caban : mshtml: Added IHTMLLabelElement:: htmlFor property implementation.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 14a0e875cede6f972f955e96198e9ddadfc2120e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0e875cede6f972f955e961… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 17:13:56 2013 +0200 mshtml: Added IHTMLLabelElement::htmlFor property implementation. --- dlls/mshtml/htmlinput.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4d304b2..e6fb184 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -43,6 +43,8 @@ typedef struct { nsIDOMHTMLInputElement *nsinput; } HTMLInputElement; +static const WCHAR forW[] = {'f','o','r',0}; + static inline HTMLInputElement *impl_from_IHTMLInputElement(IHTMLInputElement *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputElement_iface); @@ -1311,15 +1313,50 @@ static HRESULT WINAPI HTMLLabelElement_Invoke(IHTMLLabelElement *iface, DISPID d static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BSTR v) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString for_str, val_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&for_str, forW); + nsAString_InitDepend(&val_str, v); + nsres = nsIDOMHTMLElement_SetAttribute(This->element.nselem, &for_str, &val_str); + nsAString_Finish(&for_str); + nsAString_Finish(&val_str); + if(NS_FAILED(nsres)) { + ERR("SetAttribute failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString for_str, val_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&for_str, forW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str); + nsAString_Finish(&for_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *val; + + nsAString_GetData(&val_str, &val); + *p = SysAllocString(val); + hres = *p ? S_OK : E_OUTOFMEMORY; + }else { + ERR("GetAttribute failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&val_str); + return hres; } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013