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

Henri Verbeet : wined3d: Get resource info from the rendertarget view in draw_primitive().
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 9083addc6a49e64ea011b53ce6ce06fc3e0d8181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083addc6a49e64ea011b53ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:48 2016 +0100 wined3d: Get resource info from the rendertarget view in draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ff62850..c95f92d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -622,17 +622,19 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(device->fb.render_targets[i]); - if (target && target->resource.format->id != WINED3DFMT_NULL) + struct wined3d_rendertarget_view *rtv = device->fb.render_targets[i]; + struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); + + if (target && rtv->format->id != WINED3DFMT_NULL) { if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - surface_load_location(target, context, target->container->resource.draw_binding); - surface_invalidate_location(target, ~target->container->resource.draw_binding); + surface_load_location(target, context, rtv->resource->draw_binding); + surface_invalidate_location(target, ~rtv->resource->draw_binding); } else { - wined3d_surface_prepare(target, context, target->container->resource.draw_binding); + wined3d_surface_prepare(target, context, rtv->resource->draw_binding); } } }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_blt().
by Alexandre Julliard 07 Mar '16

07 Mar '16

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

Stefan Dösinger : wined3d: Merge surface_prepare_map_memory() into wined3d_surface_prepare().
by Alexandre Julliard 07 Mar '16

07 Mar '16

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

Alexandre Julliard : Wine release 1.9.5
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: website Branch: master Commit: 041a4da6f88aa5b561e65fc6887572930cd20aa5 URL: http://source.winehq.org/git/website.git/?a=commit;h=041a4da6f88aa5b561e65f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 5 00:48:44 2016 +0900 Wine release 1.9.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016030501.xml b/news/en/2016030501.xml new file mode 100644 index 0000000..750ff31 --- /dev/null +++ b/news/en/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>March 5, 2016</date> +<title>Wine 1.9.5 Released</title> +<body> + The Wine development release 1.9.5 is now available. + <a href="{$root}/announce/1.9.5">What's new</a> in this release: +<ul> + <li>New version of the Mono engine, with 64-bit support.</li> + <li>Beginnings of the WineD3D command stream.</li> + <li>Support for effect states in Direct3DX.</li> + <li>Drag & drop improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Aric Stewart : hidclass.sys: Handle failure to parse preparseData.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 5fb6a94bb9c5688a27b01cf65bdec0774b481a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb6a94bb9c5688a27b01cf65… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 3 12:53:06 2016 -0600 hidclass.sys: Handle failure to parse preparseData. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 24dd140..5de7522 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -212,8 +212,16 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) } ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); - ext->information.DescriptorSize = ext->preparseData->dwSize; + HeapFree(GetProcessHeap(), 0, reportDescriptor); + if (!ext->preparseData) + { + ERR("Cannot parse Report Descriptor\n"); + HID_DeleteDevice(&minidriver->minidriver, device); + return STATUS_NOT_SUPPORTED; + } + + ext->information.DescriptorSize = ext->preparseData->dwSize; serial[0] = 0; status = call_minidriver(IOCTL_HID_GET_STRING, device,

1 0

Michael Stefaniuc : gdi32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: a23038217d865bbe101c15e076721420e5fa2d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23038217d865bbe101c15e07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:59:16 2016 +0100 gdi32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 09c05c1..c9b7b31 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -891,7 +891,7 @@ static void test_boundsrect(void) ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect) || broken(EqualRect(&rect, &set_rect)), /* nt4 sp1-5 */ "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", @@ -986,7 +986,7 @@ static void test_boundsrect(void) "GetBoundsRect returned %x\n", ret); if (ret == DCB_RESET) { - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); @@ -995,7 +995,7 @@ static void test_boundsrect(void) ok(ret == (DCB_RESET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); }

1 0

Nikolay Sivov : ole32: Don't call spy on IMalloc::Free(NULL).
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 110665a3d88d68e0076a435c1e6a1522a964942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=110665a3d88d68e0076a435c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:30 2016 +0300 ole32: Don't call spy on IMalloc::Free(NULL). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 3 + dlls/ole32/tests/compobj.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 6868897..0ca9b71 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -257,6 +257,9 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) TRACE("(%p)\n",pv); + if(!pv) + return; + if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); fSpyed = RemoveMemoryLocation(pv); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index de511ab..39beee4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2933,6 +2933,140 @@ static void test_CoGetApartmentType(void) CoUninitialize(); } + +static HRESULT WINAPI testspy_QI(IMallocSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMallocSpy) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMallocSpy_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI testspy_AddRef(IMallocSpy *iface) +{ + return 2; +} + +static ULONG WINAPI testspy_Release(IMallocSpy *iface) +{ + return 1; +} + +static SIZE_T WINAPI testspy_PreAlloc(IMallocSpy *iface, SIZE_T cb) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostAlloc(IMallocSpy *iface, void *ptr) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreFree(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void WINAPI testspy_PostFree(IMallocSpy *iface, BOOL spyed) +{ + ok(0, "unexpected call\n"); +} + +static SIZE_T WINAPI testspy_PreRealloc(IMallocSpy *iface, void *ptr, SIZE_T cb, void **newptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostRealloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreGetSize(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static SIZE_T WINAPI testspy_PostGetSize(IMallocSpy *iface, SIZE_T actual, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PreDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static int WINAPI testspy_PostDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed, int actual) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void WINAPI testspy_PreHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI testspy_PostHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static const IMallocSpyVtbl testspyvtbl = +{ + testspy_QI, + testspy_AddRef, + testspy_Release, + testspy_PreAlloc, + testspy_PostAlloc, + testspy_PreFree, + testspy_PostFree, + testspy_PreRealloc, + testspy_PostRealloc, + testspy_PreGetSize, + testspy_PostGetSize, + testspy_PreDidAlloc, + testspy_PostDidAlloc, + testspy_PreHeapMinimize, + testspy_PostHeapMinimize +}; + +static IMallocSpy testspy = { &testspyvtbl }; + +static void test_IMallocSpy(void) +{ + IMalloc *imalloc; + HRESULT hr; + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + imalloc = NULL; + hr = CoGetMalloc(MEMCTX_TASK, &imalloc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imalloc != NULL, "got %p\n", imalloc); + + IMalloc_Free(imalloc, NULL); + + IMalloc_Release(imalloc); + + hr = CoRevokeMallocSpy(); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3000,4 +3134,5 @@ START_TEST(compobj) test_CoGetMalloc(); test_OleRegGetUserType(); test_CoGetApartmentType(); + test_IMallocSpy(); }

