November 2013 - Wine-commits

Rico Schüller : shell32: Use lParam for BFFM_SETOKTEXT .
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 5f15a5633c338352aed17474eaa9acec2fe07a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15a5633c338352aed17474e… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 22 10:35:44 2013 +0100 shell32: Use lParam for BFFM_SETOKTEXT. --- dlls/shell32/brsfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 9d95293..86948ea 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1027,8 +1027,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETOKTEXT: /* unicode only */ - TRACE("Set OK text %s\n", debugstr_w((LPWSTR)wParam)); - SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)wParam); + TRACE("Set OK text %s\n", debugstr_w((LPWSTR)lParam)); + SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)lParam); break; case BFFM_SETSELECTIONA:

1 0

Henri Verbeet : wined3d: Reimplement wined3d_ftoa().
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 12f16f2127ffce9a05eedf008c3aa3732751a7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f16f2127ffce9a05eedf008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:00 2013 +0100 wined3d: Reimplement wined3d_ftoa(). The current implementation is not precise enough when the FPU is in REAL4 mode, which also happens to be the mode d3d9 sets by default. Doing the same thing with integer math is a huge pain, so just replace the decimal separator instead. --- dlls/wined3d/utils.c | 47 +++++++---------------------------------------- 1 files changed, 7 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f6d3a44..c37b677 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3806,51 +3806,18 @@ const char *wined3d_debug_location(DWORD location) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -/* This should be equivalent to using the %.8e format specifier, but always - * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since - * the GLSL and ARB parsers wouldn't be able to handle those anyway. */ +/* Print a floating point value with the %.8e format specifier, always using + * '.' as decimal separator. */ void wined3d_ftoa(float value, char *s) { - int x, frac, exponent; - const char *sign = ""; - double d; + int idx = 1; - d = value; if (copysignf(1.0f, value) < 0.0f) - { - d = -d; - sign = "-"; - } - - if (d == 0.0f) - { - x = 0; - frac = 0; - exponent = 0; - } - else - { - double t, diff; - - exponent = floorf(log10f(d)); - d /= pow(10.0, exponent); - - x = d; - t = (d - x) * 100000000; - frac = t; - diff = t - frac; - - if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) - { - if (++frac >= 100000000) - { - frac = 0; - ++x; - } - } - } + ++idx; - sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); + sprintf(s, "%.8e", value); + if (isfinite(value)) + s[idx] = '.'; } void wined3d_release_dc(HWND window, HDC dc)

1 0

