September 2018 - Wine-devel

[PATCH 1/4] wined3d: Unify texture download functions.
by Andrew Wesie 03 Oct '18

03 Oct '18

Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/surface.c | 233 +------------------------- dlls/wined3d/texture.c | 359 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 295 insertions(+), 299 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8b69720..4942177 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -342,235 +342,6 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win return TRUE; } -/* This call just downloads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, DWORD dst_location) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture_sub_resource *sub_resource; - unsigned int dst_row_pitch, dst_slice_pitch; - unsigned int src_row_pitch, src_slice_pitch; - const struct wined3d_format_gl *format_gl; - struct wined3d_bo_address data; - BYTE *temporary_mem = NULL; - unsigned int level; - GLenum target; - void *mem; - - format_gl = wined3d_format_gl(texture->resource.format); - - /* Only support read back of converted P8 textures. */ - if (texture->flags & WINED3D_TEXTURE_CONVERTED && format_gl->f.id != WINED3DFMT_P8_UINT && !format_gl->f.download) - { - ERR("Trying to read back converted texture %p, %u with format %s.\n", - texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); - return; - } - - sub_resource = &texture->sub_resources[sub_resource_idx]; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - level = sub_resource_idx % texture->level_count; - - if (target == GL_TEXTURE_2D_ARRAY) - { - if (format_gl->f.download) - { - FIXME("Reading back converted array texture %p is not supported.\n", texture); - return; - } - - /* NP2 emulation is not allowed on array textures. */ - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - ERR("Array texture %p uses NP2 emulation.\n", texture); - - WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); - - if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) - { - ERR("Out of memory.\n"); - return; - } - } - - wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - if (format_gl->f.download) - { - FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture); - return; - } - - wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(&format_gl->f, texture->resource.device->surface_alignment, - wined3d_texture_get_level_pow2_width(texture, level), - wined3d_texture_get_level_pow2_height(texture, level), - &src_row_pitch, &src_slice_pitch); - if (!(temporary_mem = heap_alloc(src_slice_pitch))) - { - ERR("Out of memory.\n"); - return; - } - - if (data.buffer_object) - ERR("NP2 emulated texture uses PBO unexpectedly.\n"); - if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) - ERR("Unexpected compressed format for NP2 emulated texture.\n"); - } - - if (format_gl->f.download) - { - struct wined3d_format f; - - if (data.buffer_object) - ERR("Converted texture %p uses PBO unexpectedly.\n", texture); - - WARN_(d3d_perf)("Downloading converted texture %p, %u with format %s.\n", - texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); - - f = format_gl->f; - f.byte_count = format_gl->f.conv_byte_count; - wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level), - &src_row_pitch, &src_slice_pitch); - - if (!(temporary_mem = heap_alloc(src_slice_pitch))) - { - ERR("Failed to allocate memory.\n"); - return; - } - } - - if (temporary_mem) - { - mem = temporary_mem; - } - else if (data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); - checkGLcall("glBindBuffer"); - mem = data.addr; - } - else - { - mem = data.addr; - } - - if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) - { - TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); - - GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); - checkGLcall("glGetCompressedTexImage"); - } - else - { - TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); - - gl_info->gl_ops.gl.p_glGetTexImage(target, level, format_gl->format, format_gl->type, mem); - checkGLcall("glGetTexImage"); - } - - if (format_gl->f.download) - { - format_gl->f.download(mem, data.addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level), 1); - } - else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - const BYTE *src_data; - unsigned int h, y; - BYTE *dst_data; - /* - * Some games (e.g. warhammer 40k) don't work properly with the odd pitches, preventing - * the surface pitch from being used to box non-power2 textures. Instead we have to use a hack to - * repack the texture so that the bpp * width pitch can be used instead of bpp * pow2width. - * - * We're doing this... - * - * instead of boxing the texture : - * |<-texture width ->| -->pow2width| /\ - * |111111111111111111| | | - * |222 Texture 222222| boxed empty | texture height - * |3333 Data 33333333| | | - * |444444444444444444| | \/ - * ----------------------------------- | - * | boxed empty | boxed empty | pow2height - * | | | \/ - * ----------------------------------- - * - * - * we're repacking the data to the expected texture width - * - * |<-texture width ->| -->pow2width| /\ - * |111111111111111111222222222222222| | - * |222333333333333333333444444444444| texture height - * |444444 | | - * | | \/ - * | | | - * | empty | pow2height - * | | \/ - * ----------------------------------- - * - * == is the same as - * - * |<-texture width ->| /\ - * |111111111111111111| - * |222222222222222222|texture height - * |333333333333333333| - * |444444444444444444| \/ - * -------------------- - * - * This also means that any references to surface memory should work with the data as if it were a - * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. - * - * internally the texture is still stored in a boxed format so any references to textureName will - * get a boxed texture with width pow2width and not a texture of width resource.width. */ - src_data = mem; - dst_data = data.addr; - TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - h = wined3d_texture_get_level_height(texture, level); - for (y = 0; y < h; ++y) - { - memcpy(dst_data, src_data, dst_row_pitch); - src_data += src_row_pitch; - dst_data += dst_row_pitch; - } - } - else if (temporary_mem) - { - unsigned int layer = sub_resource_idx / texture->level_count; - void *src_data = temporary_mem + layer * sub_resource->size; - if (data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); - checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, src_data)); - checkGLcall("glBufferSubData"); - } - else - { - memcpy(data.addr, src_data, sub_resource->size); - } - } - - if (data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - heap_free(temporary_mem); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { @@ -1666,9 +1437,11 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res /* Download the sub-resource to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { + struct wined3d_bo_address data; wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, context, dst_location); + wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; return TRUE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9589e49..29bbdd7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2136,6 +2136,291 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s } } +static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct wined3d_bo_address *data) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture_sub_resource *sub_resource; + unsigned int dst_row_pitch, dst_slice_pitch; + unsigned int src_row_pitch, src_slice_pitch; + const struct wined3d_format_gl *format_gl; + BYTE *temporary_mem = NULL; + unsigned int level; + GLenum target; + void *mem; + + format_gl = wined3d_format_gl(texture->resource.format); + + /* Only support read back of converted P8 textures. */ + if (texture->flags & WINED3D_TEXTURE_CONVERTED && format_gl->f.id != WINED3DFMT_P8_UINT && !format_gl->f.download) + { + ERR("Trying to read back converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); + return; + } + + sub_resource = &texture->sub_resources[sub_resource_idx]; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + + if (target == GL_TEXTURE_2D_ARRAY) + { + if (format_gl->f.download) + { + FIXME("Reading back converted array texture %p is not supported.\n", texture); + return; + } + + /* NP2 emulation is not allowed on array textures. */ + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + ERR("Array texture %p uses NP2 emulation.\n", texture); + + WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); + + if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) + { + ERR("Out of memory.\n"); + return; + } + } + + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + if (format_gl->f.download) + { + FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture); + return; + } + + wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&format_gl->f, texture->resource.device->surface_alignment, + wined3d_texture_get_level_pow2_width(texture, level), + wined3d_texture_get_level_pow2_height(texture, level), + &src_row_pitch, &src_slice_pitch); + if (!(temporary_mem = heap_alloc(src_slice_pitch))) + { + ERR("Out of memory.\n"); + return; + } + + if (data->buffer_object) + ERR("NP2 emulated texture uses PBO unexpectedly.\n"); + if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + ERR("Unexpected compressed format for NP2 emulated texture.\n"); + } + + if (format_gl->f.download) + { + struct wined3d_format f; + + if (data->buffer_object) + ERR("Converted texture %p uses PBO unexpectedly.\n", texture); + + WARN_(d3d_perf)("Downloading converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); + + f = format_gl->f; + f.byte_count = format_gl->f.conv_byte_count; + wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), + &src_row_pitch, &src_slice_pitch); + + if (!(temporary_mem = heap_alloc(src_slice_pitch))) + { + ERR("Failed to allocate memory.\n"); + return; + } + } + + if (temporary_mem) + { + mem = temporary_mem; + } + else if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + mem = data->addr; + } + else + { + mem = data->addr; + } + + if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + { + TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); + + GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); + checkGLcall("glGetCompressedTexImage"); + } + else + { + TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); + + gl_info->gl_ops.gl.p_glGetTexImage(target, level, format_gl->format, format_gl->type, mem); + checkGLcall("glGetTexImage"); + } + + if (format_gl->f.download) + { + format_gl->f.download(mem, data->addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), 1); + } + else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + const BYTE *src_data; + unsigned int h, y; + BYTE *dst_data; + /* + * Some games (e.g. warhammer 40k) don't work properly with the odd pitches, preventing + * the surface pitch from being used to box non-power2 textures. Instead we have to use a hack to + * repack the texture so that the bpp * width pitch can be used instead of bpp * pow2width. + * + * We're doing this... + * + * instead of boxing the texture : + * |<-texture width ->| -->pow2width| /\ + * |111111111111111111| | | + * |222 Texture 222222| boxed empty | texture height + * |3333 Data 33333333| | | + * |444444444444444444| | \/ + * ----------------------------------- | + * | boxed empty | boxed empty | pow2height + * | | | \/ + * ----------------------------------- + * + * + * we're repacking the data to the expected texture width + * + * |<-texture width ->| -->pow2width| /\ + * |111111111111111111222222222222222| | + * |222333333333333333333444444444444| texture height + * |444444 | | + * | | \/ + * | | | + * | empty | pow2height + * | | \/ + * ----------------------------------- + * + * == is the same as + * + * |<-texture width ->| /\ + * |111111111111111111| + * |222222222222222222|texture height + * |333333333333333333| + * |444444444444444444| \/ + * -------------------- + * + * This also means that any references to surface memory should work with the data as if it were a + * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. + * + * internally the texture is still stored in a boxed format so any references to textureName will + * get a boxed texture with width pow2width and not a texture of width resource.width. */ + src_data = mem; + dst_data = data->addr; + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); + h = wined3d_texture_get_level_height(texture, level); + for (y = 0; y < h; ++y) + { + memcpy(dst_data, src_data, dst_row_pitch); + src_data += src_row_pitch; + dst_data += dst_row_pitch; + } + } + else if (temporary_mem) + { + unsigned int layer = sub_resource_idx / texture->level_count; + void *src_data = temporary_mem + layer * sub_resource->size; + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, src_data)); + checkGLcall("glBufferSubData"); + } + else + { + memcpy(data->addr, src_data, sub_resource->size); + } + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } + + heap_free(temporary_mem); +} + +/* This call just downloads data, the caller is responsible for binding the + * correct texture. Partial downloads are not supported. */ +/* Context activation is done by the caller. */ +void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct wined3d_bo_address *data) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format_gl *format_gl; + unsigned int level; + GLenum target; + + format_gl = wined3d_format_gl(texture->resource.format); + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count + || texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)) + { + /* 2D-specific special cases. */ + texture2d_download_data(texture, sub_resource_idx, context, data); + return; + } + + if (format_gl->f.conv_byte_count) + { + FIXME("Attempting to download a converted texture, type %s format %s.\n", + debug_d3dresourcetype(texture->resource.type), + debug_d3dformat(format_gl->f.id)); + return; + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + } + + if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + { + TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format_gl->format, format_gl->type, data->addr); + + GL_EXTCALL(glGetCompressedTexImage(target, level, data->addr)); + checkGLcall("glGetCompressedTexImage"); + } + else + { + TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format_gl->format, format_gl->type, data->addr); + + gl_info->gl_ops.gl.p_glGetTexImage(target, level, format_gl->format, format_gl->type, data->addr); + checkGLcall("glGetTexImage"); + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } +} + /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) @@ -2441,38 +2726,6 @@ static const struct wined3d_resource_ops texture_resource_ops = }; /* Context activation is done by the caller. */ -static void texture1d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_bo_address *data) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format_gl *format_gl; - - format_gl = wined3d_format_gl(texture->resource.format); - if (format_gl->f.conv_byte_count) - { - FIXME("Attempting to download a converted texture, format %s.\n", - debug_d3dformat(format_gl->f.id)); - return; - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - gl_info->gl_ops.gl.p_glGetTexImage(texture->target, sub_resource_idx, - format_gl->format, format_gl->type, data->addr); - checkGLcall("glGetTexImage"); - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } -} - -/* Context activation is done by the caller. */ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { @@ -2532,7 +2785,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - texture1d_download_data(texture, sub_resource_idx, context, &data); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; } else @@ -2553,7 +2806,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - texture1d_download_data(texture, sub_resource_idx, context, &data); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } else { @@ -2914,38 +3167,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } /* Context activation is done by the caller. */ -static void texture3d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_bo_address *data) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format_gl *format_gl; - - format_gl = wined3d_format_gl(texture->resource.format); - if (format_gl->f.conv_byte_count) - { - FIXME("Attempting to download a converted volume, format %s.\n", - debug_d3dformat(format_gl->f.id)); - return; - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, sub_resource_idx, - format_gl->format, format_gl->type, data->addr); - checkGLcall("glGetTexImage"); - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } -} - -/* Context activation is done by the caller. */ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL dest_is_srgb) { @@ -2968,7 +3189,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); - texture3d_download_data(texture, sub_resource_idx, context, &data); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); @@ -3041,7 +3262,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - texture3d_download_data(texture, sub_resource_idx, context, &data); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; } else @@ -3062,7 +3283,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - texture3d_download_data(texture, sub_resource_idx, context, &data); + wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8cfa4c3..7d35e55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3348,6 +3348,8 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; +void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; -- 2.7.4

