September 2019 - Wine-Devel

[PATCH 3/5] wined3d: Use explicit flushing in wined3d_context_gl_unmap_bo_address().
by Henri Verbeet Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/context.c | 25 +++++++++++++++++++------ dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 19 ++++++++++++++----- dlls/wined3d/texture.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 26 ++++++++++++++------------ 7 files changed, 65 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5ffa6fdff6f..736190a2730 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4599,8 +4599,8 @@ static void *adapter_gl_map_bo_address(struct wined3d_context *context, return wined3d_context_gl_map_bo_address(context_gl, data, size, binding, map_flags); } -static void adapter_gl_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags) +static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, + uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges) { struct wined3d_context_gl *context_gl; GLenum binding; @@ -4608,7 +4608,7 @@ static void adapter_gl_unmap_bo_address(struct wined3d_context *context, context_gl = wined3d_context_gl(context); binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - wined3d_context_gl_unmap_bo_address(context_gl, data, binding); + wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); } static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3480cf80d91..91a81b47e63 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -483,8 +483,8 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, return data->addr; } -static void adapter_vk_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags) +static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, + uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges) { if (data->buffer_object) ERR("Unsupported buffer object %#lx.\n", data->buffer_object); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 672efa7aef2..75734e23a0d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2610,8 +2610,8 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - GLbitfield map_flags = wined3d_resource_gl_map_flags(flags) & ~GL_MAP_FLUSH_EXPLICIT_BIT; - memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, size, map_flags)); + memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, + size, wined3d_resource_gl_map_flags(flags))); } else { @@ -2625,16 +2625,26 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, GLenum binding) +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, + GLenum binding, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info; + unsigned int i; if (!data->buffer_object) return; gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRange(binding, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + } + } + GL_EXTCALL(glUnmapBuffer(binding)); wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Unmap buffer object"); @@ -2645,6 +2655,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { const struct wined3d_gl_info *gl_info; + struct wined3d_map_range range; BYTE *dst_ptr, *src_ptr; gl_info = context_gl->gl_info; @@ -2666,8 +2677,10 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, memcpy(dst_ptr, src_ptr, size); - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding); + range.offset = 0; + range.size = size; + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding, 1, &range); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding, 0, NULL); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 27898b8a112..2c3d2787bc8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2365,8 +2365,8 @@ static void *adapter_no3d_map_bo_address(struct wined3d_context *context, return data->addr; } -static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags) +static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, + uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges) { if (data->buffer_object) ERR("Unsupported buffer object %#lx.\n", data->buffer_object); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ded5b53c852..b07d3cd77ea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -648,6 +648,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr { unsigned int dst_row_pitch, dst_slice_pitch; struct wined3d_bo_address dst_data; + struct wined3d_map_range range; const BYTE *src; BYTE *dst; @@ -664,9 +665,11 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); + range.offset = 0; + range.size = dst_texture->sub_resources[0].size; wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - wined3d_context_unmap_bo_address(context, &dst_data, 0); - wined3d_context_unmap_bo_address(context, &src_data, 0); + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &range); + wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); } else { @@ -1634,6 +1637,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int unsigned int src_fmt_flags, dst_fmt_flags; struct wined3d_map_desc dst_map, src_map; unsigned int x, sx, xinc, y, sy, yinc; + struct wined3d_map_range dst_range; struct wined3d_context *context; unsigned int texture_level; HRESULT hr = WINED3D_OK; @@ -1650,6 +1654,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int context = context_acquire(device, NULL, 0); + dst_range.offset = 0; + dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) { same_sub_resource = TRUE; @@ -2083,9 +2089,9 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_context_unmap_bo_address(context, &dst_data, 0); + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); if (!same_sub_resource) - wined3d_context_unmap_bo_address(context, &src_data, 0); + wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -2107,6 +2113,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; + struct wined3d_map_range range; struct wined3d_map_desc map; DWORD map_binding; uint8_t *dst; @@ -2161,6 +2168,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, + (box->front * map.slice_pitch) + ((box->top / view->format->block_height) * map.row_pitch) + ((box->left / view->format->block_width) * view->format->block_byte_count); + range.offset = 0; + range.size = texture->sub_resources[view->sub_resource_idx].size; switch (bpp) { @@ -2216,7 +2225,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(dst, map.data, w * h * bpp); } - wined3d_context_unmap_bo_address(context, &data, 0); + wined3d_context_unmap_bo_address(context, &data, 0, 1, &range); context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7bb0dd0a10d..ff25f64043d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -789,6 +789,7 @@ static void wined3d_texture_destroy_dc(void *object) struct wined3d_texture *texture; struct wined3d_dc_info *dc_info; struct wined3d_bo_address data; + struct wined3d_map_range range; unsigned int sub_resource_idx; struct wined3d_device *device; NTSTATUS status; @@ -817,7 +818,9 @@ static void wined3d_texture_destroy_dc(void *object) if (data.buffer_object) { context = context_acquire(device, NULL, 0); - wined3d_context_unmap_bo_address(context, &data, 0); + range.offset = 0; + range.size = texture->sub_resources[sub_resource_idx].size; + wined3d_context_unmap_bo_address(context, &data, 0, 1, &range); context_release(context); } } @@ -1964,7 +1967,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, else src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); bo.buffer_object = 0; bo.addr = converted_mem; @@ -2701,7 +2704,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g width, height, &texture_gl->t.async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER, 0, NULL); data.buffer_object = 0; data.addr = dst_mem; @@ -2962,6 +2965,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_context_map_bo_address(context, &data, sub_resource->size, 0, flags); + sub_resource->map_flags = flags; TRACE("Base memory pointer %p.\n", base_memory); context_release(context); @@ -3027,6 +3031,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; + struct wined3d_map_range range; TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); @@ -3045,7 +3050,9 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso context = context_acquire(device, NULL, 0); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - wined3d_context_unmap_bo_address(context, &data, 0); + range.offset = 0; + range.size = sub_resource->size; + wined3d_context_unmap_bo_address(context, &data, 0, !!(sub_resource->map_flags & WINED3D_MAP_WRITE), &range); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3dc54696812..866f9af87b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1899,6 +1899,12 @@ struct wined3d_gl_view GLuint name; }; +struct wined3d_map_range +{ + unsigned int offset; + unsigned int size; +}; + struct wined3d_rendertarget_info { struct wined3d_gl_view gl_view; @@ -2150,8 +2156,8 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, + GLenum binding, unsigned int range_count, const struct wined3d_map_range *ranges) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2813,8 +2819,8 @@ struct wined3d_adapter_ops void (*adapter_uninit_3d)(struct wined3d_device *device); void *(*adapter_map_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); - void (*adapter_unmap_bo_address)(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags); + void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, + uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -3595,6 +3601,7 @@ struct wined3d_texture unsigned int size; unsigned int map_count; + uint32_t map_flags; DWORD locations; GLuint buffer_object; } *sub_resources; @@ -4150,12 +4157,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_map_range -{ - UINT offset; - UINT size; -}; - struct wined3d_buffer_ops { BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, @@ -5258,9 +5259,10 @@ static inline void *wined3d_context_map_bo_address(struct wined3d_context *conte } static inline void wined3d_context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags) + const struct wined3d_bo_address *data, uint32_t bind_flags, + unsigned int range_count, const struct wined3d_map_range *ranges) { - context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags); + context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges); } /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Derive the GL bind point for buffer object maps from the bind flags.
by Henri Verbeet Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 20 ++++++++++++++++---- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 8 +++++--- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 23 +++++++++++------------ dlls/wined3d/texture.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 14 ++++++++------ 7 files changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0415099439c..5ffa6fdff6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4588,15 +4588,27 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) } static void *adapter_gl_map_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, size_t size, GLenum binding, uint32_t flags) + const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - return wined3d_context_gl_map_bo_address(wined3d_context_gl(context), data, size, binding, flags); + struct wined3d_context_gl *context_gl; + GLenum binding; + + context_gl = wined3d_context_gl(context); + binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); + + return wined3d_context_gl_map_bo_address(context_gl, data, size, binding, map_flags); } static void adapter_gl_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) + const struct wined3d_bo_address *data, uint32_t bind_flags) { - return wined3d_context_gl_unmap_bo_address(wined3d_context_gl(context), data, binding); + struct wined3d_context_gl *context_gl; + GLenum binding; + + context_gl = wined3d_context_gl(context); + binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); + + wined3d_context_gl_unmap_bo_address(context_gl, data, binding); } static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ef2734f0551..3480cf80d91 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -472,7 +472,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) } static void *adapter_vk_map_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, size_t size, GLenum binding, uint32_t flags) + const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { if (data->buffer_object) { @@ -484,7 +484,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, } static void adapter_vk_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) + const struct wined3d_bo_address *data, uint32_t bind_flags) { if (data->buffer_object) ERR("Unsupported buffer object %#lx.\n", data->buffer_object); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8d72b782dfa..c7be6510993 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1288,9 +1288,11 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; -static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_info, - unsigned int bind_flags) +GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) { + if (!bind_flags) + return GL_PIXEL_UNPACK_BUFFER; + if (bind_flags == WINED3D_BIND_INDEX_BUFFER) return GL_ELEMENT_ARRAY_BUFFER; @@ -1536,7 +1538,7 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined TRACE("buffer_gl %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_gl, device, desc, data, parent, parent_ops); - buffer_gl->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + buffer_gl->buffer_type_hint = wined3d_buffer_gl_binding_from_bind_flags(gl_info, desc->bind_flags); return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cb83ee884c..27898b8a112 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2354,7 +2354,7 @@ static void adapter_no3d_uninit_3d(struct wined3d_device *device) } static void *adapter_no3d_map_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, size_t size, GLenum binding, uint32_t flags) + const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { if (data->buffer_object) { @@ -2366,7 +2366,7 @@ static void *adapter_no3d_map_bo_address(struct wined3d_context *context, } static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) + const struct wined3d_bo_address *data, uint32_t bind_flags) { if (data->buffer_object) ERR("Unsupported buffer object %#lx.\n", data->buffer_object); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4a3ecf9863a..ded5b53c852 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -658,15 +658,15 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_get_memory(dst_texture, 0, &dst_data, map_binding); src = wined3d_context_map_bo_address(context, &src_data, - src_texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_texture->sub_resources[sub_resource_idx].size, 0, WINED3D_MAP_READ); dst = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[0].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); + dst_texture->sub_resources[0].size, 0, WINED3D_MAP_WRITE); conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - wined3d_context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); - wined3d_context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &dst_data, 0); + wined3d_context_unmap_bo_address(context, &src_data, 0); } else { @@ -1662,8 +1662,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); + dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_READ | WINED3D_MAP_WRITE); src_map = dst_map; src_format = dst_texture->resource.format; @@ -1698,7 +1697,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(src_texture, texture_level, &src_map.row_pitch, &src_map.slice_pitch); wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &src_data, map_binding); src_map.data = wined3d_context_map_bo_address(context, &src_data, - src_texture->sub_resources[src_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_texture->sub_resources[src_sub_resource_idx].size, 0, WINED3D_MAP_READ); map_binding = dst_texture->resource.map_binding; texture_level = dst_sub_resource_idx % dst_texture->level_count; @@ -1708,7 +1707,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); + dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); } flags &= ~WINED3D_BLT_RAW; @@ -2084,9 +2083,9 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &dst_data, 0); if (!same_sub_resource) - wined3d_context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &src_data, 0); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -2157,7 +2156,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, wined3d_texture_get_pitch(texture, level, &map.row_pitch, &map.slice_pitch); wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); map.data = wined3d_context_map_bo_address(context, &data, - texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); + texture->sub_resources[view->sub_resource_idx].size, 0, WINED3D_MAP_WRITE); map.data = (BYTE *)map.data + (box->front * map.slice_pitch) + ((box->top / view->format->block_height) * map.row_pitch) @@ -2217,7 +2216,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(dst, map.data, w * h * bpp); } - wined3d_context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &data, 0); context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 380aff5016f..7bb0dd0a10d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -749,8 +749,7 @@ static void wined3d_texture_create_dc(void *object) if (!context) context = context_acquire(device, NULL, 0); desc.pMemory = wined3d_context_map_bo_address(context, &data, - texture->sub_resources[sub_resource_idx].size, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); + texture->sub_resources[sub_resource_idx].size, 0, WINED3D_MAP_READ | WINED3D_MAP_WRITE); } else { @@ -818,7 +817,7 @@ static void wined3d_texture_destroy_dc(void *object) if (data.buffer_object) { context = context_acquire(device, NULL, 0); - wined3d_context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &data, 0); context_release(context); } } @@ -2962,8 +2961,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); - base_memory = wined3d_context_map_bo_address(context, &data, - sub_resource->size, GL_PIXEL_UNPACK_BUFFER, flags); + base_memory = wined3d_context_map_bo_address(context, &data, sub_resource->size, 0, flags); TRACE("Base memory pointer %p.\n", base_memory); context_release(context); @@ -3047,7 +3045,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso context = context_acquire(device, NULL, 0); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - wined3d_context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_unmap_bo_address(context, &data, 0); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 58977f8cd12..3dc54696812 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2812,9 +2812,9 @@ struct wined3d_adapter_ops HRESULT (*adapter_init_3d)(struct wined3d_device *device); void (*adapter_uninit_3d)(struct wined3d_device *device); void *(*adapter_map_bo_address)(struct wined3d_context *context, - const struct wined3d_bo_address *data, size_t size, GLenum binding, uint32_t flags); + const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); void (*adapter_unmap_bo_address)(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding); + const struct wined3d_bo_address *data, uint32_t bind_flags); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -4225,6 +4225,8 @@ static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } +GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, + uint32_t bind_flags) DECLSPEC_HIDDEN; void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, @@ -5250,15 +5252,15 @@ static inline float wined3d_get_float_state(const struct wined3d_state *state, e } static inline void *wined3d_context_map_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, size_t size, GLenum binding, uint32_t flags) + const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - return context->device->adapter->adapter_ops->adapter_map_bo_address(context, data, size, binding, flags); + return context->device->adapter->adapter_ops->adapter_map_bo_address(context, data, size, bind_flags, map_flags); } static inline void wined3d_context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) + const struct wined3d_bo_address *data, uint32_t bind_flags) { - return context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, binding); + context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags); } /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ -- 2.11.0

1 0

[PATCH 1/5] wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map().
by Henri Verbeet Sept. 23, 2019

Sept. 23, 2019

For consistency with the ARB_map_buffer_range path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d3fcdd41fe1..8d72b782dfa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1045,7 +1045,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - GL_READ_WRITE)); + wined3d_resource_gl_legacy_map_flags(flags))); checkGLcall("glMapBuffer"); } -- 2.11.0