Henri Verbeet : wined3d: surface_load() should never fail.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: c025b5d06b8cdefb5a03e19bfc441022c038fb6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c025b5d06b8cdefb5a03e19bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:01 2013 +0100 wined3d: surface_load() should never fail. --- dlls/wined3d/surface.c | 9 ++------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 878b848..1523d5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2255,7 +2255,7 @@ void surface_set_dirty(struct wined3d_surface *surface) wined3d_texture_set_dirty(surface->container); } -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) +void surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; BOOL ck_changed; @@ -2263,10 +2263,7 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) TRACE("surface %p, srgb %#x.\n", surface, srgb); if (surface->resource.pool == WINED3D_POOL_SCRATCH) - { ERR("Not supported on scratch surfaces.\n"); - return WINED3DERR_INVALIDCALL; - } ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT); @@ -2293,13 +2290,11 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) else { TRACE("surface is already in texture\n"); - return WINED3D_OK; + return; } surface_load_location(surface, flag); surface_evict_sysmem(surface); - - return WINED3D_OK; } /* See also float_16_to_32() in wined3d_private.h */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31235f2..e8bc18b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2251,7 +2251,7 @@ void surface_internal_preload(struct wined3d_surface *surface, struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; +void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Merge texture2d_preload() and texture3d_preload() into wined3d_texture_load().
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: e0beab8b817d0ad0594c2b157ae5b9d14f4d1a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0beab8b817d0ad0594c2b157… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:02 2013 +0100 wined3d: Merge texture2d_preload() and texture3d_preload() into wined3d_texture_load(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 140 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 6 +- 5 files changed, 65 insertions(+), 87 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e5bbb91..e451a67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2797,7 +2797,7 @@ static void context_preload_texture(struct wined3d_context *context, return; srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - texture->texture_ops->texture_preload(texture, context, srgb); + wined3d_texture_load(texture, context, srgb); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f28ce27..ed5e61c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3402,7 +3402,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL); - dst_texture->texture_ops->texture_preload(dst_texture, context, SRGB_RGB); + wined3d_texture_load(dst_texture, context, SRGB_RGB); context_release(context); /* Update every surface level of the texture. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1523d5c..d3a0b13 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3455,7 +3455,7 @@ void surface_internal_preload(struct wined3d_surface *surface, TRACE("iface %p, srgb %#x.\n", surface, srgb); - texture->texture_ops->texture_preload(texture, context, srgb); + wined3d_texture_load(texture, context, srgb); } /* Read the framebuffer back into the surface */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 08638a5..755335f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -508,11 +508,60 @@ DWORD CDECL wined3d_texture_get_priority(const struct wined3d_texture *texture) return resource_get_priority(&texture->resource); } +/* Context activation is done by the caller */ +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, enum WINED3DSRGB srgb) +{ + UINT sub_count = texture->level_count * texture->layer_count; + const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL srgb_mode; + DWORD flag; + UINT i; + + TRACE("texture %p, srgb %#x.\n", texture, srgb); + + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + + switch (srgb) + { + case SRGB_RGB: + srgb_mode = FALSE; + break; + + case SRGB_SRGB: + srgb_mode = TRUE; + break; + + default: + srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; + break; + } + + if (srgb_mode) + flag = WINED3D_TEXTURE_SRGB_VALID; + else + flag = WINED3D_TEXTURE_RGB_VALID; + + if (texture->flags & flag) + { + TRACE("Texture %p not dirty, nothing to do.\n", texture); + return; + } + + /* Reload the surfaces if the texture is marked dirty. */ + for (i = 0; i < sub_count; ++i) + { + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb_mode); + } + texture->flags |= flag; +} + void CDECL wined3d_texture_preload(struct wined3d_texture *texture) { struct wined3d_context *context; context = context_acquire(texture->resource.device, NULL); - texture->texture_ops->texture_preload(texture, context, SRGB_ANY); + wined3d_texture_load(texture, context, SRGB_ANY); context_release(context); } @@ -631,54 +680,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) -{ - switch (srgb) - { - case SRGB_RGB: - return FALSE; - - case SRGB_SRGB: - return TRUE; - - default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; - } -} - -/* Context activation is done by the caller */ -static void texture2d_preload(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) +static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb) { - UINT sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; - DWORD flag; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode) - flag = WINED3D_TEXTURE_SRGB_VALID; - else - flag = WINED3D_TEXTURE_RGB_VALID; - - if (texture->flags & flag) - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - return; - } - - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - surface_load(surface_from_resource(texture->sub_resources[i]), srgb_mode); - } - texture->flags |= flag; + surface_load(surface_from_resource(sub_resource), srgb); } static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, @@ -698,7 +703,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource static const struct wined3d_texture_ops texture2d_ops = { - texture2d_preload, + texture2d_sub_resource_load, texture2d_sub_resource_add_dirty_region, texture2d_sub_resource_cleanup, }; @@ -998,39 +1003,10 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void texture3d_preload(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) +static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb) { - UINT sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; - DWORD flag; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode) - flag = WINED3D_TEXTURE_SRGB_VALID; - else - flag = WINED3D_TEXTURE_RGB_VALID; - - if (texture->flags & flag) - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - return; - } - - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - wined3d_volume_load(volume_from_resource(texture->sub_resources[i]), context, srgb_mode); - } - texture->flags |= flag; + wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); } static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, @@ -1049,7 +1025,7 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource static const struct wined3d_texture_ops texture3d_ops = { - texture3d_preload, + texture3d_sub_resource_load, texture3d_sub_resource_add_dirty_region, texture3d_sub_resource_cleanup, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8bc18b..ff50aec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,8 +2058,8 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_preload)(struct wined3d_texture *texture, struct wined3d_context *context, - enum WINED3DSRGB srgb); + void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb); void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region); void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); @@ -2107,6 +2107,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001

1 0