3 8

[PATCH 5/7] kernel32: Reimplement RemoveDirectory() by setting a delete disposition.
by Dmitry Timoshkov 02 Oct '18

02 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 17 ++++++++--------- dlls/ntdll/tests/file.c | 8 +++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 48a3e336ec..5318a94388 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1656,11 +1656,10 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nt_name; - ANSI_STRING unix_name; IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; - BOOL ret = FALSE; + FILE_DISPOSITION_INFORMATION fdi; TRACE( "%s\n", debugstr_w(path) ); @@ -1686,19 +1685,19 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) return FALSE; } - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); + + fdi.DoDeleteFile = TRUE; + status = NtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation); + + NtClose( handle ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) ); - NtClose( handle ); return FALSE; } - - if (!(ret = (rmdir( unix_name.Buffer ) != -1))) FILE_SetDosError(); - RtlFreeAnsiString( &unix_name ); - NtClose( handle ); - return ret; + return TRUE; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b4223b3997..363fe3f6fc 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2857,16 +2857,18 @@ todo_wine fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; -todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); +todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle2 != INVALID_HANDLE_VALUE) + CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "Directory should have been deleted\n" ); @@ -2889,10 +2891,10 @@ todo_wine handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -- 2.17.1

3 2

[PATCH] dxgi: fixed typo in width/height (Coverity)
by Marcus Meissner 01 Oct '18