1 0

[PATCH 2/2] winex11.drv: Support clipping on the second monitor.
by Zhiyi Zhang Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 15e5c04a41..20a25bd1bc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -562,12 +562,12 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; fullscreen = is_window_rect_fullscreen( &data->whole_rect ); + rect = data->whole_rect; release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ - rect = get_primary_monitor_rect(); if (!grab_fullscreen) { RECT virtual_rect = get_virtual_screen_rect(); -- 2.20.1

1 0

[PATCH 1/2] winex11.drv: Support multiple monitors for is_window_rect_fullscreen().
by Zhiyi Zhang Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 8 +------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..0fc3ce9246 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -275,6 +275,35 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl return is_window_rect_fullscreen( &data->whole_rect ); } +struct fullscreen_info +{ + const RECT *rect; + BOOL fullscreen; +}; + +static BOOL CALLBACK enum_monitor_proc( HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam ) +{ + struct fullscreen_info *fullscreen_info = (struct fullscreen_info *)lparam; + + if (fullscreen_info->rect->left <= rect->left && + fullscreen_info->rect->right >= rect->right && + fullscreen_info->rect->top <= rect->top && + fullscreen_info->rect->bottom >= rect->bottom) + { + fullscreen_info->fullscreen = TRUE; + return FALSE; + } + + return TRUE; +} + +BOOL is_window_rect_fullscreen( const RECT *rect ) +{ + struct fullscreen_info info = {rect, FALSE}; + + EnumDisplayMonitors( NULL, NULL, enum_monitor_proc, (LPARAM)&info ); + return info.fullscreen; +} /*********************************************************************** * get_mwm_decorations diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e71156cbb0..da08c6f62c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -637,6 +637,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; +extern BOOL is_window_rect_fullscreen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; @@ -764,11 +765,4 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } -static inline BOOL is_window_rect_fullscreen( const RECT *rect ) -{ - RECT primary_rect = get_primary_monitor_rect(); - return (rect->left <= primary_rect.left && rect->right >= primary_rect.right && - rect->top <= primary_rect.top && rect->bottom >= primary_rect.bottom); -} - #endif /* __WINE_X11DRV_H */ -- 2.20.1

