June 2020 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Clear WINED3DFMT_FLAG_DEPTH_STENCIL if the format is not supported as FBO attachment.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: c6f94cc87b95511cae2910b61585822acd7e7d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f94cc87b95511cae2910b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 16:37:29 2020 +0430 wined3d: Clear WINED3DFMT_FLAG_DEPTH_STENCIL if the format is not supported as FBO attachment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 7 ------- dlls/wined3d/utils.c | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f9a11ea2a..15e4a45ea5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -135,13 +135,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) - { - WARN("Render target or depth stencil is not FBO attachable.\n"); - continue; - } if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 55ee0ede33..d078c503df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2515,11 +2515,11 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { if (!rt_internal) { - if (format->f.flags[type] & WINED3DFMT_FLAG_RENDERTARGET) + if (format->f.flags[type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) { WARN("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," " and no fallback specified.\n", debug_d3dformat(format->f.id), type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } else { @@ -2552,7 +2552,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { WARN("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", debug_d3dformat(format->f.id), type_string, type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } } } @@ -2725,8 +2725,9 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { FIXME("Format %s needs different render target formats for different resource types.\n", debug_d3dformat(format->f.id)); - format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE - | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); + format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL + | WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB + | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); } }

1 0

Henri Verbeet : wined3d: Reference the back buffer in wined3d_swapchain_vk_blit().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 26e961b39a28128f2fc3ff6671db72c71f17f943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26e961b39a28128f2fc3ff66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 16:37:30 2020 +0430 wined3d: Reference the back buffer in wined3d_swapchain_vk_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3497a4d560..e034bdf624 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1026,6 +1026,7 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, swapchain_vk->vk_images[image_idx], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit, VK_FILTER_NEAREST)); + wined3d_context_vk_reference_texture(context_vk, back_buffer_vk); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, 0,

1 0

Henri Verbeet : wined3d: Partially implement adapter_vk_clear_uav().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 319ba87ab1b77194c9a4b40907da1a811613fca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=319ba87ab1b77194c9a4b409… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 16:37:31 2020 +0430 wined3d: Partially implement adapter_vk_clear_uav(). This is easy, and sufficient in a lot of cases. However, for a more complete implementation, we'll want to do something more similar to vkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 5 +++- dlls/wined3d/view.c | 63 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 586be3751a..1e4d663dcb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1765,7 +1765,10 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { - FIXME("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + + wined3d_unordered_access_view_vk_clear_uint(wined3d_unordered_access_view_vk(view), + clear_value, wined3d_context_vk(context)); } static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 28028a7639..a690bd4ae6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1478,6 +1478,69 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_vk_info *vk_info; + const struct wined3d_format *format; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_resource *resource; + VkCommandBuffer vk_command_buffer; + VkBufferMemoryBarrier vk_barrier; + VkAccessFlags access_mask; + unsigned int offset, size; + + TRACE("view_vk %p, clear_value %s, context_vk %p.\n", view_vk, debug_uvec4(clear_value), context_vk); + + resource = view_vk->v.resource; + if (resource->type != WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + format = view_vk->v.format; + if (format->id != WINED3DFMT_R32_UINT && format->id != WINED3DFMT_R32_SINT) + { + FIXME("Not implemented for format %s.\n", debug_d3dformat(format->id)); + return; + } + + vk_info = context_vk->vk_info; + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_buffer_load_location(&buffer_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(&buffer_vk->b, ~WINED3D_LOCATION_BUFFER); + + get_buffer_view_range(&buffer_vk->b, &view_vk->v.desc, format, &offset, &size); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + return; + wined3d_context_vk_end_current_render_pass(context_vk); + + access_mask = vk_access_mask_from_bind_flags(buffer_vk->b.resource.bind_flags); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = access_mask; + vk_barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = buffer_vk->bo.vk_buffer; + vk_barrier.offset = buffer_vk->bo.buffer_offset + offset; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + VK_CALL(vkCmdFillBuffer(vk_command_buffer, buffer_vk->bo.vk_buffer, + buffer_vk->bo.buffer_offset + offset, size, clear_value->x)); + + vk_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier.dstAccessMask = access_mask; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); +} + void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk, struct wined3d_context_vk *context_vk) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83e2566cca..17acd4be4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4993,6 +4993,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v); } +void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Huw Davies : bcrypt: Add stubs for DSS private key functions on macOS.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 8a43688b3dfe029527d581e83536bba7ec06f41b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a43688b3dfe029527d581e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 5 13:59:03 2020 +0100 bcrypt: Add stubs for DSS private key functions on macOS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/macos.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index f635ba4bc8..7f902535b8 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -240,12 +240,24 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_export_ecc( struct key *key, UCHAR *output, ULONG len, ULONG *ret_len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len ) { FIXME( "not implemented on Mac\n" );