1 0

Nikolay Sivov : ole32: Improve CoRegisterMallocSpy/ CoRevokeMallocSpy state and parameter validation.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: cef4c7dc69bf9c76db9e8c04438575ca9e4ee5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef4c7dc69bf9c76db9e8c044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:31 2016 +0300 ole32: Improve CoRegisterMallocSpy/CoRevokeMallocSpy state and parameter validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 7 +++++-- dlls/ole32/tests/compobj.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 0ca9b71..7469fb2 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -464,8 +464,9 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) IMallocSpy* pSpy; HRESULT hres = E_INVALIDARG; - TRACE("\n"); + TRACE("%p\n", pMallocSpy); + if(!pMallocSpy) return E_INVALIDARG; if(Malloc32.pSpy) return CO_E_OBJISREG; EnterCriticalSection(&IMalloc32_SpyCS); @@ -504,7 +505,9 @@ HRESULT WINAPI CoRevokeMallocSpy(void) EnterCriticalSection(&IMalloc32_SpyCS); - if (Malloc32.SpyedAllocationsLeft) { + if (!Malloc32.pSpy) + hres = CO_E_OBJNOTREG; + else if (Malloc32.SpyedAllocationsLeft) { TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft); Malloc32.SpyReleasePending = TRUE; hres = E_ACCESSDENIED; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 39beee4..b88029f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3051,9 +3051,21 @@ static void test_IMallocSpy(void) IMalloc *imalloc; HRESULT hr; + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); + hr = CoRegisterMallocSpy(&testspy); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == CO_E_OBJISREG, "got 0x%08x\n", hr); + imalloc = NULL; hr = CoGetMalloc(MEMCTX_TASK, &imalloc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3065,6 +3077,9 @@ static void test_IMallocSpy(void) hr = CoRevokeMallocSpy(); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); } static void init_funcs(void)

1 0

Nikolay Sivov : ole32: Hold a lock when checking is spy is already registered.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 7c0b1b62688258c3478b218e62691a44295f57c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0b1b62688258c3478b218e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:32 2016 +0300 ole32: Hold a lock when checking is spy is already registered. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 7469fb2..c9e5625 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -467,11 +467,12 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) TRACE("%p\n", pMallocSpy); if(!pMallocSpy) return E_INVALIDARG; - if(Malloc32.pSpy) return CO_E_OBJISREG; EnterCriticalSection(&IMalloc32_SpyCS); - if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { + if (Malloc32.pSpy) + hres = CO_E_OBJISREG; + else if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { Malloc32.pSpy = pSpy; hres = S_OK; }

1 0

Nikolay Sivov : d3drm: Remove first found callback, not all of them.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: d5d1a288e9bc7a108a6b7b46e22ca2d617df88b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d1a288e9bc7a108a6b7b46e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 07:20:18 2016 +0300 d3drm: Remove first found callback, not all of them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_main.c | 5 +++-- dlls/d3drm/tests/d3drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 62ad5b9..67d1ad1 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -77,17 +77,18 @@ HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJE HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) { - struct destroy_callback *callback, *callback2; + struct destroy_callback *callback; if (!cb) return D3DRMERR_BADVALUE; - LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) + LIST_FOR_EACH_ENTRY(callback, &object->destroy_callbacks, struct destroy_callback, entry) { if (callback->cb == cb && callback->ctx == ctx) { list_remove(&callback->entry); HeapFree(GetProcessHeap(), 0, callback); + break; } } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 77b4d59..8a125fc 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1355,6 +1355,26 @@ static void test_Viewport(void) IDirect3DRMViewport_Release(viewport); ok(context.called == 3, "got %d, expected 3\n", context.called); + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ + hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + context.called = 0; + IDirect3DRMViewport_Release(viewport); + ok(context.called == 2, "got %d, expected 2\n", context.called); + /* destroy from Viewport2 */ hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); @@ -1395,6 +1415,30 @@ static void test_Viewport(void) IDirect3DRMViewport2_Release(viewport2); ok(context.called == 3, "got %d, expected 3\n", context.called); + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ + hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + IDirect3DRMViewport_Release(viewport); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + context.called = 0; + IDirect3DRMViewport2_Release(viewport2); + ok(context.called == 2, "got %d, expected 2\n", context.called); + IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); IDirectDrawClipper_Release(pClipper);

1 0