Henri Verbeet : wined3d: Get rid of surface_internal_preload().
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 7427b72250419d0b516fdd79f942b2902793c953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7427b72250419d0b516fdd79f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:03 2013 +0100 wined3d: Get rid of surface_internal_preload(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 ++++++---- dlls/wined3d/surface.c | 24 +++++------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa62bfe..96bd1b6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); context_apply_blit_state(context, device); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e451a67..3e62839 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2124,7 +2124,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - surface_internal_preload(rt, context, SRGB_RGB); + wined3d_texture_load(rt->container, context, SRGB_RGB); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2938,10 +2938,12 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && old_render_offscreen && context->current_rt != target) { + struct wined3d_texture *texture = context->current_rt->container; + /* Read the back buffer of the old drawable into the destination texture. */ - if (context->current_rt->container->texture_srgb.name) - surface_internal_preload(context->current_rt, context, SRGB_SRGB); - surface_internal_preload(context->current_rt, context, SRGB_RGB); + if (texture->texture_srgb.name) + wined3d_texture_load(texture, context, SRGB_SRGB); + wined3d_texture_load(texture, context, SRGB_RGB); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d3a0b13..df83fc6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2419,7 +2419,6 @@ DWORD CDECL wined3d_surface_get_priority(const struct wined3d_surface *surface) void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { - struct wined3d_context *context; TRACE("surface %p.\n", surface); if (!surface->resource.device->d3d_initialized) @@ -2428,9 +2427,7 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) return; } - context = context_acquire(surface->resource.device, NULL); - surface_internal_preload(surface, context, SRGB_ANY); - context_release(context); + wined3d_texture_preload(surface->container); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) @@ -3447,17 +3444,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } -/* Context activation is done by the caller */ -void surface_internal_preload(struct wined3d_surface *surface, - struct wined3d_context *context, enum WINED3DSRGB srgb) -{ - struct wined3d_texture *texture = surface->container; - - TRACE("iface %p, srgb %#x.\n", surface, srgb); - - wined3d_texture_load(texture, context, srgb); -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, UINT pitch) { @@ -4099,7 +4085,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, SRGB_RGB); /* Bind the target texture */ context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); @@ -4207,14 +4193,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { /* Get it a description */ - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4503,7 +4489,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff50aec..93e4a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2249,8 +2249,6 @@ void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_internal_preload(struct wined3d_surface *surface, - struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSRGB enum.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: f6b5dc246a0d34779338be108d8a155d3bfce47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b5dc246a0d34779338be108… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:04 2013 +0100 wined3d: Get rid of the WINED3DSRGB enum. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 ++++------ dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/texture.c | 26 +++++--------------------- dlls/wined3d/wined3d_private.h | 9 +-------- 6 files changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 96bd1b6..470d9a0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); context_apply_blit_state(context, device); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3e62839..129926a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2124,7 +2124,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - wined3d_texture_load(rt->container, context, SRGB_RGB); + wined3d_texture_load(rt->container, context, FALSE); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2791,13 +2791,11 @@ static void context_preload_texture(struct wined3d_context *context, const struct wined3d_state *state, unsigned int idx) { struct wined3d_texture *texture; - enum WINED3DSRGB srgb; if (!(texture = state->textures[idx])) return; - srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - wined3d_texture_load(texture, context, srgb); + wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); } /* Context activation is done by the caller. */ @@ -2942,8 +2940,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d /* Read the back buffer of the old drawable into the destination texture. */ if (texture->texture_srgb.name) - wined3d_texture_load(texture, context, SRGB_SRGB); - wined3d_texture_load(texture, context, SRGB_RGB); + wined3d_texture_load(texture, context, TRUE); + wined3d_texture_load(texture, context, FALSE); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed5e61c..83b97e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3402,7 +3402,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL); - wined3d_texture_load(dst_texture, context, SRGB_RGB); + wined3d_texture_load(dst_texture, context, FALSE); context_release(context); /* Update every surface level of the texture. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df83fc6..6f6b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4085,7 +4085,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_surface->container, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); /* Bind the target texture */ context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); @@ -4193,14 +4193,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_surface->container, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { /* Get it a description */ - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4489,7 +4489,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 755335f..6256b91 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,35 +510,19 @@ DWORD CDECL wined3d_texture_get_priority(const struct wined3d_texture *texture) /* Context activation is done by the caller */ void wined3d_texture_load(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) + struct wined3d_context *context, BOOL srgb) { UINT sub_count = texture->level_count * texture->layer_count; const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; DWORD flag; UINT i; TRACE("texture %p, srgb %#x.\n", texture, srgb); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - switch (srgb) - { - case SRGB_RGB: - srgb_mode = FALSE; - break; - - case SRGB_SRGB: - srgb_mode = TRUE; - break; - - default: - srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; - break; - } + srgb = FALSE; - if (srgb_mode) + if (srgb) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; @@ -552,7 +536,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) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb_mode); + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb); } texture->flags |= flag; } @@ -561,7 +545,7 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture) { struct wined3d_context *context; context = context_acquire(texture->resource.device, NULL); - wined3d_texture_load(texture, context, SRGB_ANY); + wined3d_texture_load(texture, context, texture->flags & WINED3D_TEXTURE_IS_SRGB); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e4a90..d7e1c5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2043,13 +2043,6 @@ enum wined3d_texture_state MAX_WINETEXTURESTATES = 11, }; -enum WINED3DSRGB -{ - SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */ - SRGB_RGB = 1, /* Loads the rgb texture */ - SRGB_SRGB = 2, /* Loads the srgb texture */ -}; - struct gl_texture { DWORD states[MAX_WINETEXTURESTATES]; @@ -2108,7 +2101,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001

1 0

Alexandre Julliard : kernel32: Determine the module architecture for all binary types.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: f2c54dba015f6f3e359f87c0950b25b9ffeb1e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c54dba015f6f3e359f87c09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 12:18:31 2013 +0100 kernel32: Determine the module architecture for all binary types. --- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/module.c | 34 +++++++++++++++++++++++++++++++++- dlls/kernel32/process.c | 20 ++++++++++++++++---- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index cfc2935..5c6c197 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -81,6 +81,7 @@ enum binary_type struct binary_info { enum binary_type type; + DWORD arch; DWORD flags; void *res_start; void *res_end; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index babc756..63cf012 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -264,22 +264,52 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; - /* FIXME: we don't bother to check byte order, architecture, etc. */ +#ifdef WORDS_BIGENDIAN + if (header.elf.data == 1) +#else + if (header.elf.data == 2) +#endif + { + header.elf.type = RtlUshortByteSwap( header.elf.type ); + header.elf.machine = RtlUshortByteSwap( header.elf.machine ); + } switch(header.elf.type) { case 2: info->type = BINARY_UNIX_EXE; break; case 3: info->type = BINARY_UNIX_LIB; break; } + switch(header.elf.machine) + { + case 3: info->arch = IMAGE_FILE_MACHINE_I386; break; + case 20: info->arch = IMAGE_FILE_MACHINE_POWERPC; break; + case 40: info->arch = IMAGE_FILE_MACHINE_ARMNT; break; + case 50: info->arch = IMAGE_FILE_MACHINE_IA64; break; + case 62: info->arch = IMAGE_FILE_MACHINE_AMD64; break; + case 183: info->arch = IMAGE_FILE_MACHINE_ARM64; break; + } } /* Mach-o File with Endian set to Big Endian or Little Endian */ else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) { if ((header.macho.cputype >> 24) == 1) info->flags |= BINARY_FLAG_64BIT; + if (header.macho.magic == 0xcefaedfe) + { + header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); + header.macho.cputype = RtlUlongByteSwap( header.macho.cputype ); + } switch(header.macho.filetype) { case 2: info->type = BINARY_UNIX_EXE; break; case 8: info->type = BINARY_UNIX_LIB; break; } + switch(header.macho.cputype) + { + case 0x00000007: info->arch = IMAGE_FILE_MACHINE_I386; break; + case 0x01000007: info->arch = IMAGE_FILE_MACHINE_AMD64; break; + case 0x0000000c: info->arch = IMAGE_FILE_MACHINE_ARMNT; break; + case 0x0100000c: info->arch = IMAGE_FILE_MACHINE_ARM64; break; + case 0x00000012: info->arch = IMAGE_FILE_MACHINE_POWERPC; break; + } } /* Not ELF, try DOS */ else if (header.mz.e_magic == IMAGE_DOS_SIGNATURE) @@ -298,6 +328,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * to read or not. */ info->type = BINARY_DOS; + info->arch = IMAGE_FILE_MACHINE_I386; if (SetFilePointer( hfile, header.mz.e_lfanew, NULL, SEEK_SET ) == -1) return; if (!ReadFile( hfile, &ext_header, sizeof(ext_header), &len, NULL ) || len < 4) return; @@ -309,6 +340,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (len >= sizeof(ext_header.nt.FileHeader)) { info->type = BINARY_PE; + info->arch = ext_header.nt.FileHeader.Machine; if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) info->flags |= BINARY_FLAG_DLL; if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index afbdf72..0bacd60 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -208,6 +208,18 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil binary_info->flags = flags; binary_info->res_start = NULL; binary_info->res_end = NULL; + /* assume current arch */ +#if defined(__i386__) || defined(__x86_64__) + binary_info->arch = (flags & BINARY_FLAG_64BIT) ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; +#elif defined(__powerpc__) + binary_info->arch = IMAGE_FILE_MACHINE_POWERPC; +#elif defined(__arm__) && !defined(__ARMEB__) + binary_info->arch = IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__aarch64__) + binary_info->arch = IMAGE_FILE_MACHINE_ARM64; +#else + binary_info->arch = IMAGE_FILE_MACHINE_UNKNOWN; +#endif return TRUE; } @@ -2286,9 +2298,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p)\n", + TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end ); + binary_info.res_start, binary_info.res_end, binary_info.arch ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2431,9 +2443,9 @@ static void exec_process( LPCWSTR name ) switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p)\n", + TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end ); + binary_info.res_start, binary_info.res_end, binary_info.arch ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE ); break;

1 0

Alexandre Julliard : kernel32: Validate the architecture of newly created processes on the server side.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 1e78c99388c61d353cf60787eac6415328f54560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78c99388c61d353cf60787e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 12:32:48 2013 +0100 kernel32: Validate the architecture of newly created processes on the server side. --- dlls/kernel32/process.c | 64 +++++++++++++++++++++++++++++++++------ dlls/ntdll/server.c | 12 ++++---- include/wine/server_protocol.h | 4 ++- server/process.c | 5 +++ server/protocol.def | 1 + server/request.h | 5 ++- server/thread.c | 27 ++++++++++------ server/thread.h | 1 + server/trace.c | 6 ++++ 9 files changed, 96 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e78c99388c61d353cf60…

1 0

Ken Thomases : winemac: Add support for a "Decorated" registry setting to control whether windows get Mac-style decorations.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 788e2034f6de55383d641cbb8ff08f70c2f6f600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=788e2034f6de55383d641cbb8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 21 14:47:57 2013 -0600 winemac: Add support for a "Decorated" registry setting to control whether windows get Mac-style decorations. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 5 +++++ dlls/winemac.drv/window.c | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 120fa51..32a342b 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -39,6 +39,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern BOOL allow_software_rendering DECLSPEC_HIDDEN; +extern BOOL disable_window_decorations DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index ba15706..2c3ec23 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -53,6 +53,7 @@ BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; +BOOL disable_window_decorations = FALSE; HMODULE macdrv_module = 0; @@ -166,6 +167,10 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + /* Value name chosen to match what's used in the X11 driver. */ + if (!get_config_key(hkey, appkey, "Decorated", buffer, sizeof(buffer))) + disable_window_decorations = !IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 1ad8ac2..f8e30ca 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -57,6 +57,7 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, { memset(wf, 0, sizeof(*wf)); + if (disable_window_decorations) return; if (IsRectEmpty(&data->window_rect)) return; if ((style & WS_CAPTION) == WS_CAPTION && !(ex_style & WS_EX_LAYERED))

1 0

Ken Thomases : winemac: Ignore Mac-originating pasteboard types which aren' t mapped to standard clipboard formats.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: a983cfb01d84c16ea6ed0cd1173c57e474477f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a983cfb01d84c16ea6ed0cd11… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:25 2013 -0600 winemac: Ignore Mac-originating pasteboard types which aren't mapped to standard clipboard formats. New clipboard formats had been registered for them, but that was pointless. No Windows app would ever expect or make use of such clipboard formats or the associated pasteboard data. --- dlls/winemac.drv/clipboard.c | 57 +++++++++++++---------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f97faea..a648fcc 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -122,16 +122,13 @@ static struct list format_list = LIST_INIT(format_list); prepending "org.winehq.registered." to the registered name. Likewise, Mac pasteboard types which originate in other apps may have - arbitrary type strings. We construct a Win32 clipboard format name from - these by prepending "org.winehq.mac-type." to the Mac pasteboard type. + arbitrary type strings. We ignore these. Summary: Win32 clipboard format names: <none> standard clipboard format; maps via format_list to either a predefined Mac UTI or org.winehq.builtin.<format>. - org.winehq.mac-type.<Mac type> representation of Mac type in Win32 land; - maps to <Mac type> <other> name registered within Win32 land; maps to org.winehq.registered.<other> Mac pasteboard type names: @@ -142,8 +139,7 @@ static struct list format_list = LIST_INIT(format_list); clipboard format name; maps to <format name> <other> Mac pasteboard type originating with system or other apps; either maps via format_list - to a standard clipboard format or maps to - org.winehq.mac-type.<other> + to a standard clipboard format or ignored */ static const struct @@ -221,9 +217,6 @@ static const struct { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; -/* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ -static const WCHAR mac_type_name_prefix[] = {'o','r','g','.','w','i','n','e','h','q','.','m','a','c','-','t','y','p','e','.',0}; - /* The prefix prepended to a Win32 clipboard format name to make a Mac pasteboard type. */ static const CFStringRef registered_name_type_prefix = CFSTR("org.winehq.registered."); @@ -309,16 +302,8 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) return NULL; } - if (!strncmpW(buffer, mac_type_name_prefix, strlenW(mac_type_name_prefix))) - { - const WCHAR *p = buffer + strlenW(mac_type_name_prefix); - format->type = CFStringCreateWithCharacters(NULL, (UniChar*)p, strlenW(p)); - } - else - { - format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), - registered_name_type_prefix, buffer); - } + format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), + registered_name_type_prefix, buffer); } list_add_tail(&format_list, &format->entry); @@ -367,37 +352,27 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty format = NULL; if (!current) { - LPWSTR name; - if (CFStringHasPrefix(type, CFSTR("org.winehq.builtin."))) { ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", debugstr_cf(type)); - goto done; } else if (CFStringHasPrefix(type, registered_name_type_prefix)) { + LPWSTR name; int len = CFStringGetLength(type) - CFStringGetLength(registered_name_type_prefix); + name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); CFStringGetCharacters(type, CFRangeMake(CFStringGetLength(registered_name_type_prefix), len), (UniChar*)name); name[len] = 0; - } - else - { - int len = strlenW(mac_type_name_prefix) + CFStringGetLength(type); - name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - memcpy(name, mac_type_name_prefix, sizeof(mac_type_name_prefix)); - CFStringGetCharacters(type, CFRangeMake(0, CFStringGetLength(type)), - (UniChar*)name + strlenW(mac_type_name_prefix)); - name[len] = 0; - } - format = register_format(RegisterClipboardFormatW(name), type); - if (!format) - ERR("Failed to register format for type %s name %s\n", debugstr_cf(type), debugstr_w(name)); + format = register_format(RegisterClipboardFormatW(name), type); + if (!format) + ERR("Failed to register format for type %s name %s\n", debugstr_cf(type), debugstr_w(name)); - HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, name); + } } done: @@ -1777,12 +1752,16 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) count = CFArrayGetCount(types); TRACE("got %ld types\n", count); - if (count) + for (i = 0; i < count; i++) { - CFStringRef type = CFArrayGetValueAtIndex(types, 0); + CFStringRef type = CFArrayGetValueAtIndex(types, i); WINE_CLIPFORMAT *format = format_for_type(NULL, type); - ret = format ? format->format_id : 0; + if (format) + { + ret = format->format_id; + break; + } } CFRelease(types);

1 0