March 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Merge surface_prepare_map_memory() into wined3d_surface_prepare().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: ecba38d5bd9c1406ed45f59c895ab9d3230f17fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba38d5bd9c1406ed45f59c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 6 20:59:50 2016 +0100 wined3d: Merge surface_prepare_map_memory() into wined3d_surface_prepare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 95 ++++++++++++++++++------------------------ dlls/wined3d/texture.c | 8 ++-- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4ea615e..779febf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -505,39 +505,6 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) ERR("Surface without system memory has WINED3D_LOCATION_SYSMEM set.\n"); } -void surface_prepare_map_memory(struct wined3d_surface *surface) -{ - struct wined3d_texture *texture = surface->container; - struct wined3d_context *context; - - switch (surface->resource.map_binding) - { - case WINED3D_LOCATION_SYSMEM: - surface_prepare_system_memory(surface); - break; - - case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) - ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); - break; - - case WINED3D_LOCATION_DIB: - if (!surface->dib.bitmap_data) - ERR("Map binding is set to WINED3D_LOCATION_DIB but surface->dib.bitmap_data is NULL.\n"); - break; - - case WINED3D_LOCATION_BUFFER: - context = context_acquire(texture->resource.device, NULL); - wined3d_texture_prepare_buffer_object(texture, - surface_get_sub_resource_idx(surface), context->gl_info); - context_release(context); - break; - - default: - ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); - } -} - static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: @@ -1053,7 +1020,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } @@ -2180,8 +2147,8 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ const struct wined3d_format *format = texture->resource.format; struct wined3d_device *device = texture->resource.device; unsigned int fmt_flags = texture->resource.format_flags; - struct wined3d_context *context; - const struct wined3d_gl_info *gl_info; + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_context *context = NULL; BYTE *base_memory; TRACE("surface %p, map_desc %p, box %s, flags %#x.\n", @@ -2223,7 +2190,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } } - surface_prepare_map_memory(surface); + if (device->d3d_initialized) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } + + wined3d_surface_prepare(surface, context, surface->resource.map_binding); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", @@ -2232,16 +2205,10 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } else { - struct wined3d_context *context = NULL; - if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - if (surface->resource.device->d3d_initialized) - context = context_acquire(surface->resource.device, NULL); surface_load_location(surface, context, surface->resource.map_binding); - if (context) - context_release(context); } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) @@ -2262,16 +2229,11 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break; case WINED3D_LOCATION_BUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object)); base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_READ_WRITE)); GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("map PBO"); - - context_release(context); break; default: @@ -2279,6 +2241,9 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ base_memory = NULL; } + if (context) + context_release(context); + if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) { map_desc->row_pitch = surface->resource.width * format->byte_count; @@ -3615,7 +3580,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3626,7 +3591,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3662,7 +3627,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, else surface->resource.map_binding = WINED3D_LOCATION_SYSMEM; - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } @@ -5064,17 +5029,39 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex return hr; } -/* Context activation is done by the caller. */ +/* Context activation is done by the caller. Context may be NULL in + * WINED3D_NO3D mode. */ void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + struct wined3d_texture *texture = surface->container; + switch (location) { + case WINED3D_LOCATION_SYSMEM: + surface_prepare_system_memory(surface); + break; + + case WINED3D_LOCATION_USER_MEMORY: + if (!texture->user_memory) + ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); + break; + + case WINED3D_LOCATION_DIB: + if (!surface->dib.bitmap_data) + ERR("Map binding is set to WINED3D_LOCATION_DIB but surface->dib.bitmap_data is NULL.\n"); + break; + + case WINED3D_LOCATION_BUFFER: + wined3d_texture_prepare_buffer_object(texture, + surface_get_sub_resource_idx(surface), context->gl_info); + break; + case WINED3D_LOCATION_TEXTURE_RGB: - wined3d_texture_prepare_texture(surface->container, context, FALSE); + wined3d_texture_prepare_texture(texture, context, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - wined3d_texture_prepare_texture(surface->container, context, TRUE); + wined3d_texture_prepare_texture(texture, context, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e126961..f5a7c16 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -852,11 +852,11 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub struct wined3d_surface *surface = surface_from_resource(sub_resource); struct wined3d_context *context; - surface_prepare_map_memory(surface); - context = context_acquire(surface->resource.device, NULL); - surface_load_location(surface, context, surface->resource.map_binding); + context = context_acquire(surface->container->resource.device, NULL); + wined3d_surface_prepare(surface, context, sub_resource->map_binding); + surface_load_location(surface, context, sub_resource->map_binding); context_release(context); - surface_invalidate_location(surface, ~surface->resource.map_binding); + surface_invalidate_location(surface, ~sub_resource->map_binding); } static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da36985..87c5f9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2604,7 +2604,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; -void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Francois Gouget : include: Don't use the visibility attribute on Solaris.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 947fd6e6f966770c3b551f9744d5062ef46df4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fd6e6f966770c3b551f974… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 10:49:04 2016 +0100 include: Don't use the visibility attribute on Solaris. It is not supported and mostly ignored but can still break linking with static libraries. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 2309ae3..559a719 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -148,13 +148,13 @@ extern "C" { # define DECLSPEC_EXPORT __declspec(dllexport) #elif defined(__MINGW32__) # define DECLSPEC_EXPORT __attribute__((dllexport)) -#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) && !defined(__sun) # define DECLSPEC_EXPORT __attribute__((visibility ("default"))) #else # define DECLSPEC_EXPORT #endif -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || defined(__sun) # define DECLSPEC_HIDDEN #elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))