01 Oct '18

CID 1439782 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d1908ac1c2..f2bc9ed229 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4392,7 +4392,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 800; - mode_desc.Width = 600; + mode_desc.Height = 600; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); @@ -4401,7 +4401,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 400; - mode_desc.Width = 200; + mode_desc.Height = 200; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); -- 2.19.0

3 2

[PATCH v2 1/2] user32: Let nulldrv return some dummy monitor information.
by Bernhard Übelacker 01 Oct '18

01 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes patch 151898. v2: No changes to v1. --- dlls/user32/driver.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd6..03296d518c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,7 +354,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULL, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +369,17 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) -- 2.19.0

3 9

[PATCH v2] d3dcompiler_43/tests: Avoid using GCC's typeof extension
by Alex Henrie 01 Oct '18

01 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/d3dcompiler_43/tests/blob.c | 6 +++--- dlls/d3dcompiler_43/tests/reflection.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index cc629fad84..443ed2754c 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -33,9 +33,9 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DCreateBlob) *pD3DCreateBlob; -static typeof(D3DGetBlobPart) *pD3DGetBlobPart; -static typeof(D3DStripShader) *pD3DStripShader; +static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); +static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 5a85159d89..2c1c9028bb 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -38,7 +38,7 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DReflect) *pD3DReflect; +static HRESULT (WINAPI *pD3DReflect)(const void *, SIZE_T, REFIID, void **); /* Creator string for comparison - Version 9.29.952.3111 (43) */ static DWORD shader_creator[] = { -- 2.19.0

2 1

[PATCH] wevtapi: fix typo in spec file
by Louis Lenders 30 Sep '18

30 Sep '18

https://bugs.winehq.org/show_bug.cgi?id=45910 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wevtapi/wevtapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 7e6f15d1fe..e5dd0e7057 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -4,7 +4,7 @@ @ stdcall EvtClose(ptr) @ stub EvtCreateBookmark @ stub EvtCreateRenderContext -@ stub EvtExportLog(ptr wstr wstr wstr long) +@ stdcall EvtExportLog(ptr wstr wstr wstr long) @ stub EvtFormatMessage @ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) @ stub EvtGetEventInfo -- 2.17.1

1 0

[PATCH v3 1/8] ntdll/tests: Use a temporary path in open_file_test().
by Zebediah Figura 30 Sep '18

30 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- For whatever reason, on the w8 test machine, WindowsUpdate.log is virtualized, and the virtualized contents differ from those of the real file. NtQueryDirectoryFile() retrieves the size of the latter, but NtOpenFile() opens the former. Use a temporary directory to avoid any problems related to virtualization. dlls/ntdll/tests/file.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b4223b3..2e57918 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -347,6 +347,7 @@ static void create_file_test(void) static void open_file_test(void) { + static const WCHAR testdirW[] = {'o','p','e','n','f','i','l','e','t','e','s','t',0}; static const char testdata[] = "Hello World"; static WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; @@ -415,6 +416,27 @@ static void open_file_test(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); + CloseHandle( dir ); + + GetTempPathW( MAX_PATH, path ); + lstrcatW( path, testdirW ); + CreateDirectoryW( path, NULL ); + + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.RootDirectory = NULL; + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + GetTempFileNameW( path, fooW, 0, tmpfile ); + file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); + numbytes = 0xdeadbeef; + ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); + ok( ret, "WriteFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); + CloseHandle( file ); /* try open by file id */ @@ -436,15 +458,7 @@ static void open_file_test(void) FILE_SHARE_READ, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED || status == STATUS_SHARING_VIOLATION, - "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); - if (status == STATUS_NOT_IMPLEMENTED) - { - win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); - break; - } - if (status == STATUS_SHARING_VIOLATION) - trace( "%s is currently open\n", wine_dbgstr_w(info->FileName) ); + ok( status == STATUS_SUCCESS, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); if (!status) { BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; @@ -480,18 +494,7 @@ static void open_file_test(void) CloseHandle( dir ); CloseHandle( root ); - GetTempPathW( MAX_PATH, path ); - GetTempFileNameW( path, fooW, 0, tmpfile ); pRtlDosPathNameToNtPathName_U( tmpfile, &nameW, NULL, NULL ); - - file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); - numbytes = 0xdeadbeef; - ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); - ok( ret, "WriteFile failed with error %u\n", GetLastError() ); - ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); - CloseHandle( file ); - attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nameW; @@ -547,6 +550,7 @@ static void open_file_test(void) CloseHandle( file ); CloseHandle( root ); DeleteFileW( tmpfile ); + RemoveDirectoryW( path ); } static void delete_file_test(void) -- 2.7.4