1 0

[PATCH] winex11.drv: Handle FocusIn/NotifyGrab and FocusOut/NotifyUngrab events.
by Rémi Bernon Sept. 23, 2019

Sept. 23, 2019

These events are received on mutter, when moving undecorated managed windows, although Wine never grabs the keyboard itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c2323..25730192d3d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -778,8 +778,9 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyGrab: - WARN( "unexpected FocusIn event with NotifyGrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = TRUE; + return FALSE; case NotifyWhileGrabbed: keyboard_grabbed = TRUE; break; @@ -879,8 +880,9 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyUngrab: - WARN( "unexpected FocusOut event with NotifyUngrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = FALSE; + return FALSE; case NotifyNormal: keyboard_grabbed = FALSE; break; -- 2.23.0

1 0

[PATCH] kernel32: Make GetFinalPathNameByHandle warn on mounted folder.
by Jeff Smith Sept. 23, 2019

Sept. 23, 2019

GetFinalPathNameByHandle attempts to translate a volume mount point to an NT volume name using QueryDosDevice, but this can only succeed if the mount point is a drive letter. When GetVolumeNameForVolumeMountPoint encounters a similiar situation, it emits a fixme message. When attempting to translate a volume mount point to an NT volume name with GetFinalPathNameByHandle, for a mount point that is not a drive letter, emit a fixme message. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/kernel32/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2b6a13fc0d..2d52b0a165 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1442,6 +1442,14 @@ DWORD WINAPI GetFinalPathNameByHandleW(HANDLE file, LPWSTR path, DWORD charcount { WCHAR nt_prefix[MAX_PATH]; + /* if length of drive_part is > 3 then it must be a mounted folder */ + if (drive_part_len > 3) + { + FIXME("Mounted Folders are not yet supported\n"); + SetLastError( ERROR_NOT_A_REPARSE_POINT ); + return 0; + } + /* QueryDosDeviceW sets error code on failure */ drive_part[drive_part_len - 1] = 0; if (!QueryDosDeviceW( drive_part, nt_prefix, MAX_PATH )) -- 2.21.0

3 2

[PATCH] kernel32/tests: Fix the spelling of three ok() messages and comments.
by Francois Gouget Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/comm.c | 2 +- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/path.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97a71358fef..97da932d6cb 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -725,7 +725,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) ok(ret, "Unexpected error %u on open\n", GetLastError()); ok(comstat.cbInQue == 0, "Unexpected %d chars in InQueue\n",comstat.cbInQue); - ok(comstat.cbOutQue == 0, "Still pending %d charcters in OutQueue\n", comstat.cbOutQue); + ok(comstat.cbOutQue == 0, "Still pending %d characters in OutQueue\n", comstat.cbOutQue); ok(errors == 0, "Unexpected errors 0x%08x\n", errors); } return hcom; diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 93d12a56ebb..8148c396d0e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -170,7 +170,7 @@ static void run_background_thread(void) { DWORD tid; HANDLE thread = CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); - ok(thread != NULL, "CreateThrad failed\n"); + ok(thread != NULL, "CreateThread failed\n"); CloseHandle(thread); } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9be4ecd1362..5bd168276f9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5229,7 +5229,7 @@ static void test_overlapped_read(void) DWORD ret; ret = GetTempPathA(MAX_PATH, temp_path); - ok(ret, "Unexpect error %u.\n", GetLastError()); + ok(ret, "Unexpected error %u.\n", GetLastError()); ret = GetTempFileNameA(temp_path, prefix, 0, file_name); ok(ret, "Unexpected error %u.\n", GetLastError()); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 60cd26dd603..028853f6050 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -309,7 +309,7 @@ static void test_setdir(CHAR *olddir,CHAR *newdir, ok(SetCurrentDirectoryA(olddir), "%s: Couldn't set directory to its original value\n",errstr); } else { -/* else thest that it fails correctly */ +/* else test that it fails correctly */ chklen=lstrlenA(olddir); ok(val==0, "%s: SetCurrentDirectoryA passed when it should have failed\n",errstr); @@ -517,7 +517,7 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) /* Check that SetCurrentDirectory fails when a nonexistent dir is specified */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_SHORT); test_setdir(newdir,tmpstr,NULL,0,"check 3"); -/* Check that SetCurrentDirectory fails for a nonexistent lond directory */ +/* Check that SetCurrentDirectory fails for a nonexistent long directory */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_LONG); test_setdir(newdir,tmpstr,NULL,0,"check 4"); /* Check that SetCurrentDirectory passes with a long directory */ diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 11605c2ecef..f61d441303d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3071,7 +3071,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(writer, &write_overlapped2, 1, FALSE); test_peek_pipe(reader, 0, 0, 0); - /* same as above, but parially read written data before canceling */ + /* same as above, but partially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), -- 2.20.1

2 1

[PATCH 0/4] GetSystemPowerStatus tests and Linux implementation
by Alex Henrie Sept. 23, 2019

Sept. 23, 2019

This patch series is intended to replace Derek Lesho's patch because I don't think that it's right to treat "no battery information" the same as "no battery". The latest Windows SDK calls the fourth member of SYSTEM_POWER_STATUS SystemStatusFlag instead of Reserved1 and also defines a bunch of constants for setting flags in SYSTEM_POWER_STATUS. I ran down my laptop battery to verify that the thresholds for setting the high, low, and critical flags are correct. -Alex Alex Henrie (4): include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS include: Add constants needed for SYSTEM_POWER_STATUS kernel32/tests: Add tests for GetSystemPowerStatus kernel32: Implement GetSystemPowerStatus on Linux dlls/kernel32/powermgnt.c | 72 ++++++++++++++++++++++++++++----- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/generated.c | 12 +++--- dlls/kernel32/tests/power.c | 65 +++++++++++++++++++++++++++++ include/winbase.h | 20 ++++++++- 5 files changed, 153 insertions(+), 17 deletions(-) create mode 100644 dlls/kernel32/tests/power.c -- 2.23.0

3 8

[PATCH v2 3/4] kernel32/tests: Add tests for GetSystemPowerStatus
by Alex Henrie Sept. 22, 2019

Sept. 22, 2019

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Add newline to error message --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/power.c | 65 +++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 dlls/kernel32/tests/power.c diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..e9516603ce 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -25,6 +25,7 @@ SOURCES = \ module.c \ path.c \ pipe.c \ + power.c \ process.c \ profile.c \ resource.c \ diff --git a/dlls/kernel32/tests/power.c b/dlls/kernel32/tests/power.c new file mode 100644 index 0000000000..0a49956dc5 --- /dev/null +++ b/dlls/kernel32/tests/power.c @@ -0,0 +1,65 @@ +/* + * Unit tests for power management functions + * + * Copyright (c) 2019 Alex Henrie + * + * 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 "wine/test.h" + +void test_GetSystemPowerStatus(void) +{ + SYSTEM_POWER_STATUS ps; + BOOL ret; + BYTE capacity_flags, expected_capacity_flags; + + if (0) /* crashes */ + GetSystemPowerStatus(NULL); + + ret = GetSystemPowerStatus(&ps); + ok(ret == TRUE, "expected TRUE\n"); + + ok(ps.ACLineStatus <= AC_LINE_BACKUP_POWER || ps.ACLineStatus == AC_LINE_UNKNOWN, + "got unexpected ACLineStatus 0x%02x\n", ps.ACLineStatus); + + if (ps.BatteryFlag != BATTERY_FLAG_NO_BATTERY && ps.BatteryFlag != BATTERY_FLAG_UNKNOWN && + ps.BatteryLifePercent != BATTERY_PERCENTAGE_UNKNOWN) + { + expected_capacity_flags = 0; + if (ps.BatteryLifePercent > 66) + expected_capacity_flags |= BATTERY_FLAG_HIGH; + if (ps.BatteryLifePercent < 33) + expected_capacity_flags |= BATTERY_FLAG_LOW; + if (ps.BatteryLifePercent < 5) + expected_capacity_flags |= BATTERY_FLAG_CRITICAL; + capacity_flags = (ps.BatteryFlag & ~BATTERY_FLAG_CHARGING); + ok(capacity_flags == expected_capacity_flags, + "expected %d%%-charged battery to have capacity flags 0x%02x, got 0x%02x\n", + ps.BatteryLifePercent, expected_capacity_flags, capacity_flags); + } + else + { + skip("no battery charge information\n"); + } + + ok(ps.SystemStatusFlag <= SYSTEM_STATUS_FLAG_POWER_SAVING_ON, + "got unexpected SystemStatusFlag 0x%02x\n", ps.SystemStatusFlag); +} + +START_TEST(power) +{ + test_GetSystemPowerStatus(); +} -- 2.23.0

1 0