1 0

Hans Leidekker : bcrypt: Handle different sized R/S signature components.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ec3ca4ee7336e4462fcd240f78c5e779e17bb2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3ca4ee7336e4462fcd240f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 15:32:48 2020 +0200 bcrypt: Handle different sized R/S signature components. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index d447e90a11..19a00e2ee2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1431,8 +1431,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_DSA: { int err; - unsigned int pad_size, sig_len = get_signature_length( type ); + unsigned int pad_size_r, pad_size_s, sig_len = get_signature_length( type ); gnutls_datum_t r, s; /* format as r||s */ + unsigned char *r_data, *s_data; if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) { @@ -1442,31 +1443,35 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; - /* remove prepended zero byte */ - if (r.size % 2) + if (r.size % 2) /* remove prepended zero byte */ { r.size--; - r.data += 1; + r_data = r.data + 1; } + else r_data = r.data; + if (s.size % 2) { s.size--; - s.data += 1; + s_data = s.data + 1; } + else s_data = s.data; - if (r.size != s.size || r.size + s.size > sig_len) + if (r.size + s.size > sig_len) { ERR( "we didn't get a correct signature\n" ); return STATUS_INTERNAL_ERROR; } - pad_size = (sig_len / 2) - s.size; + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; memset( output, 0, sig_len ); - memcpy( output + pad_size, r.data, r.size ); - memcpy( output + (sig_len / 2) + pad_size, s.data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); *ret_len = sig_len; + free( r.data ); free( s.data ); return STATUS_SUCCESS; } default:

1 0

Nikolay Sivov : dwrite: Fix global feature mask to match its shift.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: e89aa70555d5fec8df7230ad1fcf628ef2b3f8a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89aa70555d5fec8df7230ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 5 16:38:01 2020 +0300 dwrite: Fix global feature mask to match its shift. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 64fba56202..fc46610bcb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4407,7 +4407,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex struct shaping_feature *feature; unsigned int i, j, next_bit; unsigned int global_bit_shift = 1; - unsigned int global_bit_mask = 1; + unsigned int global_bit_mask = 2; UINT16 feature_index; if (!table->table.data)

1 0