1 7

[PATCH] shell32/shelllink: Fix NULL path handling in SetIconLocation().
by Nikolay Sivov 30 Sep '18

30 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shelllink.c | 38 ++++++++++++++++++++-------------- dlls/shell32/tests/shelllink.c | 29 +++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0380ac9e7a..9a61ea100d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1464,19 +1464,22 @@ static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR ps return S_OK; } -static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR pszIconPath, - INT iIcon) +static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR path, INT icon) { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - WCHAR *pathW; + WCHAR *pathW = NULL; HRESULT hr; - TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon); + TRACE("(%p)->(path=%s icon=%u)\n", This, debugstr_a(path), icon); - pathW = heap_strdupAtoW(pszIconPath); - if (!pathW) return E_OUTOFMEMORY; + if (path) + { + pathW = heap_strdupAtoW(path); + if (!pathW) + return E_OUTOFMEMORY; + } - hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, pathW, iIcon); + hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, path ? pathW : NULL, icon); heap_free(pathW); return hr; @@ -1927,19 +1930,24 @@ static HRESULT WINAPI IShellLinkW_fnGetIconLocation(IShellLinkW * iface, LPWSTR return S_OK; } -static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, LPCWSTR pszIconPath,INT iIcon) +static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, const WCHAR *path, INT icon) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(path=%s iicon=%u)\n",This, debugstr_w(pszIconPath), iIcon); + TRACE("(%p)->(path=%s icon=%u)\n", This, debugstr_w(path), icon); heap_free(This->sIcoPath); - This->sIcoPath = heap_alloc((lstrlenW( pszIconPath )+1)*sizeof (WCHAR) ); - if ( !This->sIcoPath ) - return E_OUTOFMEMORY; - lstrcpyW( This->sIcoPath, pszIconPath ); - - This->iIcoNdx = iIcon; + if (path) + { + size_t len = (strlenW(path) + 1) * sizeof(WCHAR); + This->sIcoPath = heap_alloc(len); + if (!This->sIcoPath) + return E_OUTOFMEMORY; + memcpy(This->sIcoPath, path, len); + } + else + This->sIcoPath = NULL; + This->iIcoNdx = icon; This->bDirty = TRUE; return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 65e9a6dd55..3bfd9cbe38 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -973,6 +973,7 @@ static void test_shdefextracticon(void) static void test_GetIconLocation(void) { + IShellLinkW *slW; IShellLinkA *sl; const char *str; char buffer[INFOTIPSIZE], mypath[MAX_PATH]; @@ -1026,8 +1027,34 @@ static void test_GetIconLocation(void) r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); ok(lstrcmpiA(buffer,str) == 0, "GetIconLocation returned '%s'\n", buffer); - ok(i == 0xbabecafe, "GetIconLocation returned %d'\n", i); + ok(i == 0xbabecafe, "GetIconLocation returned %#x.\n", i); + r = IShellLinkA_SetIconLocation(sl, NULL, 0xcafefe); + ok(r == S_OK, "SetIconLocation failed (0x%08x)\n", r); + + i = 0xdeadbeef; + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(!*buffer, "GetIconLocation returned '%s'\n", buffer); + ok(i == 0xcafefe, "GetIconLocation returned %#x.\n", i); + + r = IShellLinkA_QueryInterface(sl, &IID_IShellLinkW, (void **)&slW); + ok(SUCCEEDED(r), "Failed to get IShellLinkW, hr %#x.\n", r); + + str = "c:\\nonexistent\\file"; + r = IShellLinkA_SetIconLocation(sl, str, 0xbabecafe); + ok(r == S_OK, "SetIconLocation failed (0x%08x)\n", r); + + r = IShellLinkA_SetIconLocation(sl, NULL, 0xcafefe); + ok(r == S_OK, "SetIconLocation failed (0x%08x)\n", r); + + i = 0xdeadbeef; + r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); + ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); + ok(!*buffer, "GetIconLocation returned '%s'\n", buffer); + ok(i == 0xcafefe, "GetIconLocation returned %#x.\n", i); + + IShellLinkW_Release(slW); IShellLinkA_Release(sl); } -- 2.19.0