1 0

Nikolay Sivov : ole32/tests: Fixed CoGetPSClsid() test failures when running on limited account.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 22ef1c7e2aa7872d9b3c82a6d32abc92aa2b61a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ef1c7e2aa7872d9b3c82a6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:19 2016 +0300 ole32/tests: Fixed CoGetPSClsid() test failures when running on limited account. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 65a8fb5..183d8a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1293,6 +1293,12 @@ static void test_CoGetPSClsid(void) ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey_iface, clsidDeadBeef, 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + win_skip("Failed to create a key, skipping some of CoGetPSClsid() tests\n"); + goto cleanup; + } + ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey, "ProxyStubClsid32", 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); @@ -1310,6 +1316,8 @@ static void test_CoGetPSClsid(void) RegCloseKey(hkey); res = pRegDeleteKeyExA(hkey_iface, clsidDeadBeef, opposite, 0); ok(!res, "RegDeleteKeyEx returned %d\n", res); + + cleanup: RegCloseKey(hkey_iface); }

1 0

Andrew Eikum : winepulse.drv: Check that the server connection actually succeeded.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 0766334d04d00f1de6d601a4b052f7dfedcd9c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0766334d04d00f1de6d601a4b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 10:16:15 2016 -0600 winepulse.drv: Check that the server connection actually succeeded. When there is no PA server running, some older PulseAudio versions have pa_mainloop_iterate fail instead of setting the connection state to failed. So, we should also check the connection state after exiting the loop to ensure it really succeeded before continuing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d57b822..1c38e58 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -573,6 +573,9 @@ static HRESULT pulse_test_connect(void) break; } + if (pa_context_get_state(pulse_ctx) != PA_CONTEXT_READY) + goto fail; + TRACE("Test-connected to server %s with protocol version: %i.\n", pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx));

1 0