Nikolay Sivov : dwrite: Use correct glyph array offset for alternate substitution table output.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 384067bda6d36bb1871805fc5bd8540139b952a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=384067bda6d36bb1871805fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 5 16:52:28 2020 +0300 dwrite: Use correct glyph array offset for alternate substitution table output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fc46610bcb..2106fe2cf7 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4916,7 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (alt_index > count || !alt_index) return FALSE; - glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); } else {

1 0

Biswapriyo Nath : include: Add include guard in d2dbasetypes.h.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 9dcfc596718a4c8acafc1009b90263bba5141c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dcfc596718a4c8acafc1009… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jun 5 12:57:09 2020 +0530 include: Add include guard in d2dbasetypes.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2dbasetypes.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index a160a89021..93c99fcceb 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _D2DBASETYPES_INCLUDED +#define _D2DBASETYPES_INCLUDED + #ifndef D3DCOLORVALUE_DEFINED typedef struct D3DCOLORVALUE { @@ -56,3 +59,5 @@ typedef struct D2D_RECT_U UINT32 right; UINT32 bottom; } D2D_RECT_U; + +#endif /* _D2DBASETYPES_INCLUDED */

1 0

Zhipeng Zhao : wlanapi: Add WlanQueryInterface stub implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: c82c71be649ed155a66d4e5f5579b77442c58354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82c71be649ed155a66d4e5f… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Fri Jun 5 01:34:18 2020 -0700 wlanapi: Add WlanQueryInterface stub implementation. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 8 ++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 5ec0e0bf84..cfffeedb11 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -164,6 +164,14 @@ DWORD WINAPI WlanGetAvailableNetworkList(HANDLE handle, const GUID *guid, DWORD return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCODE opcode, + void *reserved, DWORD *data_size, void **data, WLAN_OPCODE_VALUE_TYPE *opcode_type) +{ + FIXME("(%p, %s, 0x%x, %p, %p, %p, %p) stub\n", + handle, wine_dbgstr_guid(guid), opcode, reserved, data_size, data, opcode_type); + + return ERROR_CALL_NOT_IMPLEMENTED; +} void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index dc1b907809..1c21ab5a2e 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -17,7 +17,7 @@ @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter -@ stub WlanQueryInterface +@ stdcall WlanQueryInterface(ptr ptr long ptr ptr ptr ptr) @ stub WlanReasonCodeToString @ stdcall WlanRegisterNotification(ptr long long ptr ptr ptr ptr) @ stub WlanRenameProfile diff --git a/include/wlanapi.h b/include/wlanapi.h index 1cd8c93e65..a3288d7778 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -142,6 +142,44 @@ typedef struct _WLAN_AVAILABLE_NETWORK DWORD dwReserved; } WLAN_AVAILABLE_NETWORK, *PWLAN_AVAILABLE_NETWORK; +typedef enum _WLAN_INTF_OPCODE +{ + wlan_intf_opcode_autoconf_start = 0x000000000, + wlan_intf_opcode_autoconf_enabled, + wlan_intf_opcode_background_scan_enabled, + wlan_intf_opcode_media_streaming_mode, + wlan_intf_opcode_radio_state, + wlan_intf_opcode_bss_type, + wlan_intf_opcode_interface_state, + wlan_intf_opcode_current_connection, + wlan_intf_opcode_channel_number, + wlan_intf_opcode_supported_infrastructure_auth_cipher_pairs, + wlan_intf_opcode_supported_adhoc_auth_cipher_pairs, + wlan_intf_opcode_supported_country_or_region_string_list, + wlan_intf_opcode_current_operation_mode, + wlan_intf_opcode_supported_safe_mode, + wlan_intf_opcode_certified_safe_mode, + wlan_intf_opcode_hosted_network_capable, + wlan_intf_opcode_management_frame_protection_capable, + wlan_intf_opcode_autoconf_end = 0x0fffffff, + wlan_intf_opcode_msm_start = 0x10000100, + wlan_intf_opcode_statistics, + wlan_intf_opcode_rssi, + wlan_intf_opcode_msm_end = 0x1fffffff, + wlan_intf_opcode_security_start = 0x20010000, + wlan_intf_opcode_security_end = 0x2fffffff, + wlan_intf_opcode_ihv_start = 0x30000000, + wlan_intf_opcode_ihv_end = 0x3fffffff +} WLAN_INTF_OPCODE, *PWLAN_INTF_OPCODE; + +typedef enum _WLAN_OPCODE_VALUE_TYPE +{ + wlan_opcode_value_type_query_only = 0, + wlan_opcode_value_type_set_by_group_policy, + wlan_opcode_value_type_set_by_user, + wlan_opcode_value_type_invalid +} WLAN_OPCODE_VALUE_TYPE, *PWLAN_OPCODE_VALUE_TYPE; + typedef struct _WLAN_AVAILABLE_NETWORK_LIST { DWORD dwNumberOfItems; @@ -157,5 +195,6 @@ void WINAPI WlanFreeMemory(void *); DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CALLBACK, void *, void *, DWORD *); DWORD WINAPI WlanGetAvailableNetworkList(HANDLE, const GUID *, DWORD, void *, WLAN_AVAILABLE_NETWORK_LIST **); +DWORD WINAPI WlanQueryInterface(HANDLE, const GUID *, WLAN_INTF_OPCODE, void *, DWORD *, void **, WLAN_OPCODE_VALUE_TYPE *); #endif /* _WLAN_WLANAPI_H */

1 0

Ziqing Hui : windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ac1adfc512286e08e31da3e7abb26a66646423f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1adfc512286e08e31da3e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 5 11:53:29 2020 +0800 windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 42 +++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 327701f22c..5195dada13 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -471,30 +471,52 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram { HRESULT hr; WICDdsFormatInfo format_info; - WICRect rect = { 0, 0, 1, 1 }; + WICRect rect = { 0, 0, 1, 1 }, rect_test_a = { 0, 0, 0, 0 }, rect_test_b = { 0, 0, 0xdeadbeaf, 0xdeadbeaf }; + WICRect rect_test_c = { -0xdeadbeaf, -0xdeadbeaf, 1, 1 }, rect_test_d = { 1, 1, 1, 1 }; BYTE buffer[32]; UINT stride, width_in_blocks, height_in_blocks; UINT width, height, depth, array_index; UINT block_offset; int slice_index; - hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); - ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) return; hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return; - stride = width_in_blocks * format_info.BytesPerBlock; + stride = rect.Width * format_info.BytesPerBlock; - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_a, stride, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_b, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_c, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_d, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 32, buffer); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, 0, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride - 1, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride * 2, sizeof(buffer), buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 0, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height - 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height, buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] CopyBlocks failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return;

1 0