1 0

[PATCH v2 1/8] ntdll/tests: Set requestedExecutionLevel to asInvoker to prevent filesystem virtualization.
by Zebediah Figura 30 Sep '18

30 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes the test failure reported here: https://www.winehq.org/pipermail/wine-devel/2018-September/132962.html Unlike previous uses of this facility, the goal here is to prevent filesystem virtualization. For whatever reason, on the w8 test machine, the contents of the virtualized WindowsUpdate.log differ from the contents of the real file. NtQueryDirectoryFile() retrieves the size of the latter, but NtOpenFile() opens the former. dlls/ntdll/tests/Makefile.in | 3 +++ dlls/ntdll/tests/ntdll.manifest | 18 ++++++++++++++++++ dlls/ntdll/tests/ntdll.rc | 22 ++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 dlls/ntdll/tests/ntdll.manifest create mode 100644 dlls/ntdll/tests/ntdll.rc diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f..c088b7b 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -23,3 +23,6 @@ C_SRCS = \ string.c \ threadpool.c \ time.c + +RC_SRCS = \ + ntdll.rc diff --git a/dlls/ntdll/tests/ntdll.manifest b/dlls/ntdll/tests/ntdll.manifest new file mode 100644 index 0000000..1747ea8 --- /dev/null +++ b/dlls/ntdll/tests/ntdll.manifest @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.ntdll.Test" + version="1.0.0.0" + processorArchitecture="*" + /> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/dlls/ntdll/tests/ntdll.rc b/dlls/ntdll/tests/ntdll.rc new file mode 100644 index 0000000..74d5073 --- /dev/null +++ b/dlls/ntdll/tests/ntdll.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winuser.h" + +/* @makedep: ntdll.manifest */ +1 RT_MANIFEST ntdll.manifest -- 2.7.4