Henri Verbeet : wined3d: Get resource info from the rendertarget view in device_clear_render_targets ().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 2d8a1034fa8e90b45cc40987975306edd812a1c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8a1034fa8e90b45cc409879… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:47 2016 +0100 wined3d: Get resource info from the rendertarget view in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a724659..2305b2c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -320,13 +320,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c * checking all this if the dest surface is in the drawable anyway. */ for (i = 0; i < rt_count; ++i) { - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); - if (rt && rt->resource.format->id != WINED3DFMT_NULL) + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; + struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); + + if (rt && rtv->format->id != WINED3DFMT_NULL) { if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, clear_rect)) - surface_load_location(rt, context, rt->container->resource.draw_binding); + surface_load_location(rt, context, rtv->resource->draw_binding); else - wined3d_surface_prepare(rt, context, rt->container->resource.draw_binding); + wined3d_surface_prepare(rt, context, rtv->resource->draw_binding); } } @@ -394,12 +396,13 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { for (i = 0; i < rt_count; ++i) { - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; + struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); if (rt) { - surface_validate_location(rt, rt->container->resource.draw_binding); - surface_invalidate_location(rt, ~rt->container->resource.draw_binding); + surface_validate_location(rt, rtv->resource->draw_binding); + surface_invalidate_location(rt, ~rtv->resource->draw_binding); } }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_blt().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 7107263b17ac6c6ff94f94e99547098a28e22ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7107263b17ac6c6ff94f94e99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:49 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 54 ++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 469a493..4ea615e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4659,8 +4659,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = dst_texture->resource.device; struct wined3d_swapchain *src_swapchain, *dst_swapchain; - struct wined3d_device *device = dst_surface->resource.device; + struct wined3d_texture *src_texture = NULL; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; @@ -4676,7 +4678,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); + TRACE("Usage is %s.\n", debug_d3dusage(dst_texture->resource.usage)); if (fx) { @@ -4717,6 +4719,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst WARN("The application gave us a bad source rectangle.\n"); return WINEDDERR_INVALIDRECT; } + src_texture = src_surface->container; } if (!fx || !(fx->fx)) @@ -4753,9 +4756,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->container->flags & WINED3D_TEXTURE_CONVERTED - || dst_surface->container->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_surface->container, TRUE)) + if (dst_texture->flags & WINED3D_TEXTURE_CONVERTED || dst_texture->resource.format->convert + || wined3d_format_get_color_key_conversion(dst_texture, TRUE)) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu; @@ -4768,11 +4770,11 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst } if (src_surface) - src_swapchain = src_surface->container->swapchain; + src_swapchain = src_texture->swapchain; else src_swapchain = NULL; - dst_swapchain = dst_surface->container->swapchain; + dst_swapchain = dst_texture->swapchain; /* This isn't strictly needed. FBO blits for example could deal with * cross-swapchain blits by first downloading the source to a texture @@ -4788,12 +4790,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst scale = src_surface && (src_rect->right - src_rect->left != dst_rect->right - dst_rect->left || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top); - convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; + convert = src_surface && src_texture->resource.format->id != dst_texture->resource.format->id; - dst_ds_flags = dst_surface->container->resource.format_flags + dst_ds_flags = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) - src_ds_flags = src_surface->container->resource.format_flags + src_ds_flags = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); else src_ds_flags = 0; @@ -4820,8 +4822,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->container->resource.draw_binding, - src_rect, dst_surface, dst_surface->container->resource.draw_binding, dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_texture->resource.draw_binding, + src_rect, dst_surface, dst_texture->resource.draw_binding, dst_rect))) return WINED3D_OK; } } @@ -4849,7 +4851,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("Color fill.\n"); - if (!wined3d_format_convert_color_to_float(dst_surface->resource.format, + if (!wined3d_format_convert_color_to_float(dst_texture->resource.format, palette, fx->fill_color, &color)) goto fallback; @@ -4869,7 +4871,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst } else if (flags & WINED3D_BLT_SRC_CKEY) { - color_key = &src_surface->container->async.src_blt_color_key; + color_key = &src_texture->async.src_blt_color_key; blit_op = WINED3D_BLIT_OP_COLOR_BLIT_CKEY; } else if (flags & WINED3D_BLT_ALPHA_TEST) @@ -4890,10 +4892,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, src_rect))) { - if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { struct wined3d_context *context = context_acquire(device, dst_surface); - surface_load_location(dst_surface, context, dst_surface->container->resource.draw_binding); + surface_load_location(dst_surface, context, dst_texture->resource.draw_binding); context_release(context); } return WINED3D_OK; @@ -4901,8 +4903,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst } } else if (dst_swapchain && dst_swapchain->back_buffers - && dst_surface->container == dst_swapchain->front_buffer - && src_surface->container == dst_swapchain->back_buffers[0]) + && dst_texture == dst_swapchain->front_buffer + && src_texture == dst_swapchain->back_buffers[0]) { /* Use present for back -> front blits. The idea behind this is * that present is potentially faster than a blit, in particular @@ -4924,27 +4926,27 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst } if (fbo_blit_supported(&device->adapter->gl_info, blit_op, - src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, + dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format)) { struct wined3d_context *context; TRACE("Using FBO blit.\n"); context = context_acquire(device, NULL); surface_blt_fbo(device, context, filter, - src_surface, src_surface->container->resource.draw_binding, src_rect, - dst_surface, dst_surface->container->resource.draw_binding, dst_rect); + src_surface, src_texture->resource.draw_binding, src_rect, + dst_surface, dst_texture->resource.draw_binding, dst_rect); context_release(context); - surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); - surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); + surface_validate_location(dst_surface, dst_texture->resource.draw_binding); + surface_invalidate_location(dst_surface, ~dst_texture->resource.draw_binding); return WINED3D_OK; } blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, - src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format); + src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, + dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format); if (blitter) { blitter->blit_surface(device, blit_op, filter, src_surface,

1 0

Henri Verbeet : wined3d: Get resource info from the texture in context_setup_target().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 34968bb2d80455348e52b9257d46c61a41e8ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34968bb2d80455348e52b9257… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:45 2016 +0100 wined3d: Get resource info from the texture in context_setup_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 500904d..415eedf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3426,8 +3426,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d } else { - const struct wined3d_format *old = context->current_rt->resource.format; - const struct wined3d_format *new = target->resource.format; + const struct wined3d_format *old = context->current_rt->container->resource.format; + const struct wined3d_format *new = target->container->resource.format; if (old->id != new->id) {

1 0

Frédéric Delanoy : winemaker: Markup fixes in French translation.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 1bd60414c8f07461447b53e98dbc38001a04e6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd60414c8f07461447b53e98… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Mar 6 02:30:28 2016 +0100 winemaker: Markup fixes in French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.fr.UTF-8.man.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winemaker/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in index 8e454ae..75ed9fd 100644 --- a/tools/winemaker/winemaker.fr.UTF-8.man.in +++ b/tools/winemaker/winemaker.fr.UTF-8.man.in @@ -29,12 +29,11 @@ winemaker \- générer une infrastructure de construction pour la compilation de .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "] .br -.IR " répertoire_de_travail" "| " "fichier_projet" "| " "fichier_espace_de_travail" +.IR " répertoire_de_travail" " | " "fichier_projet" " | " "fichier_espace_de_travail" .SH DESCRIPTION .PP @@ -49,7 +48,7 @@ convertis en majuscules durant le transfert. .PP -\ convertir les fins de ligne DOS en fins de ligne UNIX (CRLF vers LF). .PP --\ balayer les directives d'inclusion et les références aux fichiers +-\ parcourir les directives d'inclusion et les références aux fichiers de ressources pour y remplacer les backslashs par des slashs. .PP -\ durant l'étape ci-dessus, @@ -182,7 +181,7 @@ L'ensemble standard de bibliothèques est : \fIodbc32.dll\fR, \fIodbccp32.dll\f \fIoleaut32.dll\fR et \fIwinspool.drv\fR. .TP .B --nomsvcrt -Définir certaines options afin que winegcc n'utilise pas +Définir certaines options afin que \fBwinegcc\fR n'utilise pas msvcrt durant la compilation. Utilisez cette option si certains fichiers cpp incluent \fI<string>\fR. .TP @@ -192,7 +191,7 @@ Utiliser le mode interactif. Dans ce mode, demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. .TP -.BR --single-target " nom" +.BI --single-target " nom" Spécifier qu'il n'y a qu'une seule cible, appelée \fInom\fR. .TP .B --generated-files

1 0

Nikolay Sivov : ole32/tests: Don' t trace last error when error code is returned directly.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 2a1e856bd93cbbd6d536b6d7cdaa3c42aa19b759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1e856bd93cbbd6d536b6d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:18 2016 +0300 ole32/tests: Don't trace last error when error code is returned directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 49aced9..65a8fb5 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2098,12 +2098,11 @@ static void test_TreatAsClass(void) ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); - ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); + ok(!lr, "Couldn't open CLSID key, error %d\n", lr); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); if (lr) { - win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", - GetLastError()); + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", lr); RegCloseKey(clsidkey); return; } @@ -2377,13 +2376,13 @@ static void test_OleRegGetUserType(void) return; } - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); + ok(!ret, "failed to create a key, error %d\n", ret); ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegCreateKeyExA(classkey, "AuxUserType", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &auxhkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); /* populate AuxUserType */ for (i = 0; i <= 4; i++) { @@ -2391,10 +2390,10 @@ static void test_OleRegGetUserType(void) sprintf(name, "AuxUserType\\%d", i); ret = RegCreateKeyExA(classkey, name, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE*)auxvalues[i], strlen(auxvalues[i])); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); RegCloseKey(hkey); }

1 0

Nikolay Sivov : ole32/tests: Fix tests failing on limited account.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 485a412b1870b829b3865982e251d5418fb62a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485a412b1870b829b3865982e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:17 2016 +0300 ole32/tests: Fix tests failing on limited account. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b88029f..49aced9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2364,17 +2364,21 @@ static void test_OleRegGetUserType(void) StringFromGUID2(&CLSID_non_existent, clsidW, sizeof(clsidW)/sizeof(clsidW[0])); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsidkeyW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &clsidhkey, &disposition); + if (!ret) + { + ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); + if (ret) + RegCloseKey(clsidhkey); + } + if (ret == ERROR_ACCESS_DENIED) { - skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); + win_skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); return; } ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); - ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); - ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); ok(!ret, "got %d, error %d\n", ret, GetLastError());

1 0