4 14

[PATCH] wincodecs: Add IWICImagingFactory2 stub.
by Nikolay Sivov 30 Sep '18

30 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45709 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/imgfactory.c | 239 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/info.c | 33 +++++ 3 files changed, 273 insertions(+) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 77eeedc428..2e8cc8e22d 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -44,6 +44,7 @@ typedef struct { static const classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ComponentFactory_CreateInstance}, + {&CLSID_WICImagingFactory2, ComponentFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 06e3f6aceb..f23c824473 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICComponentFactory IWICComponentFactory_iface; + IWICImagingFactory2 IWICImagingFactory2_iface; LONG ref; } ComponentFactory; @@ -45,6 +46,11 @@ static inline ComponentFactory *impl_from_IWICComponentFactory(IWICComponentFact return CONTAINING_RECORD(iface, ComponentFactory, IWICComponentFactory_iface); } +static inline ComponentFactory *impl_from_IWICImagingFactory2(IWICImagingFactory2 *iface) +{ + return CONTAINING_RECORD(iface, ComponentFactory, IWICImagingFactory2_iface); +} + static HRESULT WINAPI ComponentFactory_QueryInterface(IWICComponentFactory *iface, REFIID iid, void **ppv) { @@ -59,6 +65,10 @@ static HRESULT WINAPI ComponentFactory_QueryInterface(IWICComponentFactory *ifac { *ppv = &This->IWICComponentFactory_iface; } + else if (IsEqualIID(&IID_IWICImagingFactory2, iid)) + { + *ppv = &This->IWICImagingFactory2_iface; + } else { *ppv = NULL; @@ -1181,6 +1191,234 @@ static const IWICComponentFactoryVtbl ComponentFactory_Vtbl = { ComponentFactory_CreateEncoderPropertyBag }; +static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory2 *iface, REFIID iid, void **ppv) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_QueryInterface(&This->IWICComponentFactory_iface, iid, ppv); +} + +static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_AddRef(&This->IWICComponentFactory_iface); +} + +static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_Release(&This->IWICComponentFactory_iface); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename(IWICImagingFactory2 *iface, LPCWSTR filename, + const GUID *vendor, DWORD desired_access, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromFilename(&This->IWICComponentFactory_iface, filename, vendor, + desired_access, options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(IWICImagingFactory2 *iface, IStream *stream, + const GUID *vendor, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromStream(&This->IWICComponentFactory_iface, stream, vendor, + options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle(IWICImagingFactory2 *iface, ULONG_PTR hFile, + const GUID *vendor, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromFileHandle(&This->IWICComponentFactory_iface, hFile, vendor, + options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateComponentInfo(IWICImagingFactory2 *iface, REFCLSID component, + IWICComponentInfo **info) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateComponentInfo(&This->IWICComponentFactory_iface, component, info); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoder(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoder(&This->IWICComponentFactory_iface, format, vendor, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateEncoder(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICBitmapEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateEncoder(&This->IWICComponentFactory_iface, format, vendor, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory2 *iface, IWICPalette **palette) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreatePalette(&This->IWICComponentFactory_iface, palette); +} + +static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory2 *iface, IWICFormatConverter **converter) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFormatConverter(&This->IWICComponentFactory_iface, converter); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapScaler(IWICImagingFactory2 *iface, IWICBitmapScaler **scaler) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapScaler(&This->IWICComponentFactory_iface, scaler); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapClipper(IWICImagingFactory2 *iface, IWICBitmapClipper **clipper) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapClipper(&This->IWICComponentFactory_iface, clipper); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFlipRotator(IWICImagingFactory2 *iface, IWICBitmapFlipRotator **fliprotator) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFlipRotator(&This->IWICComponentFactory_iface, fliprotator); +} + +static HRESULT WINAPI ImagingFactory_CreateStream(IWICImagingFactory2 *iface, IWICStream **stream) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateStream(&This->IWICComponentFactory_iface, stream); +} + +static HRESULT WINAPI ImagingFactory_CreateColorContext(IWICImagingFactory2 *iface, IWICColorContext **context) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateColorContext(&This->IWICComponentFactory_iface, context); +} + +static HRESULT WINAPI ImagingFactory_CreateColorTransformer(IWICImagingFactory2 *iface, IWICColorTransform **transformer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateColorTransformer(&This->IWICComponentFactory_iface, transformer); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmap(IWICImagingFactory2 *iface, UINT width, UINT height, REFWICPixelFormatGUID pixel_format, + WICBitmapCreateCacheOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmap(&This->IWICComponentFactory_iface, width, height, pixel_format, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, IWICBitmapSource *source, + WICBitmapCreateCacheOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromSource(&This->IWICComponentFactory_iface, source, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSourceRect(IWICImagingFactory2 *iface, IWICBitmapSource *source, + UINT x, UINT y, UINT width, UINT height, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromSourceRect(&This->IWICComponentFactory_iface, source, x, y, width, height, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromMemory(IWICImagingFactory2 *iface, UINT width, UINT height, + REFWICPixelFormatGUID format, UINT stride, UINT size, BYTE *buffer, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromMemory(&This->IWICComponentFactory_iface, width, height, format, stride, + size, buffer, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromHBITMAP(IWICImagingFactory2 *iface, HBITMAP hbm, HPALETTE hpal, + WICBitmapAlphaChannelOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromHBITMAP(&This->IWICComponentFactory_iface, hbm, hpal, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromHICON(IWICImagingFactory2 *iface, HICON hicon, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromHICON(&This->IWICComponentFactory_iface, hicon, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface, DWORD component_types, + DWORD options, IEnumUnknown **enumerator) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateComponentEnumerator(&This->IWICComponentFactory_iface, component_types, + options, enumerator); +} + +static HRESULT WINAPI ImagingFactory_CreateFastMetadataEncoderFromDecoder(IWICImagingFactory2 *iface, IWICBitmapDecoder *decoder, + IWICFastMetadataEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFastMetadataEncoderFromDecoder(&This->IWICComponentFactory_iface, decoder, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreateFastMetadataEncoderFromFrameDecode(IWICImagingFactory2 *iface, + IWICBitmapFrameDecode *frame_decode, IWICFastMetadataEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFastMetadataEncoderFromFrameDecode(&This->IWICComponentFactory_iface, frame_decode, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreateQueryWriter(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICMetadataQueryWriter **writer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateQueryWriter(&This->IWICComponentFactory_iface, format, vendor, writer); +} + +static HRESULT WINAPI ImagingFactory_CreateQueryWriterFromReader(IWICImagingFactory2 *iface, IWICMetadataQueryReader *reader, + const GUID *vendor, IWICMetadataQueryWriter **writer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateQueryWriterFromReader(&This->IWICComponentFactory_iface, reader, vendor, writer); +} + +static HRESULT WINAPI ImagingFactory_CreateImageEncoder(IWICImagingFactory2 *iface, ID2D1Device *device, IWICImageEncoder **encoder) +{ + FIXME("%p,%p,%p stub.\n", iface, device, encoder); + + return E_NOTIMPL; +} + +static const IWICImagingFactory2Vtbl ImagingFactory_Vtbl = { + ImagingFactory_QueryInterface, + ImagingFactory_AddRef, + ImagingFactory_Release, + ImagingFactory_CreateDecoderFromFilename, + ImagingFactory_CreateDecoderFromStream, + ImagingFactory_CreateDecoderFromFileHandle, + ImagingFactory_CreateComponentInfo, + ImagingFactory_CreateDecoder, + ImagingFactory_CreateEncoder, + ImagingFactory_CreatePalette, + ImagingFactory_CreateFormatConverter, + ImagingFactory_CreateBitmapScaler, + ImagingFactory_CreateBitmapClipper, + ImagingFactory_CreateBitmapFlipRotator, + ImagingFactory_CreateStream, + ImagingFactory_CreateColorContext, + ImagingFactory_CreateColorTransformer, + ImagingFactory_CreateBitmap, + ImagingFactory_CreateBitmapFromSource, + ImagingFactory_CreateBitmapFromSourceRect, + ImagingFactory_CreateBitmapFromMemory, + ImagingFactory_CreateBitmapFromHBITMAP, + ImagingFactory_CreateBitmapFromHICON, + ImagingFactory_CreateComponentEnumerator, + ImagingFactory_CreateFastMetadataEncoderFromDecoder, + ImagingFactory_CreateFastMetadataEncoderFromFrameDecode, + ImagingFactory_CreateQueryWriter, + ImagingFactory_CreateQueryWriterFromReader, + ImagingFactory_CreateImageEncoder, +}; + HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) { ComponentFactory *This; @@ -1194,6 +1432,7 @@ HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->IWICComponentFactory_iface.lpVtbl = &ComponentFactory_Vtbl; + This->IWICImagingFactory2_iface.lpVtbl = &ImagingFactory_Vtbl; This->ref = 1; ret = IWICComponentFactory_QueryInterface(&This->IWICComponentFactory_iface, iid, ppv); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index b647601495..ee95784166 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -637,6 +637,38 @@ todo_wine IWICImagingFactory_Release(factory); } +static void test_imagingfactory_interfaces(void) +{ + IWICComponentFactory *component_factory; + IWICImagingFactory2 *factory2; + IWICImagingFactory *factory; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory2, (void **)&factory2); + if (FAILED(hr)) + { + win_skip("IWICImagingFactory2 is not supported.\n"); + return; + } + + hr = IWICImagingFactory2_QueryInterface(factory2, &IID_IWICComponentFactory, (void **)&component_factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWICComponentFactory_QueryInterface(component_factory, &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(factory == (IWICImagingFactory *)component_factory, "Unexpected factory pointer.\n"); + IWICImagingFactory_Release(factory); + + hr = IWICImagingFactory2_QueryInterface(factory2, &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(factory == (IWICImagingFactory *)component_factory, "Unexpected factory pointer.\n"); + + IWICComponentFactory_Release(component_factory); + IWICImagingFactory2_Release(factory2); + IWICImagingFactory_Release(factory); +} + START_TEST(info) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -644,6 +676,7 @@ START_TEST(info) test_decoder_info(); test_reader_info(); test_pixelformat_info(); + test_imagingfactory_interfaces(); CoUninitialize(); } -- 2.19.0

2 5